From 4fd25c1cb7fd0e0d1de4818ead3d1ac1e32e7eea Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Fri, 8 Sep 2023 14:17:58 -0700
Subject: [PATCH 01/15] Render EXTRACT columns in semantic model dataset by
 default

---
 metricflow/dag/id_generation.py               |    1 +
 metricflow/dataset/convert_semantic_model.py  |   48 +-
 metricflow/naming/linkable_spec_name.py       |   47 +-
 metricflow/plan_conversion/column_resolver.py |    1 +
 metricflow/plan_conversion/dataflow_to_sql.py |    5 +-
 .../plan_conversion/instance_converters.py    |    1 +
 metricflow/specs/specs.py                     |    4 +
 .../specs/where_filter_time_dimension.py      |    2 +
 metricflow/sql/render/databricks.py           |    8 +
 metricflow/sql/render/expr_renderer.py        |   14 +
 metricflow/sql/sql_exprs.py                   |   64 +
 .../dataset/test_convert_semantic_model.py    |  211 ++
 .../test/model/test_data_warehouse_tasks.py   |    4 +-
 ...st_convert_query_semantic_model__plan0.sql |   14 +
 ...le_semantic_model_with_measures__plan0.sql |   28 +
 ...semantic_model_without_measures__plan0.sql |   14 +
 ...st_convert_query_semantic_model__plan0.sql |   14 +
 ...le_semantic_model_with_measures__plan0.sql |   28 +
 ...semantic_model_without_measures__plan0.sql |   14 +
 ...st_convert_query_semantic_model__plan0.sql |   14 +
 ...le_semantic_model_with_measures__plan0.sql |   28 +
 ...semantic_model_without_measures__plan0.sql |   14 +
 ...st_convert_query_semantic_model__plan0.sql |   14 +
 ...le_semantic_model_with_measures__plan0.sql |   28 +
 ...semantic_model_without_measures__plan0.sql |   14 +
 ...st_convert_query_semantic_model__plan0.sql |   14 +
 ...le_semantic_model_with_measures__plan0.sql |   28 +
 ...semantic_model_without_measures__plan0.sql |   14 +
 ...st_convert_query_semantic_model__plan0.sql |   14 +
 ...le_semantic_model_with_measures__plan0.sql |   28 +
 ...semantic_model_without_measures__plan0.sql |   14 +
 .../test_common_semantic_model__dfp_0.xml     |    4 +
 ...indow_or_grain_with_metric_time__dfp_0.xml |    1 +
 ...t_cumulative_metric_with_window__dfp_0.xml |    1 +
 ..._derived_metric_offset_to_grain__dfp_0.xml |    2 +
 ...st_derived_metric_offset_window__dfp_0.xml |    1 +
 ..._metric_offset_with_granularity__dfp_0.xml |    1 +
 ...erived_offset_cumulative_metric__dfp_0.xml |    1 +
 .../test_limit_rows_plan__dfp_0.xml           |    1 +
 .../test_measure_constraint_plan__dfp_0.xml   |    7 +
 ...traint_with_reused_measure_plan__dfp_0.xml |    3 +
 ...mantic_model_ratio_metrics_plan__dfp_0.xml |    4 +
 .../test_multihop_join_plan__dfp_0.xml        |  128 +
 .../test_multiple_metrics_plan__dfp_0.xml     |    2 +
 .../test_order_by_plan__dfp_0.xml             |    2 +
 ...mantic_model_ratio_metrics_plan__dfp_0.xml |    4 +
 ...constrained_plan_time_dimension__dfp_0.xml |    2 +
 ...spine_node_with_offset_to_grain__plan0.xml |    1 +
 ...e_spine_node_with_offset_window__plan0.xml |    1 +
 ..._time_spine_node_without_offset__plan0.xml |    1 +
 .../test_common_semantic_model__plan0.sql     |  168 +
 .../test_compute_metrics_node__plan0.sql      |   70 +
 ...o_from_multiple_semantic_models__plan0.sql |  252 ++
 ...atio_from_single_semantic_model__plan0.sql |   70 +
 ...ompute_metrics_node_simple_expr__plan0.sql |   70 +
 .../test_constrain_time_range_node__plan0.sql |   42 +
 .../test_cumulative_metric__plan0.sql         |   28 +
 ...cumulative_metric_grain_to_date__plan0.sql |   28 +
 .../test_cumulative_metric_no_ds__plan0.sql   |   28 +
 ...est_cumulative_metric_no_window__plan0.sql |   28 +
 ..._no_window_with_time_constraint__plan0.sql |   42 +
 ...ive_metric_with_time_constraint__plan0.sql |   42 +
 .../BigQuery/test_derived_metric__plan0.sql   |  168 +
 ...ved_metric_with_offset_to_grain__plan0.sql |  210 ++
 ...offset_to_grain_and_granularity__plan0.sql |  210 ++
 ...rived_metric_with_offset_window__plan0.sql |  210 ++
 ...h_offset_window_and_granularity__plan0.sql |  210 ++
 ...fset_window_and_offset_to_grain__plan0.sql |  252 ++
 ...offset_to_grain_and_granularity__plan0.sql |  252 ++
 ...erived_offset_cumulative_metric__plan0.sql |  168 +
 ...et_metric_with_one_input_metric__plan0.sql |  126 +
 .../BigQuery/test_distinct_values__plan0.sql  |  140 +
 .../BigQuery/test_filter_node__plan0.sql      |   42 +
 ...lter_with_where_constraint_node__plan0.sql |   42 +
 ...th_where_constraint_on_join_dim__plan0.sql |  140 +
 .../test_join_to_scd_dimension__plan0.sql     |  120 +-
 ...join_to_scd_dimension__plan0_optimized.sql |    4 +-
 ...spine_node_with_offset_to_grain__plan0.sql |   84 +
 ...e_spine_node_with_offset_window__plan0.sql |   84 +
 ..._time_spine_node_without_offset__plan0.sql |   84 +
 .../BigQuery/test_limit_rows__plan0.sql       |   84 +
 ...al_dimension_using_local_entity__plan0.sql |   56 +
 .../test_measure_aggregation_node__plan0.sql  |   42 +
 .../test_measure_constraint__plan0.sql        |  364 ++
 ..._constraint_with_reused_measure__plan0.sql |  168 +
 ...aint_with_single_expr_and_alias__plan0.sql |   84 +
 ..._multiple_sources_no_dimensions__plan0.sql |  140 +
 ...multi_hop_through_scd_dimension__plan0.sql |  197 +-
 ...through_scd_dimension__plan0_optimized.sql |    6 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |  190 +-
 ..._hop_to_scd_dimension__plan0_optimized.sql |    6 +-
 .../BigQuery/test_multi_join_node__plan0.sql  |   98 +
 .../BigQuery/test_multihop_node__plan0.sql    |  133 +
 ..._multiple_metrics_no_dimensions__plan0.sql |  210 ++
 .../test_nested_derived_metric__plan0.sql     |  336 ++
 .../BigQuery/test_order_by_node__plan0.sql    |   42 +
 .../BigQuery/test_partitioned_join__plan0.sql |   98 +
 .../test_semi_additive_join_node__plan0.sql   |   42 +
 ...mi_additive_join_node__plan0_optimized.sql |   28 +
 ...dditive_join_node_with_grouping__plan0.sql |   42 +
 ...in_node_with_grouping__plan0_optimized.sql |   28 +
 ...join_node_with_queried_group_by__plan0.sql |   42 +
 ...with_queried_group_by__plan0_optimized.sql |   28 +
 .../BigQuery/test_single_join_node__plan0.sql |   70 +
 .../BigQuery/test_source_node__plan0.sql      |   42 +
 .../test_source_node__plan0_optimized.sql     |   42 +
 .../test_common_semantic_model__plan0.sql     |  168 +
 .../test_compute_metrics_node__plan0.sql      |   70 +
 ...o_from_multiple_semantic_models__plan0.sql |  252 ++
 ...atio_from_single_semantic_model__plan0.sql |   70 +
 ...ompute_metrics_node_simple_expr__plan0.sql |   70 +
 .../test_constrain_time_range_node__plan0.sql |   42 +
 .../test_cumulative_metric__plan0.sql         |   28 +
 ...cumulative_metric_grain_to_date__plan0.sql |   28 +
 .../test_cumulative_metric_no_ds__plan0.sql   |   28 +
 ...est_cumulative_metric_no_window__plan0.sql |   28 +
 ..._no_window_with_time_constraint__plan0.sql |   42 +
 ...ive_metric_with_time_constraint__plan0.sql |   42 +
 .../Databricks/test_derived_metric__plan0.sql |  168 +
 ...ved_metric_with_offset_to_grain__plan0.sql |  210 ++
 ...offset_to_grain_and_granularity__plan0.sql |  210 ++
 ...rived_metric_with_offset_window__plan0.sql |  210 ++
 ...h_offset_window_and_granularity__plan0.sql |  210 ++
 ...fset_window_and_offset_to_grain__plan0.sql |  252 ++
 ...offset_to_grain_and_granularity__plan0.sql |  252 ++
 ...erived_offset_cumulative_metric__plan0.sql |  168 +
 ...et_metric_with_one_input_metric__plan0.sql |  126 +
 .../test_distinct_values__plan0.sql           |  140 +
 .../Databricks/test_filter_node__plan0.sql    |   42 +
 ...lter_with_where_constraint_node__plan0.sql |   42 +
 ...th_where_constraint_on_join_dim__plan0.sql |  140 +
 .../test_join_to_scd_dimension__plan0.sql     |  126 +-
 ...join_to_scd_dimension__plan0_optimized.sql |    6 +-
 ...spine_node_with_offset_to_grain__plan0.sql |   84 +
 ...e_spine_node_with_offset_window__plan0.sql |   84 +
 ..._time_spine_node_without_offset__plan0.sql |   84 +
 .../Databricks/test_limit_rows__plan0.sql     |   84 +
 ...al_dimension_using_local_entity__plan0.sql |   56 +
 .../test_measure_aggregation_node__plan0.sql  |   42 +
 .../test_measure_constraint__plan0.sql        |  364 ++
 ..._constraint_with_reused_measure__plan0.sql |  168 +
 ...aint_with_single_expr_and_alias__plan0.sql |   84 +
 ..._multiple_sources_no_dimensions__plan0.sql |  140 +
 ...multi_hop_through_scd_dimension__plan0.sql |  203 +-
 ...through_scd_dimension__plan0_optimized.sql |   10 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |  196 +-
 ..._hop_to_scd_dimension__plan0_optimized.sql |   10 +-
 .../test_multi_join_node__plan0.sql           |   98 +
 .../Databricks/test_multihop_node__plan0.sql  |  133 +
 ..._multiple_metrics_no_dimensions__plan0.sql |  210 ++
 .../test_nested_derived_metric__plan0.sql     |  336 ++
 .../Databricks/test_order_by_node__plan0.sql  |   42 +
 .../test_partitioned_join__plan0.sql          |   98 +
 .../test_semi_additive_join_node__plan0.sql   |   42 +
 ...mi_additive_join_node__plan0_optimized.sql |   28 +
 ...dditive_join_node_with_grouping__plan0.sql |   42 +
 ...in_node_with_grouping__plan0_optimized.sql |   28 +
 ...join_node_with_queried_group_by__plan0.sql |   42 +
 ...with_queried_group_by__plan0_optimized.sql |   28 +
 .../test_single_join_node__plan0.sql          |   70 +
 .../Databricks/test_source_node__plan0.sql    |   42 +
 .../test_source_node__plan0_optimized.sql     |   42 +
 .../test_common_semantic_model__plan0.sql     |  168 +
 .../test_compute_metrics_node__plan0.sql      |   70 +
 ...o_from_multiple_semantic_models__plan0.sql |  252 ++
 ...atio_from_single_semantic_model__plan0.sql |   70 +
 ...ompute_metrics_node_simple_expr__plan0.sql |   70 +
 .../test_constrain_time_range_node__plan0.sql |   42 +
 .../DuckDB/test_cumulative_metric__plan0.sql  |   28 +
 ...cumulative_metric_grain_to_date__plan0.sql |   28 +
 .../test_cumulative_metric_no_ds__plan0.sql   |   28 +
 ...est_cumulative_metric_no_window__plan0.sql |   28 +
 ..._no_window_with_time_constraint__plan0.sql |   42 +
 ...ive_metric_with_time_constraint__plan0.sql |   42 +
 .../DuckDB/test_derived_metric__plan0.sql     |  168 +
 ...ved_metric_with_offset_to_grain__plan0.sql |  210 ++
 ...offset_to_grain_and_granularity__plan0.sql |  210 ++
 ...rived_metric_with_offset_window__plan0.sql |  210 ++
 ...h_offset_window_and_granularity__plan0.sql |  210 ++
 ...fset_window_and_offset_to_grain__plan0.sql |  252 ++
 ...offset_to_grain_and_granularity__plan0.sql |  252 ++
 ...erived_offset_cumulative_metric__plan0.sql |  168 +
 ...et_metric_with_one_input_metric__plan0.sql |  126 +
 .../DuckDB/test_distinct_values__plan0.sql    |  140 +
 .../DuckDB/test_filter_node__plan0.sql        |   42 +
 ...lter_with_where_constraint_node__plan0.sql |   42 +
 ...th_where_constraint_on_join_dim__plan0.sql |  140 +
 .../test_join_to_scd_dimension__plan0.sql     |  126 +-
 ...join_to_scd_dimension__plan0_optimized.sql |    6 +-
 ...spine_node_with_offset_to_grain__plan0.sql |   84 +
 ...e_spine_node_with_offset_window__plan0.sql |   84 +
 ..._time_spine_node_without_offset__plan0.sql |   84 +
 .../DuckDB/test_limit_rows__plan0.sql         |   84 +
 ...al_dimension_using_local_entity__plan0.sql |   56 +
 .../test_measure_aggregation_node__plan0.sql  |   42 +
 .../DuckDB/test_measure_constraint__plan0.sql |  364 ++
 ..._constraint_with_reused_measure__plan0.sql |  168 +
 ...aint_with_single_expr_and_alias__plan0.sql |   84 +
 ..._multiple_sources_no_dimensions__plan0.sql |  140 +
 ...multi_hop_through_scd_dimension__plan0.sql |  203 +-
 ...through_scd_dimension__plan0_optimized.sql |   10 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |  190 +-
 ..._hop_to_scd_dimension__plan0_optimized.sql |    6 +-
 .../DuckDB/test_multi_join_node__plan0.sql    |   98 +
 .../DuckDB/test_multihop_node__plan0.sql      |  133 +
 ..._multiple_metrics_no_dimensions__plan0.sql |  210 ++
 .../test_nested_derived_metric__plan0.sql     |  336 ++
 .../DuckDB/test_order_by_node__plan0.sql      |   42 +
 .../DuckDB/test_partitioned_join__plan0.sql   |   98 +
 .../test_semi_additive_join_node__plan0.sql   |   42 +
 ...mi_additive_join_node__plan0_optimized.sql |   28 +
 ...dditive_join_node_with_grouping__plan0.sql |   42 +
 ...in_node_with_grouping__plan0_optimized.sql |   28 +
 ...join_node_with_queried_group_by__plan0.sql |   42 +
 ...with_queried_group_by__plan0_optimized.sql |   28 +
 .../DuckDB/test_single_join_node__plan0.sql   |   70 +
 .../DuckDB/test_source_node__plan0.sql        |   42 +
 .../test_source_node__plan0_optimized.sql     |   42 +
 .../test_common_semantic_model__plan0.sql     |  168 +
 .../test_compute_metrics_node__plan0.sql      |   70 +
 ...o_from_multiple_semantic_models__plan0.sql |  252 ++
 ...atio_from_single_semantic_model__plan0.sql |   70 +
 ...ompute_metrics_node_simple_expr__plan0.sql |   70 +
 .../test_constrain_time_range_node__plan0.sql |   42 +
 .../test_cumulative_metric__plan0.sql         |   28 +
 ...cumulative_metric_grain_to_date__plan0.sql |   28 +
 .../test_cumulative_metric_no_ds__plan0.sql   |   28 +
 ...est_cumulative_metric_no_window__plan0.sql |   28 +
 ..._no_window_with_time_constraint__plan0.sql |   42 +
 ...ive_metric_with_time_constraint__plan0.sql |   42 +
 .../Postgres/test_derived_metric__plan0.sql   |  168 +
 ...ved_metric_with_offset_to_grain__plan0.sql |  210 ++
 ...offset_to_grain_and_granularity__plan0.sql |  210 ++
 ...rived_metric_with_offset_window__plan0.sql |  210 ++
 ...h_offset_window_and_granularity__plan0.sql |  210 ++
 ...fset_window_and_offset_to_grain__plan0.sql |  252 ++
 ...offset_to_grain_and_granularity__plan0.sql |  252 ++
 ...erived_offset_cumulative_metric__plan0.sql |  168 +
 ...et_metric_with_one_input_metric__plan0.sql |  126 +
 .../Postgres/test_distinct_values__plan0.sql  |  140 +
 .../Postgres/test_filter_node__plan0.sql      |   42 +
 ...lter_with_where_constraint_node__plan0.sql |   42 +
 ...th_where_constraint_on_join_dim__plan0.sql |  140 +
 .../test_join_to_scd_dimension__plan0.sql     |  118 +-
 ...join_to_scd_dimension__plan0_optimized.sql |    2 +-
 ...spine_node_with_offset_to_grain__plan0.sql |   84 +
 ...e_spine_node_with_offset_window__plan0.sql |   84 +
 ..._time_spine_node_without_offset__plan0.sql |   84 +
 .../Postgres/test_limit_rows__plan0.sql       |   84 +
 ...al_dimension_using_local_entity__plan0.sql |   56 +
 .../test_measure_aggregation_node__plan0.sql  |   42 +
 .../test_measure_constraint__plan0.sql        |  364 ++
 ..._constraint_with_reused_measure__plan0.sql |  168 +
 ...aint_with_single_expr_and_alias__plan0.sql |   84 +
 ..._multiple_sources_no_dimensions__plan0.sql |  140 +
 ...multi_hop_through_scd_dimension__plan0.sql |  195 +-
 ...through_scd_dimension__plan0_optimized.sql |    4 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |  196 +-
 ..._hop_to_scd_dimension__plan0_optimized.sql |   10 +-
 .../Postgres/test_multi_join_node__plan0.sql  |   98 +
 .../Postgres/test_multihop_node__plan0.sql    |  133 +
 ..._multiple_metrics_no_dimensions__plan0.sql |  210 ++
 .../test_nested_derived_metric__plan0.sql     |  336 ++
 .../Postgres/test_order_by_node__plan0.sql    |   42 +
 .../Postgres/test_partitioned_join__plan0.sql |   98 +
 .../test_semi_additive_join_node__plan0.sql   |   42 +
 ...mi_additive_join_node__plan0_optimized.sql |   28 +
 ...dditive_join_node_with_grouping__plan0.sql |   42 +
 ...in_node_with_grouping__plan0_optimized.sql |   28 +
 ...join_node_with_queried_group_by__plan0.sql |   42 +
 ...with_queried_group_by__plan0_optimized.sql |   28 +
 .../Postgres/test_single_join_node__plan0.sql |   70 +
 .../Postgres/test_source_node__plan0.sql      |   42 +
 .../test_source_node__plan0_optimized.sql     |   42 +
 .../test_common_semantic_model__plan0.sql     |  168 +
 .../test_compute_metrics_node__plan0.sql      |   70 +
 ...o_from_multiple_semantic_models__plan0.sql |  252 ++
 ...atio_from_single_semantic_model__plan0.sql |   70 +
 ...ompute_metrics_node_simple_expr__plan0.sql |   70 +
 .../test_constrain_time_range_node__plan0.sql |   42 +
 .../test_cumulative_metric__plan0.sql         |   28 +
 ...cumulative_metric_grain_to_date__plan0.sql |   28 +
 .../test_cumulative_metric_no_ds__plan0.sql   |   28 +
 ...est_cumulative_metric_no_window__plan0.sql |   28 +
 ..._no_window_with_time_constraint__plan0.sql |   42 +
 ...ive_metric_with_time_constraint__plan0.sql |   42 +
 .../Redshift/test_derived_metric__plan0.sql   |  168 +
 ...ved_metric_with_offset_to_grain__plan0.sql |  210 ++
 ...offset_to_grain_and_granularity__plan0.sql |  210 ++
 ...rived_metric_with_offset_window__plan0.sql |  210 ++
 ...h_offset_window_and_granularity__plan0.sql |  210 ++
 ...fset_window_and_offset_to_grain__plan0.sql |  252 ++
 ...offset_to_grain_and_granularity__plan0.sql |  252 ++
 ...erived_offset_cumulative_metric__plan0.sql |  168 +
 ...et_metric_with_one_input_metric__plan0.sql |  126 +
 .../Redshift/test_distinct_values__plan0.sql  |  140 +
 .../Redshift/test_filter_node__plan0.sql      |   42 +
 ...lter_with_where_constraint_node__plan0.sql |   42 +
 ...th_where_constraint_on_join_dim__plan0.sql |  140 +
 .../test_join_to_scd_dimension__plan0.sql     |  126 +-
 ...join_to_scd_dimension__plan0_optimized.sql |    6 +-
 ...spine_node_with_offset_to_grain__plan0.sql |   84 +
 ...e_spine_node_with_offset_window__plan0.sql |   84 +
 ..._time_spine_node_without_offset__plan0.sql |   84 +
 .../Redshift/test_limit_rows__plan0.sql       |   84 +
 ...al_dimension_using_local_entity__plan0.sql |   56 +
 .../test_measure_aggregation_node__plan0.sql  |   42 +
 .../test_measure_constraint__plan0.sql        |  364 ++
 ..._constraint_with_reused_measure__plan0.sql |  168 +
 ...aint_with_single_expr_and_alias__plan0.sql |   84 +
 ..._multiple_sources_no_dimensions__plan0.sql |  140 +
 ...multi_hop_through_scd_dimension__plan0.sql |  203 +-
 ...through_scd_dimension__plan0_optimized.sql |   10 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |  196 +-
 ..._hop_to_scd_dimension__plan0_optimized.sql |   10 +-
 .../Redshift/test_multi_join_node__plan0.sql  |   98 +
 .../Redshift/test_multihop_node__plan0.sql    |  133 +
 ..._multiple_metrics_no_dimensions__plan0.sql |  210 ++
 .../test_nested_derived_metric__plan0.sql     |  336 ++
 .../Redshift/test_order_by_node__plan0.sql    |   42 +
 .../Redshift/test_partitioned_join__plan0.sql |   98 +
 .../test_semi_additive_join_node__plan0.sql   |   42 +
 ...mi_additive_join_node__plan0_optimized.sql |   28 +
 ...dditive_join_node_with_grouping__plan0.sql |   42 +
 ...in_node_with_grouping__plan0_optimized.sql |   28 +
 ...join_node_with_queried_group_by__plan0.sql |   42 +
 ...with_queried_group_by__plan0_optimized.sql |   28 +
 .../Redshift/test_single_join_node__plan0.sql |   70 +
 .../Redshift/test_source_node__plan0.sql      |   42 +
 .../test_source_node__plan0_optimized.sql     |   42 +
 .../test_common_semantic_model__plan0.sql     |  168 +
 .../test_compute_metrics_node__plan0.sql      |   70 +
 ...o_from_multiple_semantic_models__plan0.sql |  252 ++
 ...atio_from_single_semantic_model__plan0.sql |   70 +
 ...ompute_metrics_node_simple_expr__plan0.sql |   70 +
 .../test_constrain_time_range_node__plan0.sql |   42 +
 .../test_cumulative_metric__plan0.sql         |   28 +
 ...cumulative_metric_grain_to_date__plan0.sql |   28 +
 .../test_cumulative_metric_no_ds__plan0.sql   |   28 +
 ...est_cumulative_metric_no_window__plan0.sql |   28 +
 ..._no_window_with_time_constraint__plan0.sql |   42 +
 ...ive_metric_with_time_constraint__plan0.sql |   42 +
 .../Snowflake/test_derived_metric__plan0.sql  |  168 +
 ...ved_metric_with_offset_to_grain__plan0.sql |  210 ++
 ...offset_to_grain_and_granularity__plan0.sql |  210 ++
 ...rived_metric_with_offset_window__plan0.sql |  210 ++
 ...h_offset_window_and_granularity__plan0.sql |  210 ++
 ...fset_window_and_offset_to_grain__plan0.sql |  252 ++
 ...offset_to_grain_and_granularity__plan0.sql |  252 ++
 ...erived_offset_cumulative_metric__plan0.sql |  168 +
 ...et_metric_with_one_input_metric__plan0.sql |  126 +
 .../Snowflake/test_distinct_values__plan0.sql |  140 +
 .../Snowflake/test_filter_node__plan0.sql     |   42 +
 ...lter_with_where_constraint_node__plan0.sql |   42 +
 ...th_where_constraint_on_join_dim__plan0.sql |  140 +
 .../test_join_to_scd_dimension__plan0.sql     |  126 +-
 ...join_to_scd_dimension__plan0_optimized.sql |    6 +-
 ...spine_node_with_offset_to_grain__plan0.sql |   84 +
 ...e_spine_node_with_offset_window__plan0.sql |   84 +
 ..._time_spine_node_without_offset__plan0.sql |   84 +
 .../Snowflake/test_limit_rows__plan0.sql      |   84 +
 ...al_dimension_using_local_entity__plan0.sql |   56 +
 .../test_measure_aggregation_node__plan0.sql  |   42 +
 .../test_measure_constraint__plan0.sql        |  364 ++
 ..._constraint_with_reused_measure__plan0.sql |  168 +
 ...aint_with_single_expr_and_alias__plan0.sql |   84 +
 ..._multiple_sources_no_dimensions__plan0.sql |  140 +
 ...multi_hop_through_scd_dimension__plan0.sql |  203 +-
 ...through_scd_dimension__plan0_optimized.sql |   10 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |  196 +-
 ..._hop_to_scd_dimension__plan0_optimized.sql |   10 +-
 .../Snowflake/test_multi_join_node__plan0.sql |   98 +
 .../Snowflake/test_multihop_node__plan0.sql   |  133 +
 ..._multiple_metrics_no_dimensions__plan0.sql |  210 ++
 .../test_nested_derived_metric__plan0.sql     |  336 ++
 .../Snowflake/test_order_by_node__plan0.sql   |   42 +
 .../test_partitioned_join__plan0.sql          |   98 +
 .../test_semi_additive_join_node__plan0.sql   |   42 +
 ...mi_additive_join_node__plan0_optimized.sql |   28 +
 ...dditive_join_node_with_grouping__plan0.sql |   42 +
 ...in_node_with_grouping__plan0_optimized.sql |   28 +
 ...join_node_with_queried_group_by__plan0.sql |   42 +
 ...with_queried_group_by__plan0_optimized.sql |   28 +
 .../test_single_join_node__plan0.sql          |   70 +
 .../Snowflake/test_source_node__plan0.sql     |   42 +
 .../test_source_node__plan0_optimized.sql     |   42 +
 .../test_common_semantic_model__plan0.xml     | 1348 ++++++--
 .../test_compute_metrics_node__plan0.xml      |  476 ++-
 ...o_from_multiple_semantic_models__plan0.xml | 2076 +++++++++---
 ...atio_from_single_semantic_model__plan0.xml |  476 ++-
 ...ompute_metrics_node_simple_expr__plan0.xml |  476 ++-
 .../test_constrain_time_range_node__plan0.xml |  282 +-
 .../test_cumulative_metric__plan0.xml         |  208 +-
 ...cumulative_metric_grain_to_date__plan0.xml |  208 +-
 .../test_cumulative_metric_no_ds__plan0.xml   |  200 +-
 ...est_cumulative_metric_no_window__plan0.xml |  208 +-
 ..._no_window_with_time_constraint__plan0.xml |  324 +-
 ...ive_metric_with_time_constraint__plan0.xml |  324 +-
 .../test_derived_metric__plan0.xml            | 1354 ++++++--
 ...ved_metric_with_offset_to_grain__plan0.xml | 1718 +++++++---
 ...offset_to_grain_and_granularity__plan0.xml | 1716 +++++++---
 ...rived_metric_with_offset_window__plan0.xml | 1718 +++++++---
 ...h_offset_window_and_granularity__plan0.xml | 1716 +++++++---
 ...fset_window_and_offset_to_grain__plan0.xml | 2094 +++++++++---
 ...offset_to_grain_and_granularity__plan0.xml | 2090 +++++++++---
 ...erived_offset_cumulative_metric__plan0.xml | 1420 +++++---
 ...et_metric_with_one_input_metric__plan0.xml | 1040 ++++--
 .../test_distinct_values__plan0.xml           | 1132 +++++--
 .../SqlQueryPlan/test_filter_node__plan0.xml  |  282 +-
 ...lter_with_where_constraint_node__plan0.xml |  282 +-
 ...th_where_constraint_on_join_dim__plan0.xml | 1142 +++++--
 .../test_join_to_scd_dimension__plan0.xml     |  892 +++--
 ...spine_node_with_offset_to_grain__plan0.xml |  642 +++-
 ...e_spine_node_with_offset_window__plan0.xml |  642 +++-
 ..._time_spine_node_without_offset__plan0.xml |  642 +++-
 .../SqlQueryPlan/test_limit_rows__plan0.xml   |  678 +++-
 ...al_dimension_using_local_entity__plan0.xml |  450 ++-
 .../test_measure_aggregation_node__plan0.xml  |  282 +-
 .../test_measure_constraint__plan0.xml        | 2974 ++++++++++++-----
 ..._constraint_with_reused_measure__plan0.xml | 1366 ++++++--
 ...aint_with_single_expr_and_alias__plan0.xml |  688 +++-
 ..._multiple_sources_no_dimensions__plan0.xml | 1112 ++++--
 ...multi_hop_through_scd_dimension__plan0.xml | 1332 ++++++--
 ...test_multi_hop_to_scd_dimension__plan0.xml | 1192 +++++--
 .../test_multi_join_node__plan0.xml           |  666 +++-
 .../test_multihop_node__plan0.xml             |  996 ++++--
 ..._multiple_metrics_no_dimensions__plan0.xml | 1908 ++++++++---
 .../test_nested_derived_metric__plan0.xml     | 2722 +++++++++++----
 .../test_order_by_node__plan0.xml             |  282 +-
 .../test_partitioned_join__plan0.xml          |  670 +++-
 .../test_semi_additive_join_node__plan0.xml   |  246 +-
 ...dditive_join_node_with_grouping__plan0.xml |  246 +-
 ...join_node_with_queried_group_by__plan0.xml |  246 +-
 .../test_single_join_node__plan0.xml          |  476 ++-
 .../SqlQueryPlan/test_source_node__plan0.xml  |  282 +-
 ...orm_node_using_non_primary_time__plan0.sql |   84 +
 ...sing_non_primary_time__plan0_optimized.sql |   42 +
 ...ansform_node_using_primary_time__plan0.sql |   84 +
 ...de_using_primary_time__plan0_optimized.sql |   42 +
 ...uery_with_metric_time_dimension__plan0.sql |  168 +
 ...orm_node_using_non_primary_time__plan0.sql |   84 +
 ...sing_non_primary_time__plan0_optimized.sql |   42 +
 ...ansform_node_using_primary_time__plan0.sql |   84 +
 ...de_using_primary_time__plan0_optimized.sql |   42 +
 ...uery_with_metric_time_dimension__plan0.sql |  168 +
 ...orm_node_using_non_primary_time__plan0.sql |   84 +
 ...sing_non_primary_time__plan0_optimized.sql |   42 +
 ...ansform_node_using_primary_time__plan0.sql |   84 +
 ...de_using_primary_time__plan0_optimized.sql |   42 +
 ...uery_with_metric_time_dimension__plan0.sql |  168 +
 ...orm_node_using_non_primary_time__plan0.sql |   84 +
 ...sing_non_primary_time__plan0_optimized.sql |   42 +
 ...ansform_node_using_primary_time__plan0.sql |   84 +
 ...de_using_primary_time__plan0_optimized.sql |   42 +
 ...uery_with_metric_time_dimension__plan0.sql |  168 +
 ...orm_node_using_non_primary_time__plan0.sql |   84 +
 ...sing_non_primary_time__plan0_optimized.sql |   42 +
 ...ansform_node_using_primary_time__plan0.sql |   84 +
 ...de_using_primary_time__plan0_optimized.sql |   42 +
 ...uery_with_metric_time_dimension__plan0.sql |  168 +
 ...orm_node_using_non_primary_time__plan0.sql |   84 +
 ...sing_non_primary_time__plan0_optimized.sql |   42 +
 ...ansform_node_using_primary_time__plan0.sql |   84 +
 ...de_using_primary_time__plan0_optimized.sql |   42 +
 ...uery_with_metric_time_dimension__plan0.sql |  168 +
 ...orm_node_using_non_primary_time__plan0.xml |  526 ++-
 ...ansform_node_using_primary_time__plan0.xml |  550 ++-
 ...uery_with_metric_time_dimension__plan0.xml | 1300 +++++--
 ...2_metrics_from_1_semantic_model__dfp_0.xml |    4 +
 ..._metrics_from_1_semantic_model__dfpo_0.xml |    2 +
 ..._metrics_from_2_semantic_models__dfp_0.xml |    2 +
 ...metrics_from_2_semantic_models__dfpo_0.xml |    2 +
 ...o_metrics_from_1_semantic_model__dfp_0.xml |    4 +
 ..._metrics_from_1_semantic_model__dfpo_0.xml |    1 +
 ..._metrics_from_2_semantic_models__dfp_0.xml |    3 +
 ...metrics_from_2_semantic_models__dfpo_0.xml |    2 +
 ...constrained_metric_not_combined__dfp_0.xml |    3 +
 ...onstrained_metric_not_combined__dfpo_0.xml |    3 +
 .../test_derived_metric__dfp_0.xml            |    2 +
 .../test_derived_metric__dfpo_0.xml           |    1 +
 ..._metric_with_non_derived_metric__dfp_0.xml |    3 +
 ...metric_with_non_derived_metric__dfpo_0.xml |    2 +
 .../test_nested_derived_metric__dfp_0.xml     |    4 +
 .../test_nested_derived_metric__dfpo_0.xml    |    2 +
 metricflow/time/date_part.py                  |   40 +
 metricflow/time/time_granularity.py           |   22 +-
 486 files changed, 76103 insertions(+), 12046 deletions(-)
 create mode 100644 metricflow/time/date_part.py

diff --git a/metricflow/dag/id_generation.py b/metricflow/dag/id_generation.py
index 913457a798..e08fca06de 100644
--- a/metricflow/dag/id_generation.py
+++ b/metricflow/dag/id_generation.py
@@ -35,6 +35,7 @@
 SQL_EXPR_IS_NULL_PREFIX = "isn"
 SQL_EXPR_CAST_TO_TIMESTAMP_PREFIX = "ctt"
 SQL_EXPR_DATE_TRUNC = "dt"
+SQL_EXPR_EXTRACT = "ex"
 SQL_EXPR_RATIO_COMPUTATION = "rc"
 SQL_EXPR_BETWEEN_PREFIX = "betw"
 SQL_EXPR_WINDOW_FUNCTION_ID_PREFIX = "wfnc"
diff --git a/metricflow/dataset/convert_semantic_model.py b/metricflow/dataset/convert_semantic_model.py
index 99a0ea74ea..296168df21 100644
--- a/metricflow/dataset/convert_semantic_model.py
+++ b/metricflow/dataset/convert_semantic_model.py
@@ -38,6 +38,7 @@
     SqlColumnReferenceExpression,
     SqlDateTruncExpression,
     SqlExpressionNode,
+    SqlExtractExpression,
     SqlStringExpression,
 )
 from metricflow.sql.sql_plan import (
@@ -46,6 +47,7 @@
     SqlSelectStatementNode,
     SqlTableFromClauseNode,
 )
+from metricflow.time.date_part import DatePart
 
 logger = logging.getLogger(__name__)
 
@@ -102,12 +104,14 @@ def _create_time_dimension_instance(
         time_dimension: Dimension,
         entity_links: Tuple[EntityReference, ...],
         time_granularity: TimeGranularity = DEFAULT_TIME_GRANULARITY,
+        date_part: Optional[DatePart] = None,
     ) -> TimeDimensionInstance:
         """Create a time dimension instance from the dimension object from a semantic model in the model."""
         time_dimension_spec = TimeDimensionSpec(
             element_name=time_dimension.reference.element_name,
             entity_links=entity_links,
             time_granularity=time_granularity,
+            date_part=date_part,
         )
 
         return TimeDimensionInstance(
@@ -219,6 +223,11 @@ def _convert_dimensions(
         select_columns = []
 
         for dimension in dimensions or []:
+            dimension_select_expr = SemanticModelToDataSetConverter._make_element_sql_expr(
+                table_alias=table_alias,
+                element_name=dimension.reference.element_name,
+                element_expr=dimension.expr,
+            )
             if dimension.type == DimensionType.CATEGORICAL:
                 dimension_instance = self._create_dimension_instance(
                     semantic_model_name=semantic_model_name,
@@ -228,11 +237,7 @@ def _convert_dimensions(
                 dimension_instances.append(dimension_instance)
                 select_columns.append(
                     SqlSelectColumn(
-                        expr=SemanticModelToDataSetConverter._make_element_sql_expr(
-                            table_alias=table_alias,
-                            element_name=dimension.reference.element_name,
-                            element_expr=dimension.expr,
-                        ),
+                        expr=dimension_select_expr,
                         column_alias=dimension_instance.associated_column.column_name,
                     )
                 )
@@ -251,11 +256,7 @@ def _convert_dimensions(
                 time_dimension_instances.append(time_dimension_instance)
                 select_columns.append(
                     SqlSelectColumn(
-                        expr=SemanticModelToDataSetConverter._make_element_sql_expr(
-                            table_alias=table_alias,
-                            element_name=dimension.reference.element_name,
-                            element_expr=dimension.expr,
-                        ),
+                        expr=dimension_select_expr,
                         column_alias=time_dimension_instance.associated_column.column_name,
                     )
                 )
@@ -274,16 +275,31 @@ def _convert_dimensions(
                         select_columns.append(
                             SqlSelectColumn(
                                 expr=SqlDateTruncExpression(
-                                    time_granularity=time_granularity,
-                                    arg=SemanticModelToDataSetConverter._make_element_sql_expr(
-                                        table_alias=table_alias,
-                                        element_name=dimension.reference.element_name,
-                                        element_expr=dimension.expr,
-                                    ),
+                                    time_granularity=time_granularity, arg=dimension_select_expr
                                 ),
                                 column_alias=time_dimension_instance.associated_column.column_name,
                             )
                         )
+
+                # Add all date part options for easy query resolution
+                for date_part in DatePart:
+                    if date_part.to_int() >= defined_time_granularity.to_int():
+                        time_dimension_instance = self._create_time_dimension_instance(
+                            semantic_model_name=semantic_model_name,
+                            time_dimension=dimension,
+                            entity_links=entity_links,
+                            time_granularity=defined_time_granularity,
+                            date_part=date_part,
+                        )
+                        time_dimension_instances.append(time_dimension_instance)
+
+                        select_columns.append(
+                            SqlSelectColumn(
+                                expr=SqlExtractExpression(date_part=date_part, arg=dimension_select_expr),
+                                column_alias=time_dimension_instance.associated_column.column_name,
+                            )
+                        )
+
             else:
                 assert False, f"Unhandled dimension type: {dimension.type}"
 
diff --git a/metricflow/naming/linkable_spec_name.py b/metricflow/naming/linkable_spec_name.py
index 082f81cb84..1cfe2b9804 100644
--- a/metricflow/naming/linkable_spec_name.py
+++ b/metricflow/naming/linkable_spec_name.py
@@ -6,6 +6,8 @@
 
 from dbt_semantic_interfaces.type_enums.time_granularity import TimeGranularity
 
+from metricflow.time.date_part import DatePart
+
 DUNDER = "__"
 
 logger = logging.getLogger(__name__)
@@ -24,6 +26,7 @@ class StructuredLinkableSpecName:
     entity_link_names: Tuple[str, ...]
     element_name: str
     time_granularity: Optional[TimeGranularity] = None
+    date_part: Optional[DatePart] = None
 
     @staticmethod
     def from_name(qualified_name: str) -> StructuredLinkableSpecName:
@@ -32,7 +35,26 @@ def from_name(qualified_name: str) -> StructuredLinkableSpecName:
 
         # No dunder, e.g. "ds"
         if len(name_parts) == 1:
-            return StructuredLinkableSpecName((), name_parts[0])
+            return StructuredLinkableSpecName(entity_link_names=(), element_name=name_parts[0])
+
+        associated_date_part: Optional[DatePart] = None
+        for date_part in DatePart:
+            if name_parts[-1] == StructuredLinkableSpecName.date_part_suffix(date_part):
+                associated_date_part = date_part
+
+        # Has a date_part
+        if associated_date_part:
+            #  e.g. "ds__extract_month"
+            if len(name_parts) == 2:
+                return StructuredLinkableSpecName(
+                    entity_link_names=(), element_name=name_parts[0], date_part=associated_date_part
+                )
+            # e.g. "messages__ds__extract_month"
+            return StructuredLinkableSpecName(
+                entity_link_names=tuple(name_parts[:-2]),
+                element_name=name_parts[-2],
+                date_part=associated_date_part,
+            )
 
         associated_granularity = None
         granularity: TimeGranularity
@@ -44,19 +66,29 @@ def from_name(qualified_name: str) -> StructuredLinkableSpecName:
         if associated_granularity:
             #  e.g. "ds__month"
             if len(name_parts) == 2:
-                return StructuredLinkableSpecName((), name_parts[0], associated_granularity)
+                return StructuredLinkableSpecName(
+                    entity_link_names=(), element_name=name_parts[0], time_granularity=associated_granularity
+                )
             # e.g. "messages__ds__month"
-            return StructuredLinkableSpecName(tuple(name_parts[:-2]), name_parts[-2], associated_granularity)
+            return StructuredLinkableSpecName(
+                entity_link_names=tuple(name_parts[:-2]),
+                element_name=name_parts[-2],
+                time_granularity=associated_granularity,
+            )
+
         # e.g. "messages__ds"
         else:
-            return StructuredLinkableSpecName(tuple(name_parts[:-1]), name_parts[-1])
+            return StructuredLinkableSpecName(entity_link_names=tuple(name_parts[:-1]), element_name=name_parts[-1])
 
     @property
     def qualified_name(self) -> str:
         """Return the full name form. e.g. ds or listing__ds__month."""
         items = list(self.entity_link_names) + [self.element_name]
-        if self.time_granularity:
+        if self.date_part:
+            items.append(self.date_part_suffix(date_part=self.date_part))
+        elif self.time_granularity:
             items.append(self.time_granularity.value)
+
         return DUNDER.join(items)
 
     @property
@@ -66,3 +98,8 @@ def entity_prefix(self) -> Optional[str]:
             return DUNDER.join(self.entity_link_names)
 
         return None
+
+    @staticmethod
+    def date_part_suffix(date_part: DatePart) -> str:
+        """Suffix used for names with a date_part."""
+        return f"extract_{date_part.value}"
diff --git a/metricflow/plan_conversion/column_resolver.py b/metricflow/plan_conversion/column_resolver.py
index 7dc1124aa4..9312fd7f30 100644
--- a/metricflow/plan_conversion/column_resolver.py
+++ b/metricflow/plan_conversion/column_resolver.py
@@ -55,6 +55,7 @@ def visit_time_dimension_spec(self, time_dimension_spec: TimeDimensionSpec) -> C
             entity_link_names=tuple(x.element_name for x in time_dimension_spec.entity_links),
             element_name=time_dimension_spec.element_name,
             time_granularity=time_dimension_spec.time_granularity,
+            date_part=time_dimension_spec.date_part,
         ).qualified_name
 
         return ColumnAssociation(
diff --git a/metricflow/plan_conversion/dataflow_to_sql.py b/metricflow/plan_conversion/dataflow_to_sql.py
index d350ff17e8..8f80437a08 100644
--- a/metricflow/plan_conversion/dataflow_to_sql.py
+++ b/metricflow/plan_conversion/dataflow_to_sql.py
@@ -1116,6 +1116,7 @@ def visit_metric_time_dimension_transform_node(
             if (
                 len(time_dimension_instance.spec.entity_links) == 0
                 and time_dimension_instance.spec.reference == node.aggregation_time_dimension_reference
+                and time_dimension_instance.spec.date_part is None
             ):
                 matching_time_dimension_instances.append(time_dimension_instance)
 
@@ -1141,6 +1142,7 @@ def visit_metric_time_dimension_transform_node(
             output_column_to_input_column[
                 metric_time_dimension_column_association.column_name
             ] = matching_time_dimension_instance.associated_column.column_name
+
         output_instance_set = InstanceSet(
             measure_instances=tuple(output_measure_instances),
             dimension_instances=input_data_set.instance_set.dimension_instances,
@@ -1359,7 +1361,7 @@ def visit_join_to_time_spine_node(self, node: JoinToTimeSpineNode[SourceDataSetT
             SqlColumnReference(table_alias=time_spine_alias, column_name=original_time_dim_instance.spec.qualified_name)
         )
 
-        # Add requested granularities (skip for default granularity).
+        # Add requested granularities (skip for default granularity) and date_parts.
         metric_time_select_columns = []
         metric_time_dimension_instances = []
         where: Optional[SqlExpressionNode] = None
@@ -1376,6 +1378,7 @@ def visit_join_to_time_spine_node(self, node: JoinToTimeSpineNode[SourceDataSetT
                     element_name=original_time_dim_instance.spec.element_name,
                     entity_links=original_time_dim_instance.spec.entity_links,
                     time_granularity=metric_time_dimension_spec.time_granularity,
+                    date_part=metric_time_dimension_spec.date_part,
                     aggregation_state=original_time_dim_instance.spec.aggregation_state,
                 )
                 time_dim_instance = TimeDimensionInstance(
diff --git a/metricflow/plan_conversion/instance_converters.py b/metricflow/plan_conversion/instance_converters.py
index 0620598c8d..d741d8f711 100644
--- a/metricflow/plan_conversion/instance_converters.py
+++ b/metricflow/plan_conversion/instance_converters.py
@@ -401,6 +401,7 @@ def transform(self, instance_set: InstanceSet) -> InstanceSet:  # noqa: D
                     + time_dimension_instance.spec.entity_links
                 ),
                 time_granularity=time_dimension_instance.spec.time_granularity,
+                date_part=time_dimension_instance.spec.date_part,
             )
             time_dimension_instances_with_additional_link.append(
                 TimeDimensionInstance(
diff --git a/metricflow/specs/specs.py b/metricflow/specs/specs.py
index 46e071a30b..f065c0d693 100644
--- a/metricflow/specs/specs.py
+++ b/metricflow/specs/specs.py
@@ -34,6 +34,7 @@
 from metricflow.naming.linkable_spec_name import StructuredLinkableSpecName
 from metricflow.sql.sql_bind_parameters import SqlBindParameters
 from metricflow.sql.sql_column_type import SqlColumnType
+from metricflow.time.date_part import DatePart
 from metricflow.visitor import VisitorOutputT
 
 
@@ -284,6 +285,7 @@ def accept(self, visitor: InstanceSpecVisitor[VisitorOutputT]) -> VisitorOutputT
 @dataclass(frozen=True)
 class TimeDimensionSpec(DimensionSpec):  # noqa: D
     time_granularity: TimeGranularity = DEFAULT_TIME_GRANULARITY
+    date_part: Optional[DatePart] = None
 
     # Used for semi-additive joins. Some more thought is needed, but this may be useful in InstanceSpec.
     aggregation_state: Optional[AggregationState] = None
@@ -295,6 +297,7 @@ def without_first_entity_link(self) -> TimeDimensionSpec:  # noqa: D
             element_name=self.element_name,
             entity_links=self.entity_links[1:],
             time_granularity=self.time_granularity,
+            date_part=self.date_part,
         )
 
     @property
@@ -338,6 +341,7 @@ def with_aggregation_state(self, aggregation_state: AggregationState) -> TimeDim
             element_name=self.element_name,
             entity_links=self.entity_links,
             time_granularity=self.time_granularity,
+            date_part=self.date_part,
             aggregation_state=aggregation_state,
         )
 
diff --git a/metricflow/specs/where_filter_time_dimension.py b/metricflow/specs/where_filter_time_dimension.py
index 18ed235a81..0dd23ad0d4 100644
--- a/metricflow/specs/where_filter_time_dimension.py
+++ b/metricflow/specs/where_filter_time_dimension.py
@@ -86,4 +86,6 @@ def _convert_to_time_dimension_spec(
             element_name=parameter_set.time_dimension_reference.element_name,
             entity_links=parameter_set.entity_path,
             time_granularity=parameter_set.time_granularity,
+            # TODO: add date_part to TimeDimensionCallParameterSet in DSI
+            # date_part=parameter_set.date_part,
         )
diff --git a/metricflow/sql/render/databricks.py b/metricflow/sql/render/databricks.py
index 0740f66350..307f15ba24 100644
--- a/metricflow/sql/render/databricks.py
+++ b/metricflow/sql/render/databricks.py
@@ -13,6 +13,7 @@
 )
 from metricflow.sql.render.sql_plan_renderer import DefaultSqlQueryPlanRenderer
 from metricflow.sql.sql_exprs import SqlPercentileExpression, SqlPercentileFunctionType
+from metricflow.time.date_part import DatePart
 
 
 class DatabricksSqlExpressionRenderer(DefaultSqlExpressionRenderer):
@@ -56,6 +57,13 @@ def visit_percentile_expr(self, node: SqlPercentileExpression) -> SqlExpressionR
             bind_parameters=params,
         )
 
+    @override
+    def render_date_part(self, date_part: DatePart) -> str:
+        if date_part == DatePart.DAYOFYEAR:
+            return "DOY"
+
+        return super().render_date_part(date_part)
+
 
 class DatabricksSqlQueryPlanRenderer(DefaultSqlQueryPlanRenderer):
     """Plan renderer for the Snowflake engine."""
diff --git a/metricflow/sql/render/expr_renderer.py b/metricflow/sql/render/expr_renderer.py
index 26a4e0065c..105c83e862 100644
--- a/metricflow/sql/render/expr_renderer.py
+++ b/metricflow/sql/render/expr_renderer.py
@@ -22,6 +22,7 @@
     SqlDateTruncExpression,
     SqlExpressionNode,
     SqlExpressionNodeVisitor,
+    SqlExtractExpression,
     SqlFunction,
     SqlGenerateUuidExpression,
     SqlIsNullExpression,
@@ -36,6 +37,7 @@
     SqlWindowFunctionExpression,
 )
 from metricflow.sql.sql_plan import SqlSelectColumn
+from metricflow.time.date_part import DatePart
 
 logger = logging.getLogger(__name__)
 
@@ -267,6 +269,18 @@ def visit_date_trunc_expr(self, node: SqlDateTruncExpression) -> SqlExpressionRe
             bind_parameters=arg_rendered.bind_parameters,
         )
 
+    def visit_extract_expr(self, node: SqlExtractExpression) -> SqlExpressionRenderResult:  # noqa: D
+        arg_rendered = self.render_sql_expr(node.arg)
+
+        return SqlExpressionRenderResult(
+            sql=f"EXTRACT({self.render_date_part(node.date_part)} FROM {arg_rendered.sql})",
+            bind_parameters=arg_rendered.bind_parameters,
+        )
+
+    def render_date_part(self, date_part: DatePart) -> str:
+        """Render DATE PART for an EXTRACT expression."""
+        return date_part.name
+
     def visit_time_delta_expr(self, node: SqlTimeDeltaExpression) -> SqlExpressionRenderResult:  # noqa: D
         arg_rendered = node.arg.accept(self)
         if node.grain_to_date:
diff --git a/metricflow/sql/sql_exprs.py b/metricflow/sql/sql_exprs.py
index 10e72826aa..8ab96a29e9 100644
--- a/metricflow/sql/sql_exprs.py
+++ b/metricflow/sql/sql_exprs.py
@@ -19,6 +19,7 @@
     SQL_EXPR_COLUMN_REFERENCE_ID_PREFIX,
     SQL_EXPR_COMPARISON_ID_PREFIX,
     SQL_EXPR_DATE_TRUNC,
+    SQL_EXPR_EXTRACT,
     SQL_EXPR_FUNCTION_ID_PREFIX,
     SQL_EXPR_GENERATE_UUID_PREFIX,
     SQL_EXPR_IS_NULL_PREFIX,
@@ -32,6 +33,7 @@
 )
 from metricflow.dag.mf_dag import DagNode, DisplayedProperty, NodeId
 from metricflow.sql.sql_bind_parameters import SqlBindParameters
+from metricflow.time.date_part import DatePart
 from metricflow.visitor import Visitable, VisitorOutputT
 
 
@@ -218,6 +220,10 @@ def visit_cast_to_timestamp_expr(self, node: SqlCastToTimestampExpression) -> Vi
     def visit_date_trunc_expr(self, node: SqlDateTruncExpression) -> VisitorOutputT:  # noqa: D
         pass
 
+    @abstractmethod
+    def visit_extract_expr(self, node: SqlExtractExpression) -> VisitorOutputT:  # noqa: D
+        pass
+
     @abstractmethod
     def visit_time_delta_expr(self, node: SqlTimeDeltaExpression) -> VisitorOutputT:  # noqa: D
         pass
@@ -1416,6 +1422,64 @@ def matches(self, other: SqlExpressionNode) -> bool:  # noqa: D
         return self.time_granularity == other.time_granularity and self._parents_match(other)
 
 
+class SqlExtractExpression(SqlExpressionNode):
+    """Extract a date part from a time expression."""
+
+    def __init__(self, date_part: DatePart, arg: SqlExpressionNode) -> None:
+        """Constructor.
+
+        Args:
+            date_part: the date part to extract.
+            arg: the expression to extract from.
+        """
+        self._date_part = date_part
+        super().__init__(node_id=self.create_unique_id(), parent_nodes=[arg])
+
+    @classmethod
+    def id_prefix(cls) -> str:  # noqa: D
+        return SQL_EXPR_EXTRACT
+
+    @property
+    def requires_parenthesis(self) -> bool:  # noqa: D
+        return False
+
+    def accept(self, visitor: SqlExpressionNodeVisitor[VisitorOutputT]) -> VisitorOutputT:  # noqa: D
+        return visitor.visit_extract_expr(self)
+
+    @property
+    def description(self) -> str:  # noqa: D
+        return f"Extract {self.date_part.name}"
+
+    @property
+    def date_part(self) -> DatePart:  # noqa: D
+        return self._date_part
+
+    @property
+    def arg(self) -> SqlExpressionNode:  # noqa: D
+        assert len(self.parent_nodes) == 1
+        return self.parent_nodes[0]
+
+    def rewrite(  # noqa: D
+        self,
+        column_replacements: Optional[SqlColumnReplacements] = None,
+        should_render_table_alias: Optional[bool] = None,
+    ) -> SqlExpressionNode:
+        return SqlExtractExpression(
+            date_part=self.date_part, arg=self.arg.rewrite(column_replacements, should_render_table_alias)
+        )
+
+    @property
+    def lineage(self) -> SqlExpressionTreeLineage:  # noqa: D
+        return SqlExpressionTreeLineage.combine(
+            tuple(x.lineage for x in self.parent_nodes) + (SqlExpressionTreeLineage(other_exprs=(self,)),)
+        )
+
+    def matches(self, other: SqlExpressionNode) -> bool:  # noqa: D
+        if not isinstance(other, SqlExtractExpression):
+            return False
+        return self.date_part == other.date_part and self._parents_match(other)
+
+
 class SqlRatioComputationExpression(SqlExpressionNode):
     """Node for expressing Ratio metrics to allow for appropriate casting to float/double in each engine.
 
diff --git a/metricflow/test/dataset/test_convert_semantic_model.py b/metricflow/test/dataset/test_convert_semantic_model.py
index 3335742f2a..d830438ea5 100644
--- a/metricflow/test/dataset/test_convert_semantic_model.py
+++ b/metricflow/test/dataset/test_convert_semantic_model.py
@@ -19,6 +19,7 @@
 from metricflow.test.fixtures.model_fixtures import ConsistentIdObjectRepository
 from metricflow.test.fixtures.setup_fixtures import MetricFlowTestSessionState
 from metricflow.test.sql.compare_sql_plan import assert_rendered_sql_equal
+from metricflow.time.date_part import DatePart
 
 logger = logging.getLogger(__name__)
 
@@ -49,6 +50,27 @@ def test_convert_table_semantic_model_without_measures(  # noqa: D
             TimeDimensionSpec(element_name="ds", entity_links=(), time_granularity=TimeGranularity.MONTH),
             TimeDimensionSpec(element_name="ds", entity_links=(), time_granularity=TimeGranularity.QUARTER),
             TimeDimensionSpec(element_name="ds", entity_links=(), time_granularity=TimeGranularity.YEAR),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.YEAR
+            ),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.QUARTER
+            ),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.MONTH
+            ),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.WEEK
+            ),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DAY
+            ),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DAYOFWEEK
+            ),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DAYOFYEAR
+            ),
             TimeDimensionSpec(
                 element_name="ds",
                 entity_links=(EntityReference(element_name="user"),),
@@ -74,6 +96,48 @@ def test_convert_table_semantic_model_without_measures(  # noqa: D
                 entity_links=(EntityReference(element_name="user"),),
                 time_granularity=TimeGranularity.YEAR,
             ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="user"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.YEAR,
+            ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="user"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.QUARTER,
+            ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="user"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.MONTH,
+            ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="user"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.WEEK,
+            ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="user"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.DAY,
+            ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="user"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.DAYOFWEEK,
+            ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="user"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.DAYOFYEAR,
+            ),
         ),
     )
 
@@ -125,11 +189,74 @@ def test_convert_table_semantic_model_with_measures(  # noqa: D
             TimeDimensionSpec(element_name="ds", entity_links=(), time_granularity=TimeGranularity.MONTH),
             TimeDimensionSpec(element_name="ds", entity_links=(), time_granularity=TimeGranularity.QUARTER),
             TimeDimensionSpec(element_name="ds", entity_links=(), time_granularity=TimeGranularity.YEAR),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.YEAR
+            ),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.QUARTER
+            ),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.MONTH
+            ),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.WEEK
+            ),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DAY
+            ),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DAYOFWEEK
+            ),
+            TimeDimensionSpec(
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DAYOFYEAR
+            ),
             TimeDimensionSpec(element_name="ds_partitioned", entity_links=(), time_granularity=TimeGranularity.DAY),
             TimeDimensionSpec(element_name="ds_partitioned", entity_links=(), time_granularity=TimeGranularity.WEEK),
             TimeDimensionSpec(element_name="ds_partitioned", entity_links=(), time_granularity=TimeGranularity.MONTH),
             TimeDimensionSpec(element_name="ds_partitioned", entity_links=(), time_granularity=TimeGranularity.QUARTER),
             TimeDimensionSpec(element_name="ds_partitioned", entity_links=(), time_granularity=TimeGranularity.YEAR),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.YEAR,
+            ),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.QUARTER,
+            ),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.MONTH,
+            ),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.WEEK,
+            ),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.DAY,
+            ),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.DAYOFWEEK,
+            ),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.DAYOFYEAR,
+            ),
             TimeDimensionSpec(
                 element_name="ds",
                 entity_links=(EntityReference(element_name="verification"),),
@@ -155,6 +282,48 @@ def test_convert_table_semantic_model_with_measures(  # noqa: D
                 entity_links=(EntityReference(element_name="verification"),),
                 time_granularity=TimeGranularity.YEAR,
             ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.YEAR,
+            ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.QUARTER,
+            ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.MONTH,
+            ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.WEEK,
+            ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.DAY,
+            ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.DAYOFWEEK,
+            ),
+            TimeDimensionSpec(
+                element_name="ds",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.DAYOFYEAR,
+            ),
             TimeDimensionSpec(
                 element_name="ds_partitioned",
                 entity_links=(EntityReference(element_name="verification"),),
@@ -180,6 +349,48 @@ def test_convert_table_semantic_model_with_measures(  # noqa: D
                 entity_links=(EntityReference(element_name="verification"),),
                 time_granularity=TimeGranularity.YEAR,
             ),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.YEAR,
+            ),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.QUARTER,
+            ),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.MONTH,
+            ),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.WEEK,
+            ),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.DAY,
+            ),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.DAYOFWEEK,
+            ),
+            TimeDimensionSpec(
+                element_name="ds_partitioned",
+                entity_links=(EntityReference(element_name="verification"),),
+                time_granularity=TimeGranularity.DAY,
+                date_part=DatePart.DAYOFYEAR,
+            ),
         ),
     )
 
diff --git a/metricflow/test/model/test_data_warehouse_tasks.py b/metricflow/test/model/test_data_warehouse_tasks.py
index 1c66625f22..3675751f40 100644
--- a/metricflow/test/model/test_data_warehouse_tasks.py
+++ b/metricflow/test/model/test_data_warehouse_tasks.py
@@ -110,8 +110,8 @@ def test_build_dimension_tasks(  # noqa: D
     )
     # on semantic model query with all dimensions
     assert len(tasks) == 1
-    # 1 categorical dimension task, 1 time dimension task, 4 granularity based time dimension tasks
-    assert len(tasks[0].on_fail_subtasks) == 6
+    # 1 categorical dimension task, 1 time dimension task, 4 granularity based time dimension tasks, 7 date_part tasks
+    assert len(tasks[0].on_fail_subtasks) == 13
 
 
 def test_validate_dimensions(  # noqa: D
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
index bf1aa949c1..6a18fb55ab 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
@@ -6,11 +6,25 @@ SELECT
   , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
   , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
   , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
+  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
   , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
   , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
   , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
+  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
index c2ce705484..be4db1864b 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -6,22 +6,50 @@ SELECT
   , DATE_TRUNC(id_verifications_src_10003.ds, month) AS ds__month
   , DATE_TRUNC(id_verifications_src_10003.ds, quarter) AS ds__quarter
   , DATE_TRUNC(id_verifications_src_10003.ds, year) AS ds__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, month) AS ds_partitioned__month
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, quarter) AS ds_partitioned__quarter
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, year) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC(id_verifications_src_10003.ds, isoweek) AS verification__ds__week
   , DATE_TRUNC(id_verifications_src_10003.ds, month) AS verification__ds__month
   , DATE_TRUNC(id_verifications_src_10003.ds, quarter) AS verification__ds__quarter
   , DATE_TRUNC(id_verifications_src_10003.ds, year) AS verification__ds__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, isoweek) AS verification__ds_partitioned__week
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, month) AS verification__ds_partitioned__month
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, quarter) AS verification__ds_partitioned__quarter
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, year) AS verification__ds_partitioned__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
index 73911c3dd1..b4f8805489 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -5,12 +5,26 @@ SELECT
   , DATE_TRUNC(users_latest_src_10008.ds, month) AS ds__month
   , DATE_TRUNC(users_latest_src_10008.ds, quarter) AS ds__quarter
   , DATE_TRUNC(users_latest_src_10008.ds, year) AS ds__year
+  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_dayofyear
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC(users_latest_src_10008.ds, isoweek) AS user__ds__week
   , DATE_TRUNC(users_latest_src_10008.ds, month) AS user__ds__month
   , DATE_TRUNC(users_latest_src_10008.ds, quarter) AS user__ds__quarter
   , DATE_TRUNC(users_latest_src_10008.ds, year) AS user__ds__year
+  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS user__ds__extract_year
+  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
+  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS user__ds__extract_month
+  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
+  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS user__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_dayofyear
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql
index 896ee2afd1..28bd5c725b 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql
@@ -6,11 +6,25 @@ SELECT
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+  , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+  , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql
index cfaaed9f09..dbb952f05b 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -6,22 +6,50 @@ SELECT
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
+  , EXTRACT(DOY FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DOY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
+  , EXTRACT(DOY FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
+  , EXTRACT(DOY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
index 75e1612840..60db7389f0 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -5,12 +5,26 @@ SELECT
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
+  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dayofweek
+  , EXTRACT(DOY FROM users_latest_src_10008.ds) AS ds__extract_dayofyear
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
+  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS user__ds__extract_year
+  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
+  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS user__ds__extract_month
+  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
+  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS user__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dayofweek
+  , EXTRACT(DOY FROM users_latest_src_10008.ds) AS user__ds__extract_dayofyear
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
index 896ee2afd1..390e922160 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
@@ -6,11 +6,25 @@ SELECT
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
index cfaaed9f09..4a4b1f53f4 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -6,22 +6,50 @@ SELECT
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
index 75e1612840..e3f2a1d31a 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -5,12 +5,26 @@ SELECT
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
+  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_dayofyear
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
+  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS user__ds__extract_year
+  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
+  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS user__ds__extract_month
+  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
+  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS user__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_dayofyear
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql
index 896ee2afd1..390e922160 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql
@@ -6,11 +6,25 @@ SELECT
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql
index cfaaed9f09..4a4b1f53f4 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -6,22 +6,50 @@ SELECT
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
index 75e1612840..e3f2a1d31a 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -5,12 +5,26 @@ SELECT
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
+  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_dayofyear
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
+  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS user__ds__extract_year
+  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
+  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS user__ds__extract_month
+  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
+  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS user__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_dayofyear
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql
index 896ee2afd1..390e922160 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql
@@ -6,11 +6,25 @@ SELECT
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql
index cfaaed9f09..4a4b1f53f4 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -6,22 +6,50 @@ SELECT
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
index 75e1612840..e3f2a1d31a 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -5,12 +5,26 @@ SELECT
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
+  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_dayofyear
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
+  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS user__ds__extract_year
+  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
+  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS user__ds__extract_month
+  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
+  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS user__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_dayofyear
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql
index 896ee2afd1..390e922160 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql
@@ -6,11 +6,25 @@ SELECT
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql
index cfaaed9f09..4a4b1f53f4 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -6,22 +6,50 @@ SELECT
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
+  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
index 75e1612840..e3f2a1d31a 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -5,12 +5,26 @@ SELECT
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
+  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_dayofyear
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
+  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS user__ds__extract_year
+  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
+  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS user__ds__extract_month
+  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
+  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS user__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_dayofyear
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml
index ff4e3095e1..fea487abac 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_common_semantic_model__dfp_0.xml
@@ -34,6 +34,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <!-- include_spec =                                                                  -->
                         <!--   {'class': 'DimensionSpec',                                                    -->
@@ -65,6 +66,7 @@
                                 <!--    'element_name': 'metric_time',            -->
                                 <!--    'entity_links': (),                       -->
                                 <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                <!--    'date_part': None,                        -->
                                 <!--    'aggregation_state': None}                -->
                                 <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                                 <MetricTimeDimensionTransformNode>
@@ -132,6 +134,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <!-- include_spec =                                                                  -->
                         <!--   {'class': 'DimensionSpec',                                                    -->
@@ -163,6 +166,7 @@
                                 <!--    'element_name': 'metric_time',            -->
                                 <!--    'entity_links': (),                       -->
                                 <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                <!--    'date_part': None,                        -->
                                 <!--    'aggregation_state': None}                -->
                                 <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                                 <MetricTimeDimensionTransformNode>
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_with_metric_time__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_with_metric_time__dfp_0.xml
index 4aac7f8a75..315dbe3f63 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_with_metric_time__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_no_window_or_grain_with_metric_time__dfp_0.xml
@@ -29,6 +29,7 @@
                     <!--    'element_name': 'metric_time',                -->
                     <!--    'entity_links': (),                           -->
                     <!--    'time_granularity': TimeGranularity.QUARTER,  -->
+                    <!--    'date_part': None,                            -->
                     <!--    'aggregation_state': None}                    -->
                     <JoinOverTimeRangeNode>
                         <!-- description = Join Self Over Time Range -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml
index 3d6d6e3630..8c87a7ea7c 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml
@@ -29,6 +29,7 @@
                     <!--    'element_name': 'metric_time',              -->
                     <!--    'entity_links': (),                         -->
                     <!--    'time_granularity': TimeGranularity.MONTH,  -->
+                    <!--    'date_part': None,                          -->
                     <!--    'aggregation_state': None}                  -->
                     <JoinOverTimeRangeNode>
                         <!-- description = Join Self Over Time Range -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml
index babc67f7c8..0ea5b4678a 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_to_grain__dfp_0.xml
@@ -43,6 +43,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = Metric Time Dimension 'ds' -->
@@ -86,6 +87,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <JoinToTimeSpineNode>
                                 <!-- description = Join to Time Spine Dataset -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml
index a8ecff962b..97bb2cf97f 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml
@@ -41,6 +41,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <JoinToTimeSpineNode>
                             <!-- description = Join to Time Spine Dataset -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml
index 0cedbbee96..f2f1132769 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml
@@ -41,6 +41,7 @@
                         <!--    'element_name': 'metric_time',              -->
                         <!--    'entity_links': (),                         -->
                         <!--    'time_granularity': TimeGranularity.MONTH,  -->
+                        <!--    'date_part': None,                          -->
                         <!--    'aggregation_state': None}                  -->
                         <JoinToTimeSpineNode>
                             <!-- description = Join to Time Spine Dataset -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml
index a2ee6ee189..17be7c1387 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml
@@ -41,6 +41,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <JoinToTimeSpineNode>
                             <!-- description = Join to Time Spine Dataset -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_limit_rows_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_limit_rows_plan__dfp_0.xml
index 6c68f6700e..8b12c3de7b 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_limit_rows_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_limit_rows_plan__dfp_0.xml
@@ -33,6 +33,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml
index 9a2f8e0984..ba549be3d2 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_plan__dfp_0.xml
@@ -53,6 +53,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <WhereConstraintNode>
                                 <!-- description = Constrain Output with WHERE -->
@@ -86,6 +87,7 @@
                                     <!--    'element_name': 'metric_time',            -->
                                     <!--    'entity_links': (),                       -->
                                     <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': None,                        -->
                                     <!--    'aggregation_state': None}                -->
                                     <JoinToBaseOutputNode>
                                         <!-- description = Join Standard Outputs -->
@@ -113,6 +115,7 @@
                                             <!--    'element_name': 'metric_time',            -->
                                             <!--    'entity_links': (),                       -->
                                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                            <!--    'date_part': None,                        -->
                                             <!--    'aggregation_state': None}                -->
                                             <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                                             <MetricTimeDimensionTransformNode>
@@ -191,6 +194,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <WhereConstraintNode>
                                 <!-- description = Constrain Output with WHERE -->
@@ -224,6 +228,7 @@
                                     <!--    'element_name': 'metric_time',            -->
                                     <!--    'entity_links': (),                       -->
                                     <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': None,                        -->
                                     <!--    'aggregation_state': None}                -->
                                     <JoinToBaseOutputNode>
                                         <!-- description = Join Standard Outputs -->
@@ -251,6 +256,7 @@
                                             <!--    'element_name': 'metric_time',            -->
                                             <!--    'entity_links': (),                       -->
                                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                            <!--    'date_part': None,                        -->
                                             <!--    'aggregation_state': None}                -->
                                             <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                                             <MetricTimeDimensionTransformNode>
@@ -319,6 +325,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_with_reused_measure_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_with_reused_measure_plan__dfp_0.xml
index 814ba44eff..749bda11de 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_with_reused_measure_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_measure_constraint_with_reused_measure_plan__dfp_0.xml
@@ -53,6 +53,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <WhereConstraintNode>
                                 <!-- description = Constrain Output with WHERE -->
@@ -86,6 +87,7 @@
                                     <!--    'element_name': 'metric_time',            -->
                                     <!--    'entity_links': (),                       -->
                                     <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': None,                        -->
                                     <!--    'aggregation_state': None}                -->
                                     <MetricTimeDimensionTransformNode>
                                         <!-- description = Metric Time Dimension 'ds' -->
@@ -131,6 +133,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multi_semantic_model_ratio_metrics_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multi_semantic_model_ratio_metrics_plan__dfp_0.xml
index de477d1c55..dd83dca62a 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multi_semantic_model_ratio_metrics_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multi_semantic_model_ratio_metrics_plan__dfp_0.xml
@@ -47,6 +47,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <JoinToBaseOutputNode>
                                 <!-- description = Join Standard Outputs -->
@@ -74,6 +75,7 @@
                                     <!--    'element_name': 'metric_time',            -->
                                     <!--    'entity_links': (),                       -->
                                     <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': None,                        -->
                                     <!--    'aggregation_state': None}                -->
                                     <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                                     <MetricTimeDimensionTransformNode>
@@ -145,6 +147,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <JoinToBaseOutputNode>
                                 <!-- description = Join Standard Outputs -->
@@ -172,6 +175,7 @@
                                     <!--    'element_name': 'metric_time',            -->
                                     <!--    'entity_links': (),                       -->
                                     <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': None,                        -->
                                     <!--    'aggregation_state': None}                -->
                                     <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                                     <MetricTimeDimensionTransformNode>
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
index 0513c678ae..e29686410d 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
@@ -44,11 +44,13 @@
                         <!--                                                                              'element_name': 'ds_partitioned',           -->
                         <!--                                                                              'entity_links': (),                         -->
                         <!--                                                                              'time_granularity': TimeGranularity.DAY,    -->
+                        <!--                                                                              'date_part': None,                          -->
                         <!--                                                                              'aggregation_state': None},                 -->
                         <!--                                           'node_to_join_time_dimension_spec': {'class': 'TimeDimensionSpec',             -->
                         <!--                                                                                'element_name': 'ds_partitioned',         -->
                         <!--                                                                                'entity_links': (),                       -->
                         <!--                                                                                'time_granularity': TimeGranularity.DAY,  -->
+                        <!--                                                                                'date_part': None,                        -->
                         <!--                                                                                'aggregation_state': None}},),            -->
                         <!--    'validity_window': None}                                                                                              -->
                         <FilterElementsNode>
@@ -65,6 +67,7 @@
                             <!--    'element_name': 'ds_partitioned',         -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <!-- include_spec =                     -->
                             <!--   {'class': 'LinklessEntitySpec',  -->
@@ -97,6 +100,7 @@
                             <!--    'element_name': 'ds_partitioned',         -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <!-- include_spec =                     -->
                             <!--   {'class': 'LinklessEntitySpec',  -->
@@ -117,11 +121,13 @@
                                 <!--                                                                              'element_name': 'ds_partitioned',           -->
                                 <!--                                                                              'entity_links': (),                         -->
                                 <!--                                                                              'time_granularity': TimeGranularity.DAY,    -->
+                                <!--                                                                              'date_part': None,                          -->
                                 <!--                                                                              'aggregation_state': None},                 -->
                                 <!--                                           'node_to_join_time_dimension_spec': {'class': 'TimeDimensionSpec',             -->
                                 <!--                                                                                'element_name': 'ds_partitioned',         -->
                                 <!--                                                                                'entity_links': (),                       -->
                                 <!--                                                                                'time_granularity': TimeGranularity.DAY,  -->
+                                <!--                                                                                'date_part': None,                        -->
                                 <!--                                                                                'aggregation_state': None}},),            -->
                                 <!--    'validity_window': None}                                                                                              -->
                                 <ReadSqlSourceNode>
@@ -143,11 +149,25 @@
                                     <!--      'ds_partitioned__month',                 -->
                                     <!--      'ds_partitioned__quarter',               -->
                                     <!--      'ds_partitioned__year',                  -->
+                                    <!--      'ds_partitioned__day',                   -->
+                                    <!--      'ds_partitioned__day',                   -->
+                                    <!--      'ds_partitioned__day',                   -->
+                                    <!--      'ds_partitioned__day',                   -->
+                                    <!--      'ds_partitioned__day',                   -->
+                                    <!--      'ds_partitioned__day',                   -->
+                                    <!--      'ds_partitioned__day',                   -->
                                     <!--      'customer_id__ds_partitioned__day',      -->
                                     <!--      'customer_id__ds_partitioned__week',     -->
                                     <!--      'customer_id__ds_partitioned__month',    -->
                                     <!--      'customer_id__ds_partitioned__quarter',  -->
                                     <!--      'customer_id__ds_partitioned__year',     -->
+                                    <!--      'customer_id__ds_partitioned__day',      -->
+                                    <!--      'customer_id__ds_partitioned__day',      -->
+                                    <!--      'customer_id__ds_partitioned__day',      -->
+                                    <!--      'customer_id__ds_partitioned__day',      -->
+                                    <!--      'customer_id__ds_partitioned__day',      -->
+                                    <!--      'customer_id__ds_partitioned__day',      -->
+                                    <!--      'customer_id__ds_partitioned__day',      -->
                                     <!--      'customer_id']                           -->
                                     <!-- node_id = pfe_0 -->
                                     <!-- include_spec = DimensionSpec(element_name='customer_name', entity_links=()) -->
@@ -168,60 +188,168 @@
                                     <!--    'element_name': 'ds_partitioned',         -->
                                     <!--    'entity_links': (),                       -->
                                     <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': None,                        -->
                                     <!--    'aggregation_state': None}                -->
                                     <!-- include_spec =                                -->
                                     <!--   {'class': 'TimeDimensionSpec',              -->
                                     <!--    'element_name': 'ds_partitioned',          -->
                                     <!--    'entity_links': (),                        -->
                                     <!--    'time_granularity': TimeGranularity.WEEK,  -->
+                                    <!--    'date_part': None,                         -->
                                     <!--    'aggregation_state': None}                 -->
                                     <!-- include_spec =                                 -->
                                     <!--   {'class': 'TimeDimensionSpec',               -->
                                     <!--    'element_name': 'ds_partitioned',           -->
                                     <!--    'entity_links': (),                         -->
                                     <!--    'time_granularity': TimeGranularity.MONTH,  -->
+                                    <!--    'date_part': None,                          -->
                                     <!--    'aggregation_state': None}                  -->
                                     <!-- include_spec =                                   -->
                                     <!--   {'class': 'TimeDimensionSpec',                 -->
                                     <!--    'element_name': 'ds_partitioned',             -->
                                     <!--    'entity_links': (),                           -->
                                     <!--    'time_granularity': TimeGranularity.QUARTER,  -->
+                                    <!--    'date_part': None,                            -->
                                     <!--    'aggregation_state': None}                    -->
                                     <!-- include_spec =                                -->
                                     <!--   {'class': 'TimeDimensionSpec',              -->
                                     <!--    'element_name': 'ds_partitioned',          -->
                                     <!--    'entity_links': (),                        -->
                                     <!--    'time_granularity': TimeGranularity.YEAR,  -->
+                                    <!--    'date_part': None,                         -->
                                     <!--    'aggregation_state': None}                 -->
+                                    <!-- include_spec =                               -->
+                                    <!--   {'class': 'TimeDimensionSpec',             -->
+                                    <!--    'element_name': 'ds_partitioned',         -->
+                                    <!--    'entity_links': (),                       -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': <DatePart.YEAR: 'year'>,     -->
+                                    <!--    'aggregation_state': None}                -->
+                                    <!-- include_spec =                                  -->
+                                    <!--   {'class': 'TimeDimensionSpec',                -->
+                                    <!--    'element_name': 'ds_partitioned',            -->
+                                    <!--    'entity_links': (),                          -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,     -->
+                                    <!--    'date_part': <DatePart.QUARTER: 'quarter'>,  -->
+                                    <!--    'aggregation_state': None}                   -->
+                                    <!-- include_spec =                               -->
+                                    <!--   {'class': 'TimeDimensionSpec',             -->
+                                    <!--    'element_name': 'ds_partitioned',         -->
+                                    <!--    'entity_links': (),                       -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': <DatePart.MONTH: 'month'>,   -->
+                                    <!--    'aggregation_state': None}                -->
+                                    <!-- include_spec =                               -->
+                                    <!--   {'class': 'TimeDimensionSpec',             -->
+                                    <!--    'element_name': 'ds_partitioned',         -->
+                                    <!--    'entity_links': (),                       -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': <DatePart.WEEK: 'week'>,     -->
+                                    <!--    'aggregation_state': None}                -->
+                                    <!-- include_spec =                               -->
+                                    <!--   {'class': 'TimeDimensionSpec',             -->
+                                    <!--    'element_name': 'ds_partitioned',         -->
+                                    <!--    'entity_links': (),                       -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': <DatePart.DAY: 'day'>,       -->
+                                    <!--    'aggregation_state': None}                -->
+                                    <!-- include_spec =                                      -->
+                                    <!--   {'class': 'TimeDimensionSpec',                    -->
+                                    <!--    'element_name': 'ds_partitioned',                -->
+                                    <!--    'entity_links': (),                              -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,         -->
+                                    <!--    'date_part': <DatePart.DAYOFWEEK: 'dayofweek'>,  -->
+                                    <!--    'aggregation_state': None}                       -->
+                                    <!-- include_spec =                                      -->
+                                    <!--   {'class': 'TimeDimensionSpec',                    -->
+                                    <!--    'element_name': 'ds_partitioned',                -->
+                                    <!--    'entity_links': (),                              -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,         -->
+                                    <!--    'date_part': <DatePart.DAYOFYEAR: 'dayofyear'>,  -->
+                                    <!--    'aggregation_state': None}                       -->
                                     <!-- include_spec =                                                                      -->
                                     <!--   {'class': 'TimeDimensionSpec',                                                    -->
                                     <!--    'element_name': 'ds_partitioned',                                                -->
                                     <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
                                     <!--    'time_granularity': TimeGranularity.DAY,                                         -->
+                                    <!--    'date_part': None,                                                               -->
                                     <!--    'aggregation_state': None}                                                       -->
                                     <!-- include_spec =                                                                      -->
                                     <!--   {'class': 'TimeDimensionSpec',                                                    -->
                                     <!--    'element_name': 'ds_partitioned',                                                -->
                                     <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
                                     <!--    'time_granularity': TimeGranularity.WEEK,                                        -->
+                                    <!--    'date_part': None,                                                               -->
                                     <!--    'aggregation_state': None}                                                       -->
                                     <!-- include_spec =                                                                      -->
                                     <!--   {'class': 'TimeDimensionSpec',                                                    -->
                                     <!--    'element_name': 'ds_partitioned',                                                -->
                                     <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
                                     <!--    'time_granularity': TimeGranularity.MONTH,                                       -->
+                                    <!--    'date_part': None,                                                               -->
                                     <!--    'aggregation_state': None}                                                       -->
                                     <!-- include_spec =                                                                      -->
                                     <!--   {'class': 'TimeDimensionSpec',                                                    -->
                                     <!--    'element_name': 'ds_partitioned',                                                -->
                                     <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
                                     <!--    'time_granularity': TimeGranularity.QUARTER,                                     -->
+                                    <!--    'date_part': None,                                                               -->
                                     <!--    'aggregation_state': None}                                                       -->
                                     <!-- include_spec =                                                                      -->
                                     <!--   {'class': 'TimeDimensionSpec',                                                    -->
                                     <!--    'element_name': 'ds_partitioned',                                                -->
                                     <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
                                     <!--    'time_granularity': TimeGranularity.YEAR,                                        -->
+                                    <!--    'date_part': None,                                                               -->
+                                    <!--    'aggregation_state': None}                                                       -->
+                                    <!-- include_spec =                                                                      -->
+                                    <!--   {'class': 'TimeDimensionSpec',                                                    -->
+                                    <!--    'element_name': 'ds_partitioned',                                                -->
+                                    <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,                                         -->
+                                    <!--    'date_part': <DatePart.YEAR: 'year'>,                                            -->
+                                    <!--    'aggregation_state': None}                                                       -->
+                                    <!-- include_spec =                                                                      -->
+                                    <!--   {'class': 'TimeDimensionSpec',                                                    -->
+                                    <!--    'element_name': 'ds_partitioned',                                                -->
+                                    <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,                                         -->
+                                    <!--    'date_part': <DatePart.QUARTER: 'quarter'>,                                      -->
+                                    <!--    'aggregation_state': None}                                                       -->
+                                    <!-- include_spec =                                                                      -->
+                                    <!--   {'class': 'TimeDimensionSpec',                                                    -->
+                                    <!--    'element_name': 'ds_partitioned',                                                -->
+                                    <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,                                         -->
+                                    <!--    'date_part': <DatePart.MONTH: 'month'>,                                          -->
+                                    <!--    'aggregation_state': None}                                                       -->
+                                    <!-- include_spec =                                                                      -->
+                                    <!--   {'class': 'TimeDimensionSpec',                                                    -->
+                                    <!--    'element_name': 'ds_partitioned',                                                -->
+                                    <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,                                         -->
+                                    <!--    'date_part': <DatePart.WEEK: 'week'>,                                            -->
+                                    <!--    'aggregation_state': None}                                                       -->
+                                    <!-- include_spec =                                                                      -->
+                                    <!--   {'class': 'TimeDimensionSpec',                                                    -->
+                                    <!--    'element_name': 'ds_partitioned',                                                -->
+                                    <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,                                         -->
+                                    <!--    'date_part': <DatePart.DAY: 'day'>,                                              -->
+                                    <!--    'aggregation_state': None}                                                       -->
+                                    <!-- include_spec =                                                                      -->
+                                    <!--   {'class': 'TimeDimensionSpec',                                                    -->
+                                    <!--    'element_name': 'ds_partitioned',                                                -->
+                                    <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,                                         -->
+                                    <!--    'date_part': <DatePart.DAYOFWEEK: 'dayofweek'>,                                  -->
+                                    <!--    'aggregation_state': None}                                                       -->
+                                    <!-- include_spec =                                                                      -->
+                                    <!--   {'class': 'TimeDimensionSpec',                                                    -->
+                                    <!--    'element_name': 'ds_partitioned',                                                -->
+                                    <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,                                         -->
+                                    <!--    'date_part': <DatePart.DAYOFYEAR: 'dayofyear'>,                                  -->
                                     <!--    'aggregation_state': None}                                                       -->
                                     <!-- include_spec = EntitySpec(element_name='customer_id', entity_links=()) -->
                                     <ReadSqlSourceNode>
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multiple_metrics_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multiple_metrics_plan__dfp_0.xml
index 7db1f469eb..b34126863d 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multiple_metrics_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multiple_metrics_plan__dfp_0.xml
@@ -38,6 +38,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
@@ -85,6 +86,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_order_by_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_order_by_plan__dfp_0.xml
index 4e848370c1..ea902f79a7 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_order_by_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_order_by_plan__dfp_0.xml
@@ -14,6 +14,7 @@
             <!--                            'element_name': 'metric_time',            -->
             <!--                            'entity_links': (),                       -->
             <!--                            'time_granularity': TimeGranularity.DAY,  -->
+            <!--                            'date_part': None,                        -->
             <!--                            'aggregation_state': None},               -->
             <!--    'entity_spec': None}                                              -->
             <!-- order_by_spec =                                 -->
@@ -56,6 +57,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_single_semantic_model_ratio_metrics_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_single_semantic_model_ratio_metrics_plan__dfp_0.xml
index 3469a47a37..0fc68ed052 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_single_semantic_model_ratio_metrics_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_single_semantic_model_ratio_metrics_plan__dfp_0.xml
@@ -47,6 +47,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <JoinToBaseOutputNode>
                                 <!-- description = Join Standard Outputs -->
@@ -74,6 +75,7 @@
                                     <!--    'element_name': 'metric_time',            -->
                                     <!--    'entity_links': (),                       -->
                                     <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': None,                        -->
                                     <!--    'aggregation_state': None}                -->
                                     <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                                     <MetricTimeDimensionTransformNode>
@@ -145,6 +147,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <JoinToBaseOutputNode>
                                 <!-- description = Join Standard Outputs -->
@@ -172,6 +175,7 @@
                                     <!--    'element_name': 'metric_time',            -->
                                     <!--    'entity_links': (),                       -->
                                     <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': None,                        -->
                                     <!--    'aggregation_state': None}                -->
                                     <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                                     <MetricTimeDimensionTransformNode>
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan_time_dimension__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan_time_dimension__dfp_0.xml
index 84cda54d21..c5493a3239 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan_time_dimension__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_where_constrained_plan_time_dimension__dfp_0.xml
@@ -41,6 +41,7 @@
                         <!--                                                    'element_name': 'metric_time',            -->
                         <!--                                                    'entity_links': (),                       -->
                         <!--                                                    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--                                                    'date_part': None,                        -->
                         <!--                                                    'aggregation_state': None},),             -->
                         <!--                          'entity_specs': ()}}                                                -->
                         <FilterElementsNode>
@@ -61,6 +62,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
index d5d1074893..9ab80bd341 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
@@ -35,6 +35,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                         <MetricTimeDimensionTransformNode>
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
index 2ead8da01d..4f3968902a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
@@ -35,6 +35,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                         <MetricTimeDimensionTransformNode>
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_without_offset__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_without_offset__plan0.xml
index 6abd3f4209..5f87539f4f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_without_offset__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_without_offset__plan0.xml
@@ -35,6 +35,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                         <MetricTimeDimensionTransformNode>
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
index 1e2968eecd..b320e6bd7b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -165,31 +249,73 @@ FULL OUTER JOIN (
           , subq_5.ds__month
           , subq_5.ds__quarter
           , subq_5.ds__year
+          , subq_5.ds__extract_year
+          , subq_5.ds__extract_quarter
+          , subq_5.ds__extract_month
+          , subq_5.ds__extract_week
+          , subq_5.ds__extract_day
+          , subq_5.ds__extract_dayofweek
+          , subq_5.ds__extract_dayofyear
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
           , subq_5.ds_partitioned__quarter
           , subq_5.ds_partitioned__year
+          , subq_5.ds_partitioned__extract_year
+          , subq_5.ds_partitioned__extract_quarter
+          , subq_5.ds_partitioned__extract_month
+          , subq_5.ds_partitioned__extract_week
+          , subq_5.ds_partitioned__extract_day
+          , subq_5.ds_partitioned__extract_dayofweek
+          , subq_5.ds_partitioned__extract_dayofyear
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
           , subq_5.paid_at__quarter
           , subq_5.paid_at__year
+          , subq_5.paid_at__extract_year
+          , subq_5.paid_at__extract_quarter
+          , subq_5.paid_at__extract_month
+          , subq_5.paid_at__extract_week
+          , subq_5.paid_at__extract_day
+          , subq_5.paid_at__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
           , subq_5.booking__ds__quarter
           , subq_5.booking__ds__year
+          , subq_5.booking__ds__extract_year
+          , subq_5.booking__ds__extract_quarter
+          , subq_5.booking__ds__extract_month
+          , subq_5.booking__ds__extract_week
+          , subq_5.booking__ds__extract_day
+          , subq_5.booking__ds__extract_dayofweek
+          , subq_5.booking__ds__extract_dayofyear
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
           , subq_5.booking__ds_partitioned__quarter
           , subq_5.booking__ds_partitioned__year
+          , subq_5.booking__ds_partitioned__extract_year
+          , subq_5.booking__ds_partitioned__extract_quarter
+          , subq_5.booking__ds_partitioned__extract_month
+          , subq_5.booking__ds_partitioned__extract_week
+          , subq_5.booking__ds_partitioned__extract_day
+          , subq_5.booking__ds_partitioned__extract_dayofweek
+          , subq_5.booking__ds_partitioned__extract_dayofyear
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
           , subq_5.booking__paid_at__quarter
           , subq_5.booking__paid_at__year
+          , subq_5.booking__paid_at__extract_year
+          , subq_5.booking__paid_at__extract_quarter
+          , subq_5.booking__paid_at__extract_month
+          , subq_5.booking__paid_at__extract_week
+          , subq_5.booking__paid_at__extract_day
+          , subq_5.booking__paid_at__extract_dayofweek
+          , subq_5.booking__paid_at__extract_dayofyear
           , subq_5.ds__day AS metric_time__day
           , subq_5.ds__week AS metric_time__week
           , subq_5.ds__month AS metric_time__month
@@ -239,32 +365,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql
index f8fa505210..c647a56b30 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql
@@ -44,32 +44,74 @@ FROM (
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -96,11 +138,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -109,11 +165,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index ec37329539..0715f5e0da 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -51,31 +51,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -125,32 +167,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -175,21 +259,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -218,11 +330,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -231,11 +357,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -296,21 +436,49 @@ FROM (
                 , subq_10.ds__month
                 , subq_10.ds__quarter
                 , subq_10.ds__year
+                , subq_10.ds__extract_year
+                , subq_10.ds__extract_quarter
+                , subq_10.ds__extract_month
+                , subq_10.ds__extract_week
+                , subq_10.ds__extract_day
+                , subq_10.ds__extract_dayofweek
+                , subq_10.ds__extract_dayofyear
                 , subq_10.ds_partitioned__day
                 , subq_10.ds_partitioned__week
                 , subq_10.ds_partitioned__month
                 , subq_10.ds_partitioned__quarter
                 , subq_10.ds_partitioned__year
+                , subq_10.ds_partitioned__extract_year
+                , subq_10.ds_partitioned__extract_quarter
+                , subq_10.ds_partitioned__extract_month
+                , subq_10.ds_partitioned__extract_week
+                , subq_10.ds_partitioned__extract_day
+                , subq_10.ds_partitioned__extract_dayofweek
+                , subq_10.ds_partitioned__extract_dayofyear
                 , subq_10.view__ds__day
                 , subq_10.view__ds__week
                 , subq_10.view__ds__month
                 , subq_10.view__ds__quarter
                 , subq_10.view__ds__year
+                , subq_10.view__ds__extract_year
+                , subq_10.view__ds__extract_quarter
+                , subq_10.view__ds__extract_month
+                , subq_10.view__ds__extract_week
+                , subq_10.view__ds__extract_day
+                , subq_10.view__ds__extract_dayofweek
+                , subq_10.view__ds__extract_dayofyear
                 , subq_10.view__ds_partitioned__day
                 , subq_10.view__ds_partitioned__week
                 , subq_10.view__ds_partitioned__month
                 , subq_10.view__ds_partitioned__quarter
                 , subq_10.view__ds_partitioned__year
+                , subq_10.view__ds_partitioned__extract_year
+                , subq_10.view__ds_partitioned__extract_quarter
+                , subq_10.view__ds_partitioned__extract_month
+                , subq_10.view__ds_partitioned__extract_week
+                , subq_10.view__ds_partitioned__extract_day
+                , subq_10.view__ds_partitioned__extract_dayofweek
+                , subq_10.view__ds_partitioned__extract_dayofyear
                 , subq_10.ds__day AS metric_time__day
                 , subq_10.ds__week AS metric_time__week
                 , subq_10.ds__month AS metric_time__month
@@ -330,21 +498,49 @@ FROM (
                   , DATE_TRUNC(views_source_src_10009.ds, month) AS ds__month
                   , DATE_TRUNC(views_source_src_10009.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(views_source_src_10009.ds, year) AS ds__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_dayofyear
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, year) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC(views_source_src_10009.ds, isoweek) AS view__ds__week
                   , DATE_TRUNC(views_source_src_10009.ds, month) AS view__ds__month
                   , DATE_TRUNC(views_source_src_10009.ds, quarter) AS view__ds__quarter
                   , DATE_TRUNC(views_source_src_10009.ds, year) AS view__ds__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS view__ds__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS view__ds__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS view__ds__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS view__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_dayofyear
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, isoweek) AS view__ds_partitioned__week
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, month) AS view__ds_partitioned__month
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, quarter) AS view__ds_partitioned__quarter
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, year) AS view__ds_partitioned__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofyear
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -367,21 +563,49 @@ FROM (
                 , subq_13.ds__month
                 , subq_13.ds__quarter
                 , subq_13.ds__year
+                , subq_13.ds__extract_year
+                , subq_13.ds__extract_quarter
+                , subq_13.ds__extract_month
+                , subq_13.ds__extract_week
+                , subq_13.ds__extract_day
+                , subq_13.ds__extract_dayofweek
+                , subq_13.ds__extract_dayofyear
                 , subq_13.created_at__day
                 , subq_13.created_at__week
                 , subq_13.created_at__month
                 , subq_13.created_at__quarter
                 , subq_13.created_at__year
+                , subq_13.created_at__extract_year
+                , subq_13.created_at__extract_quarter
+                , subq_13.created_at__extract_month
+                , subq_13.created_at__extract_week
+                , subq_13.created_at__extract_day
+                , subq_13.created_at__extract_dayofweek
+                , subq_13.created_at__extract_dayofyear
                 , subq_13.listing__ds__day
                 , subq_13.listing__ds__week
                 , subq_13.listing__ds__month
                 , subq_13.listing__ds__quarter
                 , subq_13.listing__ds__year
+                , subq_13.listing__ds__extract_year
+                , subq_13.listing__ds__extract_quarter
+                , subq_13.listing__ds__extract_month
+                , subq_13.listing__ds__extract_week
+                , subq_13.listing__ds__extract_day
+                , subq_13.listing__ds__extract_dayofweek
+                , subq_13.listing__ds__extract_dayofyear
                 , subq_13.listing__created_at__day
                 , subq_13.listing__created_at__week
                 , subq_13.listing__created_at__month
                 , subq_13.listing__created_at__quarter
                 , subq_13.listing__created_at__year
+                , subq_13.listing__created_at__extract_year
+                , subq_13.listing__created_at__extract_quarter
+                , subq_13.listing__created_at__extract_month
+                , subq_13.listing__created_at__extract_week
+                , subq_13.listing__created_at__extract_day
+                , subq_13.listing__created_at__extract_dayofweek
+                , subq_13.listing__created_at__extract_dayofyear
                 , subq_13.ds__day AS metric_time__day
                 , subq_13.ds__week AS metric_time__week
                 , subq_13.ds__month AS metric_time__month
@@ -410,11 +634,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -423,11 +661,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index 08bfd58be5..7bf9d04ee5 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -47,32 +47,74 @@ FROM (
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -99,11 +141,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -112,11 +168,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
index d6a8efaf58..2064e8d4a5 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
@@ -44,32 +44,74 @@ FROM (
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -96,11 +138,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -109,11 +165,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql
index 81a62360fc..b2502ec83f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql
@@ -38,32 +38,74 @@ FROM (
         , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
         , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
         , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
         , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
         , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
         , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
         , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
         , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
         , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
         , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
         , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
         , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
index 933fb9ceb6..932baf10dc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
index 94b6d6bce9..3ed483e9d4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
index 2ff6721ee1..0f802052ea 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
@@ -18,11 +18,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -40,11 +54,25 @@ FROM (
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
index 1aea8e979f..1f5785cdff 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 1421d2e6bd..6f77ab2cfe 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_1.ds__month
         , subq_1.ds__quarter
         , subq_1.ds__year
+        , subq_1.ds__extract_year
+        , subq_1.ds__extract_quarter
+        , subq_1.ds__extract_month
+        , subq_1.ds__extract_week
+        , subq_1.ds__extract_day
+        , subq_1.ds__extract_dayofweek
+        , subq_1.ds__extract_dayofyear
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
         , subq_1.company__ds__quarter
         , subq_1.company__ds__year
+        , subq_1.company__ds__extract_year
+        , subq_1.company__ds__extract_quarter
+        , subq_1.company__ds__extract_month
+        , subq_1.company__ds__extract_week
+        , subq_1.company__ds__extract_day
+        , subq_1.company__ds__extract_dayofweek
+        , subq_1.company__ds__extract_dayofyear
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -42,11 +56,25 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
           , subq_0.company__ds__quarter
           , subq_0.company__ds__year
+          , subq_0.company__ds__extract_year
+          , subq_0.company__ds__extract_quarter
+          , subq_0.company__ds__extract_month
+          , subq_0.company__ds__extract_week
+          , subq_0.company__ds__extract_day
+          , subq_0.company__ds__extract_dayofweek
+          , subq_0.company__ds__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
             , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
             , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
             , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
             , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
             , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
             , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
index b0f1599a3b..b53f5ed26c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_1.ds__month
         , subq_1.ds__quarter
         , subq_1.ds__year
+        , subq_1.ds__extract_year
+        , subq_1.ds__extract_quarter
+        , subq_1.ds__extract_month
+        , subq_1.ds__extract_week
+        , subq_1.ds__extract_day
+        , subq_1.ds__extract_dayofweek
+        , subq_1.ds__extract_dayofyear
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
         , subq_1.company__ds__quarter
         , subq_1.company__ds__year
+        , subq_1.company__ds__extract_year
+        , subq_1.company__ds__extract_quarter
+        , subq_1.company__ds__extract_month
+        , subq_1.company__ds__extract_week
+        , subq_1.company__ds__extract_day
+        , subq_1.company__ds__extract_dayofweek
+        , subq_1.company__ds__extract_dayofyear
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -42,11 +56,25 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
           , subq_0.company__ds__quarter
           , subq_0.company__ds__year
+          , subq_0.company__ds__extract_year
+          , subq_0.company__ds__extract_quarter
+          , subq_0.company__ds__extract_month
+          , subq_0.company__ds__extract_week
+          , subq_0.company__ds__extract_day
+          , subq_0.company__ds__extract_dayofweek
+          , subq_0.company__ds__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
             , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
             , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
             , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
             , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
             , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
             , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
index 2509b4af2a..6c4ce49599 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -170,31 +254,73 @@ FROM (
             , subq_5.ds__month
             , subq_5.ds__quarter
             , subq_5.ds__year
+            , subq_5.ds__extract_year
+            , subq_5.ds__extract_quarter
+            , subq_5.ds__extract_month
+            , subq_5.ds__extract_week
+            , subq_5.ds__extract_day
+            , subq_5.ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear
             , subq_5.ds_partitioned__day
             , subq_5.ds_partitioned__week
             , subq_5.ds_partitioned__month
             , subq_5.ds_partitioned__quarter
             , subq_5.ds_partitioned__year
+            , subq_5.ds_partitioned__extract_year
+            , subq_5.ds_partitioned__extract_quarter
+            , subq_5.ds_partitioned__extract_month
+            , subq_5.ds_partitioned__extract_week
+            , subq_5.ds_partitioned__extract_day
+            , subq_5.ds_partitioned__extract_dayofweek
+            , subq_5.ds_partitioned__extract_dayofyear
             , subq_5.paid_at__day
             , subq_5.paid_at__week
             , subq_5.paid_at__month
             , subq_5.paid_at__quarter
             , subq_5.paid_at__year
+            , subq_5.paid_at__extract_year
+            , subq_5.paid_at__extract_quarter
+            , subq_5.paid_at__extract_month
+            , subq_5.paid_at__extract_week
+            , subq_5.paid_at__extract_day
+            , subq_5.paid_at__extract_dayofweek
+            , subq_5.paid_at__extract_dayofyear
             , subq_5.booking__ds__day
             , subq_5.booking__ds__week
             , subq_5.booking__ds__month
             , subq_5.booking__ds__quarter
             , subq_5.booking__ds__year
+            , subq_5.booking__ds__extract_year
+            , subq_5.booking__ds__extract_quarter
+            , subq_5.booking__ds__extract_month
+            , subq_5.booking__ds__extract_week
+            , subq_5.booking__ds__extract_day
+            , subq_5.booking__ds__extract_dayofweek
+            , subq_5.booking__ds__extract_dayofyear
             , subq_5.booking__ds_partitioned__day
             , subq_5.booking__ds_partitioned__week
             , subq_5.booking__ds_partitioned__month
             , subq_5.booking__ds_partitioned__quarter
             , subq_5.booking__ds_partitioned__year
+            , subq_5.booking__ds_partitioned__extract_year
+            , subq_5.booking__ds_partitioned__extract_quarter
+            , subq_5.booking__ds_partitioned__extract_month
+            , subq_5.booking__ds_partitioned__extract_week
+            , subq_5.booking__ds_partitioned__extract_day
+            , subq_5.booking__ds_partitioned__extract_dayofweek
+            , subq_5.booking__ds_partitioned__extract_dayofyear
             , subq_5.booking__paid_at__day
             , subq_5.booking__paid_at__week
             , subq_5.booking__paid_at__month
             , subq_5.booking__paid_at__quarter
             , subq_5.booking__paid_at__year
+            , subq_5.booking__paid_at__extract_year
+            , subq_5.booking__paid_at__extract_quarter
+            , subq_5.booking__paid_at__extract_month
+            , subq_5.booking__paid_at__extract_week
+            , subq_5.booking__paid_at__extract_day
+            , subq_5.booking__paid_at__extract_dayofweek
+            , subq_5.booking__paid_at__extract_dayofyear
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -244,32 +370,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
index 8aecbdf2d9..56f97cc21c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 209adca784..a501f2c21b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
index 344a6f8a7e..64b240f7de 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 4d7ae69b40..706834fa9c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index fc94b13135..65759f67e7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -33,31 +33,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -93,31 +135,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -167,32 +251,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -235,31 +361,73 @@ FROM (
             , subq_9.ds__month AS ds__month
             , subq_9.ds__quarter AS ds__quarter
             , subq_9.ds__year AS ds__year
+            , subq_9.ds__extract_year AS ds__extract_year
+            , subq_9.ds__extract_quarter AS ds__extract_quarter
+            , subq_9.ds__extract_month AS ds__extract_month
+            , subq_9.ds__extract_week AS ds__extract_week
+            , subq_9.ds__extract_day AS ds__extract_day
+            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
             , subq_9.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_9.ds_partitioned__year AS ds_partitioned__year
+            , subq_9.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_9.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
             , subq_9.paid_at__quarter AS paid_at__quarter
             , subq_9.paid_at__year AS paid_at__year
+            , subq_9.paid_at__extract_year AS paid_at__extract_year
+            , subq_9.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_9.paid_at__extract_month AS paid_at__extract_month
+            , subq_9.paid_at__extract_week AS paid_at__extract_week
+            , subq_9.paid_at__extract_day AS paid_at__extract_day
+            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
             , subq_9.booking__ds__quarter AS booking__ds__quarter
             , subq_9.booking__ds__year AS booking__ds__year
+            , subq_9.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_9.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_9.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_9.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_9.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_9.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_9.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_9.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_9.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
             , subq_9.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_9.booking__paid_at__year AS booking__paid_at__year
+            , subq_9.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_9.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -295,31 +463,73 @@ FROM (
               , subq_8.ds__month
               , subq_8.ds__quarter
               , subq_8.ds__year
+              , subq_8.ds__extract_year
+              , subq_8.ds__extract_quarter
+              , subq_8.ds__extract_month
+              , subq_8.ds__extract_week
+              , subq_8.ds__extract_day
+              , subq_8.ds__extract_dayofweek
+              , subq_8.ds__extract_dayofyear
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
               , subq_8.ds_partitioned__quarter
               , subq_8.ds_partitioned__year
+              , subq_8.ds_partitioned__extract_year
+              , subq_8.ds_partitioned__extract_quarter
+              , subq_8.ds_partitioned__extract_month
+              , subq_8.ds_partitioned__extract_week
+              , subq_8.ds_partitioned__extract_day
+              , subq_8.ds_partitioned__extract_dayofweek
+              , subq_8.ds_partitioned__extract_dayofyear
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
               , subq_8.paid_at__quarter
               , subq_8.paid_at__year
+              , subq_8.paid_at__extract_year
+              , subq_8.paid_at__extract_quarter
+              , subq_8.paid_at__extract_month
+              , subq_8.paid_at__extract_week
+              , subq_8.paid_at__extract_day
+              , subq_8.paid_at__extract_dayofweek
+              , subq_8.paid_at__extract_dayofyear
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
               , subq_8.booking__ds__quarter
               , subq_8.booking__ds__year
+              , subq_8.booking__ds__extract_year
+              , subq_8.booking__ds__extract_quarter
+              , subq_8.booking__ds__extract_month
+              , subq_8.booking__ds__extract_week
+              , subq_8.booking__ds__extract_day
+              , subq_8.booking__ds__extract_dayofweek
+              , subq_8.booking__ds__extract_dayofyear
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
               , subq_8.booking__ds_partitioned__quarter
               , subq_8.booking__ds_partitioned__year
+              , subq_8.booking__ds_partitioned__extract_year
+              , subq_8.booking__ds_partitioned__extract_quarter
+              , subq_8.booking__ds_partitioned__extract_month
+              , subq_8.booking__ds_partitioned__extract_week
+              , subq_8.booking__ds_partitioned__extract_day
+              , subq_8.booking__ds_partitioned__extract_dayofweek
+              , subq_8.booking__ds_partitioned__extract_dayofyear
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
               , subq_8.booking__paid_at__quarter
               , subq_8.booking__paid_at__year
+              , subq_8.booking__paid_at__extract_year
+              , subq_8.booking__paid_at__extract_quarter
+              , subq_8.booking__paid_at__extract_month
+              , subq_8.booking__paid_at__extract_week
+              , subq_8.booking__paid_at__extract_day
+              , subq_8.booking__paid_at__extract_dayofweek
+              , subq_8.booking__paid_at__extract_dayofyear
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -369,32 +579,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index b35514eac0..12e3863ba1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -33,31 +33,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -93,31 +135,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -167,32 +251,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -236,31 +362,73 @@ FROM (
             , subq_9.ds__month AS ds__month
             , subq_9.ds__quarter AS ds__quarter
             , subq_9.ds__year AS ds__year
+            , subq_9.ds__extract_year AS ds__extract_year
+            , subq_9.ds__extract_quarter AS ds__extract_quarter
+            , subq_9.ds__extract_month AS ds__extract_month
+            , subq_9.ds__extract_week AS ds__extract_week
+            , subq_9.ds__extract_day AS ds__extract_day
+            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
             , subq_9.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_9.ds_partitioned__year AS ds_partitioned__year
+            , subq_9.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_9.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
             , subq_9.paid_at__quarter AS paid_at__quarter
             , subq_9.paid_at__year AS paid_at__year
+            , subq_9.paid_at__extract_year AS paid_at__extract_year
+            , subq_9.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_9.paid_at__extract_month AS paid_at__extract_month
+            , subq_9.paid_at__extract_week AS paid_at__extract_week
+            , subq_9.paid_at__extract_day AS paid_at__extract_day
+            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
             , subq_9.booking__ds__quarter AS booking__ds__quarter
             , subq_9.booking__ds__year AS booking__ds__year
+            , subq_9.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_9.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_9.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_9.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_9.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_9.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_9.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_9.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_9.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
             , subq_9.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_9.booking__paid_at__year AS booking__paid_at__year
+            , subq_9.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_9.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -296,31 +464,73 @@ FROM (
               , subq_8.ds__month
               , subq_8.ds__quarter
               , subq_8.ds__year
+              , subq_8.ds__extract_year
+              , subq_8.ds__extract_quarter
+              , subq_8.ds__extract_month
+              , subq_8.ds__extract_week
+              , subq_8.ds__extract_day
+              , subq_8.ds__extract_dayofweek
+              , subq_8.ds__extract_dayofyear
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
               , subq_8.ds_partitioned__quarter
               , subq_8.ds_partitioned__year
+              , subq_8.ds_partitioned__extract_year
+              , subq_8.ds_partitioned__extract_quarter
+              , subq_8.ds_partitioned__extract_month
+              , subq_8.ds_partitioned__extract_week
+              , subq_8.ds_partitioned__extract_day
+              , subq_8.ds_partitioned__extract_dayofweek
+              , subq_8.ds_partitioned__extract_dayofyear
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
               , subq_8.paid_at__quarter
               , subq_8.paid_at__year
+              , subq_8.paid_at__extract_year
+              , subq_8.paid_at__extract_quarter
+              , subq_8.paid_at__extract_month
+              , subq_8.paid_at__extract_week
+              , subq_8.paid_at__extract_day
+              , subq_8.paid_at__extract_dayofweek
+              , subq_8.paid_at__extract_dayofyear
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
               , subq_8.booking__ds__quarter
               , subq_8.booking__ds__year
+              , subq_8.booking__ds__extract_year
+              , subq_8.booking__ds__extract_quarter
+              , subq_8.booking__ds__extract_month
+              , subq_8.booking__ds__extract_week
+              , subq_8.booking__ds__extract_day
+              , subq_8.booking__ds__extract_dayofweek
+              , subq_8.booking__ds__extract_dayofyear
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
               , subq_8.booking__ds_partitioned__quarter
               , subq_8.booking__ds_partitioned__year
+              , subq_8.booking__ds_partitioned__extract_year
+              , subq_8.booking__ds_partitioned__extract_quarter
+              , subq_8.booking__ds_partitioned__extract_month
+              , subq_8.booking__ds_partitioned__extract_week
+              , subq_8.booking__ds_partitioned__extract_day
+              , subq_8.booking__ds_partitioned__extract_dayofweek
+              , subq_8.booking__ds_partitioned__extract_dayofyear
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
               , subq_8.booking__paid_at__quarter
               , subq_8.booking__paid_at__year
+              , subq_8.booking__paid_at__extract_year
+              , subq_8.booking__paid_at__extract_quarter
+              , subq_8.booking__paid_at__extract_month
+              , subq_8.booking__paid_at__extract_week
+              , subq_8.booking__paid_at__extract_day
+              , subq_8.booking__paid_at__extract_dayofweek
+              , subq_8.booking__paid_at__extract_dayofyear
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -370,32 +580,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
index 69c82a8daa..77bb8bd9ad 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_4.ds__month AS ds__month
           , subq_4.ds__quarter AS ds__quarter
           , subq_4.ds__year AS ds__year
+          , subq_4.ds__extract_year AS ds__extract_year
+          , subq_4.ds__extract_quarter AS ds__extract_quarter
+          , subq_4.ds__extract_month AS ds__extract_month
+          , subq_4.ds__extract_week AS ds__extract_week
+          , subq_4.ds__extract_day AS ds__extract_day
+          , subq_4.ds__extract_dayofweek AS ds__extract_dayofweek
+          , subq_4.ds__extract_dayofyear AS ds__extract_dayofyear
           , subq_4.ds_partitioned__day AS ds_partitioned__day
           , subq_4.ds_partitioned__week AS ds_partitioned__week
           , subq_4.ds_partitioned__month AS ds_partitioned__month
           , subq_4.ds_partitioned__quarter AS ds_partitioned__quarter
           , subq_4.ds_partitioned__year AS ds_partitioned__year
+          , subq_4.ds_partitioned__extract_year AS ds_partitioned__extract_year
+          , subq_4.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+          , subq_4.ds_partitioned__extract_month AS ds_partitioned__extract_month
+          , subq_4.ds_partitioned__extract_week AS ds_partitioned__extract_week
+          , subq_4.ds_partitioned__extract_day AS ds_partitioned__extract_day
+          , subq_4.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+          , subq_4.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
           , subq_4.paid_at__day AS paid_at__day
           , subq_4.paid_at__week AS paid_at__week
           , subq_4.paid_at__month AS paid_at__month
           , subq_4.paid_at__quarter AS paid_at__quarter
           , subq_4.paid_at__year AS paid_at__year
+          , subq_4.paid_at__extract_year AS paid_at__extract_year
+          , subq_4.paid_at__extract_quarter AS paid_at__extract_quarter
+          , subq_4.paid_at__extract_month AS paid_at__extract_month
+          , subq_4.paid_at__extract_week AS paid_at__extract_week
+          , subq_4.paid_at__extract_day AS paid_at__extract_day
+          , subq_4.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+          , subq_4.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
           , subq_4.booking__ds__day AS booking__ds__day
           , subq_4.booking__ds__week AS booking__ds__week
           , subq_4.booking__ds__month AS booking__ds__month
           , subq_4.booking__ds__quarter AS booking__ds__quarter
           , subq_4.booking__ds__year AS booking__ds__year
+          , subq_4.booking__ds__extract_year AS booking__ds__extract_year
+          , subq_4.booking__ds__extract_quarter AS booking__ds__extract_quarter
+          , subq_4.booking__ds__extract_month AS booking__ds__extract_month
+          , subq_4.booking__ds__extract_week AS booking__ds__extract_week
+          , subq_4.booking__ds__extract_day AS booking__ds__extract_day
+          , subq_4.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+          , subq_4.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
           , subq_4.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_4.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_4.booking__ds_partitioned__month AS booking__ds_partitioned__month
           , subq_4.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
           , subq_4.booking__ds_partitioned__year AS booking__ds_partitioned__year
+          , subq_4.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+          , subq_4.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+          , subq_4.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+          , subq_4.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+          , subq_4.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+          , subq_4.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+          , subq_4.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
           , subq_4.booking__paid_at__day AS booking__paid_at__day
           , subq_4.booking__paid_at__week AS booking__paid_at__week
           , subq_4.booking__paid_at__month AS booking__paid_at__month
           , subq_4.booking__paid_at__quarter AS booking__paid_at__quarter
           , subq_4.booking__paid_at__year AS booking__paid_at__year
+          , subq_4.booking__paid_at__extract_year AS booking__paid_at__extract_year
+          , subq_4.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+          , subq_4.booking__paid_at__extract_month AS booking__paid_at__extract_month
+          , subq_4.booking__paid_at__extract_week AS booking__paid_at__extract_week
+          , subq_4.booking__paid_at__extract_day AS booking__paid_at__extract_day
+          , subq_4.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+          , subq_4.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
           , subq_4.listing AS listing
           , subq_4.guest AS guest
           , subq_4.host AS host
@@ -88,31 +130,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.metric_time__week AS metric_time__week
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
@@ -152,31 +236,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -226,32 +352,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 0611cb68f9..7636cc1e70 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_1.ds__month AS ds__month
           , subq_1.ds__quarter AS ds__quarter
           , subq_1.ds__year AS ds__year
+          , subq_1.ds__extract_year AS ds__extract_year
+          , subq_1.ds__extract_quarter AS ds__extract_quarter
+          , subq_1.ds__extract_month AS ds__extract_month
+          , subq_1.ds__extract_week AS ds__extract_week
+          , subq_1.ds__extract_day AS ds__extract_day
+          , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+          , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
           , subq_1.ds_partitioned__day AS ds_partitioned__day
           , subq_1.ds_partitioned__week AS ds_partitioned__week
           , subq_1.ds_partitioned__month AS ds_partitioned__month
           , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
           , subq_1.ds_partitioned__year AS ds_partitioned__year
+          , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+          , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+          , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+          , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+          , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+          , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+          , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
           , subq_1.paid_at__day AS paid_at__day
           , subq_1.paid_at__week AS paid_at__week
           , subq_1.paid_at__month AS paid_at__month
           , subq_1.paid_at__quarter AS paid_at__quarter
           , subq_1.paid_at__year AS paid_at__year
+          , subq_1.paid_at__extract_year AS paid_at__extract_year
+          , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+          , subq_1.paid_at__extract_month AS paid_at__extract_month
+          , subq_1.paid_at__extract_week AS paid_at__extract_week
+          , subq_1.paid_at__extract_day AS paid_at__extract_day
+          , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+          , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
           , subq_1.booking__ds__day AS booking__ds__day
           , subq_1.booking__ds__week AS booking__ds__week
           , subq_1.booking__ds__month AS booking__ds__month
           , subq_1.booking__ds__quarter AS booking__ds__quarter
           , subq_1.booking__ds__year AS booking__ds__year
+          , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+          , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+          , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+          , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+          , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+          , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+          , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
           , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
           , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
           , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+          , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+          , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+          , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+          , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+          , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+          , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+          , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
           , subq_1.booking__paid_at__day AS booking__paid_at__day
           , subq_1.booking__paid_at__week AS booking__paid_at__week
           , subq_1.booking__paid_at__month AS booking__paid_at__month
           , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
           , subq_1.booking__paid_at__year AS booking__paid_at__year
+          , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+          , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+          , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+          , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+          , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+          , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+          , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
           , subq_1.listing AS listing
           , subq_1.guest AS guest
           , subq_1.host AS host
@@ -87,31 +129,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -161,32 +245,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
index c425f193ff..58dc1a7753 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
@@ -42,31 +42,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -116,32 +158,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -166,21 +250,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -209,11 +321,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -222,11 +348,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql
index 54339676f9..275f765347 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql
@@ -25,32 +25,74 @@ FROM (
     , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
     , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
     , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
     , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
     , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
     , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
     , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
     , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
index 8bf2f905ba..4f0cd51ead 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
@@ -31,32 +31,74 @@ FROM (
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 84967d17b8..eac727a04f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -48,31 +48,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -122,32 +164,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -172,21 +256,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -215,11 +327,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -228,11 +354,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
index 3e4b26294d..d35cde616a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
@@ -31,7 +31,7 @@ FROM (
           SELECT
             subq_2.metric_time__day AS metric_time__day
             , subq_4.window_start__day AS listing__window_start__day
-            , subq_4.window_end__day AS listing__window_end__day
+            , subq_4.window_end__extract_week AS listing__window_end__extract_week
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -50,31 +50,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -110,32 +152,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10015.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10015.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10015.ds, year) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, year) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, year) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10015.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10015.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10015.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10015.ds, year) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, year) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, year) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -153,7 +237,7 @@ FROM (
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
               subq_3.window_start__day
-              , subq_3.window_end__day
+              , subq_3.window_end__extract_week
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -164,11 +248,25 @@ FROM (
                 , DATE_TRUNC(listings_src_10017.active_from, month) AS window_start__month
                 , DATE_TRUNC(listings_src_10017.active_from, quarter) AS window_start__quarter
                 , DATE_TRUNC(listings_src_10017.active_from, year) AS window_start__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC(listings_src_10017.active_to, isoweek) AS window_end__week
                 , DATE_TRUNC(listings_src_10017.active_to, month) AS window_end__month
                 , DATE_TRUNC(listings_src_10017.active_to, quarter) AS window_end__quarter
                 , DATE_TRUNC(listings_src_10017.active_to, year) AS window_end__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -177,11 +275,25 @@ FROM (
                 , DATE_TRUNC(listings_src_10017.active_from, month) AS listing__window_start__month
                 , DATE_TRUNC(listings_src_10017.active_from, quarter) AS listing__window_start__quarter
                 , DATE_TRUNC(listings_src_10017.active_from, year) AS listing__window_start__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC(listings_src_10017.active_to, isoweek) AS listing__window_end__week
                 , DATE_TRUNC(listings_src_10017.active_to, month) AS listing__window_end__month
                 , DATE_TRUNC(listings_src_10017.active_to, quarter) AS listing__window_end__quarter
                 , DATE_TRUNC(listings_src_10017.active_to, year) AS listing__window_end__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
@@ -199,9 +311,9 @@ FROM (
                 subq_2.metric_time__day >= subq_4.window_start__day
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__day
+                  subq_2.metric_time__day < subq_4.window_end__extract_week
                 ) OR (
-                  subq_4.window_end__day IS NULL
+                  subq_4.window_end__extract_week IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
index 86a2010b35..f0af95c23f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
@@ -35,9 +35,9 @@ FROM (
         subq_12.metric_time__day >= listings_src_10017.active_from
       ) AND (
         (
-          subq_12.metric_time__day < listings_src_10017.active_to
+          subq_12.metric_time__day < EXTRACT(WEEK FROM listings_src_10017.active_to)
         ) OR (
-          listings_src_10017.active_to IS NULL
+          EXTRACT(WEEK FROM listings_src_10017.active_to) IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 596f7bc63d..c5d9e328b3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 57d8f2dd86..31b984a461 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
index 4bfa0a7160..e346d4997e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
index 76460a6549..e02fa3f09c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
@@ -26,31 +26,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
index 62281ada3f..ee95464b60 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
@@ -21,21 +21,49 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.created_at__day
         , subq_0.created_at__week
         , subq_0.created_at__month
         , subq_0.created_at__quarter
         , subq_0.created_at__year
+        , subq_0.created_at__extract_year
+        , subq_0.created_at__extract_quarter
+        , subq_0.created_at__extract_month
+        , subq_0.created_at__extract_week
+        , subq_0.created_at__extract_day
+        , subq_0.created_at__extract_dayofweek
+        , subq_0.created_at__extract_dayofyear
         , subq_0.listing__ds__day
         , subq_0.listing__ds__week
         , subq_0.listing__ds__month
         , subq_0.listing__ds__quarter
         , subq_0.listing__ds__year
+        , subq_0.listing__ds__extract_year
+        , subq_0.listing__ds__extract_quarter
+        , subq_0.listing__ds__extract_month
+        , subq_0.listing__ds__extract_week
+        , subq_0.listing__ds__extract_day
+        , subq_0.listing__ds__extract_dayofweek
+        , subq_0.listing__ds__extract_dayofyear
         , subq_0.listing__created_at__day
         , subq_0.listing__created_at__week
         , subq_0.listing__created_at__month
         , subq_0.listing__created_at__quarter
         , subq_0.listing__created_at__year
+        , subq_0.listing__created_at__extract_year
+        , subq_0.listing__created_at__extract_quarter
+        , subq_0.listing__created_at__extract_month
+        , subq_0.listing__created_at__extract_week
+        , subq_0.listing__created_at__extract_day
+        , subq_0.listing__created_at__extract_dayofweek
+        , subq_0.listing__created_at__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -77,11 +119,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql
index 6b1d66f727..db653ee51c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql
@@ -35,32 +35,74 @@ FROM (
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
index 32e4f04bb3..6385db4297 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
@@ -60,31 +60,73 @@ FROM (
                     , subq_0.ds__month
                     , subq_0.ds__quarter
                     , subq_0.ds__year
+                    , subq_0.ds__extract_year
+                    , subq_0.ds__extract_quarter
+                    , subq_0.ds__extract_month
+                    , subq_0.ds__extract_week
+                    , subq_0.ds__extract_day
+                    , subq_0.ds__extract_dayofweek
+                    , subq_0.ds__extract_dayofyear
                     , subq_0.ds_partitioned__day
                     , subq_0.ds_partitioned__week
                     , subq_0.ds_partitioned__month
                     , subq_0.ds_partitioned__quarter
                     , subq_0.ds_partitioned__year
+                    , subq_0.ds_partitioned__extract_year
+                    , subq_0.ds_partitioned__extract_quarter
+                    , subq_0.ds_partitioned__extract_month
+                    , subq_0.ds_partitioned__extract_week
+                    , subq_0.ds_partitioned__extract_day
+                    , subq_0.ds_partitioned__extract_dayofweek
+                    , subq_0.ds_partitioned__extract_dayofyear
                     , subq_0.paid_at__day
                     , subq_0.paid_at__week
                     , subq_0.paid_at__month
                     , subq_0.paid_at__quarter
                     , subq_0.paid_at__year
+                    , subq_0.paid_at__extract_year
+                    , subq_0.paid_at__extract_quarter
+                    , subq_0.paid_at__extract_month
+                    , subq_0.paid_at__extract_week
+                    , subq_0.paid_at__extract_day
+                    , subq_0.paid_at__extract_dayofweek
+                    , subq_0.paid_at__extract_dayofyear
                     , subq_0.booking__ds__day
                     , subq_0.booking__ds__week
                     , subq_0.booking__ds__month
                     , subq_0.booking__ds__quarter
                     , subq_0.booking__ds__year
+                    , subq_0.booking__ds__extract_year
+                    , subq_0.booking__ds__extract_quarter
+                    , subq_0.booking__ds__extract_month
+                    , subq_0.booking__ds__extract_week
+                    , subq_0.booking__ds__extract_day
+                    , subq_0.booking__ds__extract_dayofweek
+                    , subq_0.booking__ds__extract_dayofyear
                     , subq_0.booking__ds_partitioned__day
                     , subq_0.booking__ds_partitioned__week
                     , subq_0.booking__ds_partitioned__month
                     , subq_0.booking__ds_partitioned__quarter
                     , subq_0.booking__ds_partitioned__year
+                    , subq_0.booking__ds_partitioned__extract_year
+                    , subq_0.booking__ds_partitioned__extract_quarter
+                    , subq_0.booking__ds_partitioned__extract_month
+                    , subq_0.booking__ds_partitioned__extract_week
+                    , subq_0.booking__ds_partitioned__extract_day
+                    , subq_0.booking__ds_partitioned__extract_dayofweek
+                    , subq_0.booking__ds_partitioned__extract_dayofyear
                     , subq_0.booking__paid_at__day
                     , subq_0.booking__paid_at__week
                     , subq_0.booking__paid_at__month
                     , subq_0.booking__paid_at__quarter
                     , subq_0.booking__paid_at__year
+                    , subq_0.booking__paid_at__extract_year
+                    , subq_0.booking__paid_at__extract_quarter
+                    , subq_0.booking__paid_at__extract_month
+                    , subq_0.booking__paid_at__extract_week
+                    , subq_0.booking__paid_at__extract_day
+                    , subq_0.booking__paid_at__extract_dayofweek
+                    , subq_0.booking__paid_at__extract_dayofyear
                     , subq_0.ds__day AS metric_time__day
                     , subq_0.ds__week AS metric_time__week
                     , subq_0.ds__month AS metric_time__month
@@ -134,32 +176,74 @@ FROM (
                       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -184,21 +268,49 @@ FROM (
                     , subq_3.ds__month
                     , subq_3.ds__quarter
                     , subq_3.ds__year
+                    , subq_3.ds__extract_year
+                    , subq_3.ds__extract_quarter
+                    , subq_3.ds__extract_month
+                    , subq_3.ds__extract_week
+                    , subq_3.ds__extract_day
+                    , subq_3.ds__extract_dayofweek
+                    , subq_3.ds__extract_dayofyear
                     , subq_3.created_at__day
                     , subq_3.created_at__week
                     , subq_3.created_at__month
                     , subq_3.created_at__quarter
                     , subq_3.created_at__year
+                    , subq_3.created_at__extract_year
+                    , subq_3.created_at__extract_quarter
+                    , subq_3.created_at__extract_month
+                    , subq_3.created_at__extract_week
+                    , subq_3.created_at__extract_day
+                    , subq_3.created_at__extract_dayofweek
+                    , subq_3.created_at__extract_dayofyear
                     , subq_3.listing__ds__day
                     , subq_3.listing__ds__week
                     , subq_3.listing__ds__month
                     , subq_3.listing__ds__quarter
                     , subq_3.listing__ds__year
+                    , subq_3.listing__ds__extract_year
+                    , subq_3.listing__ds__extract_quarter
+                    , subq_3.listing__ds__extract_month
+                    , subq_3.listing__ds__extract_week
+                    , subq_3.listing__ds__extract_day
+                    , subq_3.listing__ds__extract_dayofweek
+                    , subq_3.listing__ds__extract_dayofyear
                     , subq_3.listing__created_at__day
                     , subq_3.listing__created_at__week
                     , subq_3.listing__created_at__month
                     , subq_3.listing__created_at__quarter
                     , subq_3.listing__created_at__year
+                    , subq_3.listing__created_at__extract_year
+                    , subq_3.listing__created_at__extract_quarter
+                    , subq_3.listing__created_at__extract_month
+                    , subq_3.listing__created_at__extract_week
+                    , subq_3.listing__created_at__extract_day
+                    , subq_3.listing__created_at__extract_dayofweek
+                    , subq_3.listing__created_at__extract_dayofyear
                     , subq_3.ds__day AS metric_time__day
                     , subq_3.ds__week AS metric_time__week
                     , subq_3.ds__month AS metric_time__month
@@ -227,11 +339,25 @@ FROM (
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -240,11 +366,25 @@ FROM (
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -317,31 +457,73 @@ FROM (
                     , subq_12.ds__month
                     , subq_12.ds__quarter
                     , subq_12.ds__year
+                    , subq_12.ds__extract_year
+                    , subq_12.ds__extract_quarter
+                    , subq_12.ds__extract_month
+                    , subq_12.ds__extract_week
+                    , subq_12.ds__extract_day
+                    , subq_12.ds__extract_dayofweek
+                    , subq_12.ds__extract_dayofyear
                     , subq_12.ds_partitioned__day
                     , subq_12.ds_partitioned__week
                     , subq_12.ds_partitioned__month
                     , subq_12.ds_partitioned__quarter
                     , subq_12.ds_partitioned__year
+                    , subq_12.ds_partitioned__extract_year
+                    , subq_12.ds_partitioned__extract_quarter
+                    , subq_12.ds_partitioned__extract_month
+                    , subq_12.ds_partitioned__extract_week
+                    , subq_12.ds_partitioned__extract_day
+                    , subq_12.ds_partitioned__extract_dayofweek
+                    , subq_12.ds_partitioned__extract_dayofyear
                     , subq_12.paid_at__day
                     , subq_12.paid_at__week
                     , subq_12.paid_at__month
                     , subq_12.paid_at__quarter
                     , subq_12.paid_at__year
+                    , subq_12.paid_at__extract_year
+                    , subq_12.paid_at__extract_quarter
+                    , subq_12.paid_at__extract_month
+                    , subq_12.paid_at__extract_week
+                    , subq_12.paid_at__extract_day
+                    , subq_12.paid_at__extract_dayofweek
+                    , subq_12.paid_at__extract_dayofyear
                     , subq_12.booking__ds__day
                     , subq_12.booking__ds__week
                     , subq_12.booking__ds__month
                     , subq_12.booking__ds__quarter
                     , subq_12.booking__ds__year
+                    , subq_12.booking__ds__extract_year
+                    , subq_12.booking__ds__extract_quarter
+                    , subq_12.booking__ds__extract_month
+                    , subq_12.booking__ds__extract_week
+                    , subq_12.booking__ds__extract_day
+                    , subq_12.booking__ds__extract_dayofweek
+                    , subq_12.booking__ds__extract_dayofyear
                     , subq_12.booking__ds_partitioned__day
                     , subq_12.booking__ds_partitioned__week
                     , subq_12.booking__ds_partitioned__month
                     , subq_12.booking__ds_partitioned__quarter
                     , subq_12.booking__ds_partitioned__year
+                    , subq_12.booking__ds_partitioned__extract_year
+                    , subq_12.booking__ds_partitioned__extract_quarter
+                    , subq_12.booking__ds_partitioned__extract_month
+                    , subq_12.booking__ds_partitioned__extract_week
+                    , subq_12.booking__ds_partitioned__extract_day
+                    , subq_12.booking__ds_partitioned__extract_dayofweek
+                    , subq_12.booking__ds_partitioned__extract_dayofyear
                     , subq_12.booking__paid_at__day
                     , subq_12.booking__paid_at__week
                     , subq_12.booking__paid_at__month
                     , subq_12.booking__paid_at__quarter
                     , subq_12.booking__paid_at__year
+                    , subq_12.booking__paid_at__extract_year
+                    , subq_12.booking__paid_at__extract_quarter
+                    , subq_12.booking__paid_at__extract_month
+                    , subq_12.booking__paid_at__extract_week
+                    , subq_12.booking__paid_at__extract_day
+                    , subq_12.booking__paid_at__extract_dayofweek
+                    , subq_12.booking__paid_at__extract_dayofyear
                     , subq_12.ds__day AS metric_time__day
                     , subq_12.ds__week AS metric_time__week
                     , subq_12.ds__month AS metric_time__month
@@ -391,32 +573,74 @@ FROM (
                       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -441,21 +665,49 @@ FROM (
                     , subq_15.ds__month
                     , subq_15.ds__quarter
                     , subq_15.ds__year
+                    , subq_15.ds__extract_year
+                    , subq_15.ds__extract_quarter
+                    , subq_15.ds__extract_month
+                    , subq_15.ds__extract_week
+                    , subq_15.ds__extract_day
+                    , subq_15.ds__extract_dayofweek
+                    , subq_15.ds__extract_dayofyear
                     , subq_15.created_at__day
                     , subq_15.created_at__week
                     , subq_15.created_at__month
                     , subq_15.created_at__quarter
                     , subq_15.created_at__year
+                    , subq_15.created_at__extract_year
+                    , subq_15.created_at__extract_quarter
+                    , subq_15.created_at__extract_month
+                    , subq_15.created_at__extract_week
+                    , subq_15.created_at__extract_day
+                    , subq_15.created_at__extract_dayofweek
+                    , subq_15.created_at__extract_dayofyear
                     , subq_15.listing__ds__day
                     , subq_15.listing__ds__week
                     , subq_15.listing__ds__month
                     , subq_15.listing__ds__quarter
                     , subq_15.listing__ds__year
+                    , subq_15.listing__ds__extract_year
+                    , subq_15.listing__ds__extract_quarter
+                    , subq_15.listing__ds__extract_month
+                    , subq_15.listing__ds__extract_week
+                    , subq_15.listing__ds__extract_day
+                    , subq_15.listing__ds__extract_dayofweek
+                    , subq_15.listing__ds__extract_dayofyear
                     , subq_15.listing__created_at__day
                     , subq_15.listing__created_at__week
                     , subq_15.listing__created_at__month
                     , subq_15.listing__created_at__quarter
                     , subq_15.listing__created_at__year
+                    , subq_15.listing__created_at__extract_year
+                    , subq_15.listing__created_at__extract_quarter
+                    , subq_15.listing__created_at__extract_month
+                    , subq_15.listing__created_at__extract_week
+                    , subq_15.listing__created_at__extract_day
+                    , subq_15.listing__created_at__extract_dayofweek
+                    , subq_15.listing__created_at__extract_dayofyear
                     , subq_15.ds__day AS metric_time__day
                     , subq_15.ds__week AS metric_time__week
                     , subq_15.ds__month AS metric_time__month
@@ -484,11 +736,25 @@ FROM (
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -497,11 +763,25 @@ FROM (
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -557,31 +837,73 @@ FROM (
             , subq_24.ds__month
             , subq_24.ds__quarter
             , subq_24.ds__year
+            , subq_24.ds__extract_year
+            , subq_24.ds__extract_quarter
+            , subq_24.ds__extract_month
+            , subq_24.ds__extract_week
+            , subq_24.ds__extract_day
+            , subq_24.ds__extract_dayofweek
+            , subq_24.ds__extract_dayofyear
             , subq_24.ds_partitioned__day
             , subq_24.ds_partitioned__week
             , subq_24.ds_partitioned__month
             , subq_24.ds_partitioned__quarter
             , subq_24.ds_partitioned__year
+            , subq_24.ds_partitioned__extract_year
+            , subq_24.ds_partitioned__extract_quarter
+            , subq_24.ds_partitioned__extract_month
+            , subq_24.ds_partitioned__extract_week
+            , subq_24.ds_partitioned__extract_day
+            , subq_24.ds_partitioned__extract_dayofweek
+            , subq_24.ds_partitioned__extract_dayofyear
             , subq_24.paid_at__day
             , subq_24.paid_at__week
             , subq_24.paid_at__month
             , subq_24.paid_at__quarter
             , subq_24.paid_at__year
+            , subq_24.paid_at__extract_year
+            , subq_24.paid_at__extract_quarter
+            , subq_24.paid_at__extract_month
+            , subq_24.paid_at__extract_week
+            , subq_24.paid_at__extract_day
+            , subq_24.paid_at__extract_dayofweek
+            , subq_24.paid_at__extract_dayofyear
             , subq_24.booking__ds__day
             , subq_24.booking__ds__week
             , subq_24.booking__ds__month
             , subq_24.booking__ds__quarter
             , subq_24.booking__ds__year
+            , subq_24.booking__ds__extract_year
+            , subq_24.booking__ds__extract_quarter
+            , subq_24.booking__ds__extract_month
+            , subq_24.booking__ds__extract_week
+            , subq_24.booking__ds__extract_day
+            , subq_24.booking__ds__extract_dayofweek
+            , subq_24.booking__ds__extract_dayofyear
             , subq_24.booking__ds_partitioned__day
             , subq_24.booking__ds_partitioned__week
             , subq_24.booking__ds_partitioned__month
             , subq_24.booking__ds_partitioned__quarter
             , subq_24.booking__ds_partitioned__year
+            , subq_24.booking__ds_partitioned__extract_year
+            , subq_24.booking__ds_partitioned__extract_quarter
+            , subq_24.booking__ds_partitioned__extract_month
+            , subq_24.booking__ds_partitioned__extract_week
+            , subq_24.booking__ds_partitioned__extract_day
+            , subq_24.booking__ds_partitioned__extract_dayofweek
+            , subq_24.booking__ds_partitioned__extract_dayofyear
             , subq_24.booking__paid_at__day
             , subq_24.booking__paid_at__week
             , subq_24.booking__paid_at__month
             , subq_24.booking__paid_at__quarter
             , subq_24.booking__paid_at__year
+            , subq_24.booking__paid_at__extract_year
+            , subq_24.booking__paid_at__extract_quarter
+            , subq_24.booking__paid_at__extract_month
+            , subq_24.booking__paid_at__extract_week
+            , subq_24.booking__paid_at__extract_day
+            , subq_24.booking__paid_at__extract_dayofweek
+            , subq_24.booking__paid_at__extract_dayofyear
             , subq_24.ds__day AS metric_time__day
             , subq_24.ds__week AS metric_time__week
             , subq_24.ds__month AS metric_time__month
@@ -631,32 +953,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
index 0574ca1f09..9352ceb3e2 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
@@ -45,31 +45,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -119,32 +161,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -186,31 +270,73 @@ FROM (
             , subq_7.ds__month
             , subq_7.ds__quarter
             , subq_7.ds__year
+            , subq_7.ds__extract_year
+            , subq_7.ds__extract_quarter
+            , subq_7.ds__extract_month
+            , subq_7.ds__extract_week
+            , subq_7.ds__extract_day
+            , subq_7.ds__extract_dayofweek
+            , subq_7.ds__extract_dayofyear
             , subq_7.ds_partitioned__day
             , subq_7.ds_partitioned__week
             , subq_7.ds_partitioned__month
             , subq_7.ds_partitioned__quarter
             , subq_7.ds_partitioned__year
+            , subq_7.ds_partitioned__extract_year
+            , subq_7.ds_partitioned__extract_quarter
+            , subq_7.ds_partitioned__extract_month
+            , subq_7.ds_partitioned__extract_week
+            , subq_7.ds_partitioned__extract_day
+            , subq_7.ds_partitioned__extract_dayofweek
+            , subq_7.ds_partitioned__extract_dayofyear
             , subq_7.paid_at__day
             , subq_7.paid_at__week
             , subq_7.paid_at__month
             , subq_7.paid_at__quarter
             , subq_7.paid_at__year
+            , subq_7.paid_at__extract_year
+            , subq_7.paid_at__extract_quarter
+            , subq_7.paid_at__extract_month
+            , subq_7.paid_at__extract_week
+            , subq_7.paid_at__extract_day
+            , subq_7.paid_at__extract_dayofweek
+            , subq_7.paid_at__extract_dayofyear
             , subq_7.booking__ds__day
             , subq_7.booking__ds__week
             , subq_7.booking__ds__month
             , subq_7.booking__ds__quarter
             , subq_7.booking__ds__year
+            , subq_7.booking__ds__extract_year
+            , subq_7.booking__ds__extract_quarter
+            , subq_7.booking__ds__extract_month
+            , subq_7.booking__ds__extract_week
+            , subq_7.booking__ds__extract_day
+            , subq_7.booking__ds__extract_dayofweek
+            , subq_7.booking__ds__extract_dayofyear
             , subq_7.booking__ds_partitioned__day
             , subq_7.booking__ds_partitioned__week
             , subq_7.booking__ds_partitioned__month
             , subq_7.booking__ds_partitioned__quarter
             , subq_7.booking__ds_partitioned__year
+            , subq_7.booking__ds_partitioned__extract_year
+            , subq_7.booking__ds_partitioned__extract_quarter
+            , subq_7.booking__ds_partitioned__extract_month
+            , subq_7.booking__ds_partitioned__extract_week
+            , subq_7.booking__ds_partitioned__extract_day
+            , subq_7.booking__ds_partitioned__extract_dayofweek
+            , subq_7.booking__ds_partitioned__extract_dayofyear
             , subq_7.booking__paid_at__day
             , subq_7.booking__paid_at__week
             , subq_7.booking__paid_at__month
             , subq_7.booking__paid_at__quarter
             , subq_7.booking__paid_at__year
+            , subq_7.booking__paid_at__extract_year
+            , subq_7.booking__paid_at__extract_quarter
+            , subq_7.booking__paid_at__extract_month
+            , subq_7.booking__paid_at__extract_week
+            , subq_7.booking__paid_at__extract_day
+            , subq_7.booking__paid_at__extract_dayofweek
+            , subq_7.booking__paid_at__extract_dayofyear
             , subq_7.ds__day AS metric_time__day
             , subq_7.ds__week AS metric_time__week
             , subq_7.ds__month AS metric_time__month
@@ -260,32 +386,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index b05ffb6c76..f40149ee65 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -39,31 +39,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -113,32 +155,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 906d227e1d..8c59fd497e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -27,31 +27,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -160,21 +244,49 @@ FROM (
             , subq_5.ds__month
             , subq_5.ds__quarter
             , subq_5.ds__year
+            , subq_5.ds__extract_year
+            , subq_5.ds__extract_quarter
+            , subq_5.ds__extract_month
+            , subq_5.ds__extract_week
+            , subq_5.ds__extract_day
+            , subq_5.ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear
             , subq_5.created_at__day
             , subq_5.created_at__week
             , subq_5.created_at__month
             , subq_5.created_at__quarter
             , subq_5.created_at__year
+            , subq_5.created_at__extract_year
+            , subq_5.created_at__extract_quarter
+            , subq_5.created_at__extract_month
+            , subq_5.created_at__extract_week
+            , subq_5.created_at__extract_day
+            , subq_5.created_at__extract_dayofweek
+            , subq_5.created_at__extract_dayofyear
             , subq_5.listing__ds__day
             , subq_5.listing__ds__week
             , subq_5.listing__ds__month
             , subq_5.listing__ds__quarter
             , subq_5.listing__ds__year
+            , subq_5.listing__ds__extract_year
+            , subq_5.listing__ds__extract_quarter
+            , subq_5.listing__ds__extract_month
+            , subq_5.listing__ds__extract_week
+            , subq_5.listing__ds__extract_day
+            , subq_5.listing__ds__extract_dayofweek
+            , subq_5.listing__ds__extract_dayofyear
             , subq_5.listing__created_at__day
             , subq_5.listing__created_at__week
             , subq_5.listing__created_at__month
             , subq_5.listing__created_at__quarter
             , subq_5.listing__created_at__year
+            , subq_5.listing__created_at__extract_year
+            , subq_5.listing__created_at__extract_quarter
+            , subq_5.listing__created_at__extract_month
+            , subq_5.listing__created_at__extract_week
+            , subq_5.listing__created_at__extract_day
+            , subq_5.listing__created_at__extract_dayofweek
+            , subq_5.listing__created_at__extract_dayofyear
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -203,11 +315,25 @@ FROM (
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -216,11 +342,25 @@ FROM (
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
index d39a0a23d5..49ab8afb27 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
@@ -21,7 +21,7 @@ FROM (
       SELECT
         subq_2.metric_time__day AS metric_time__day
         , subq_7.window_start__day AS listing__window_start__day
-        , subq_7.window_end__day AS listing__window_end__day
+        , subq_7.window_end__extract_week AS listing__window_end__extract_week
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
         , subq_2.bookings AS bookings
@@ -40,31 +40,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10015.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10015.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10015.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10015.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10015.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10015.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10015.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10015.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10015.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -143,7 +227,7 @@ FROM (
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
           subq_6.window_start__day
-          , subq_6.window_end__day
+          , subq_6.window_end__extract_week
           , subq_6.listing
           , subq_6.user__home_state_latest
         FROM (
@@ -154,26 +238,61 @@ FROM (
             , subq_3.window_start__month AS window_start__month
             , subq_3.window_start__quarter AS window_start__quarter
             , subq_3.window_start__year AS window_start__year
+            , subq_3.window_start__extract_year AS window_start__extract_year
+            , subq_3.window_start__extract_quarter AS window_start__extract_quarter
+            , subq_3.window_start__extract_month AS window_start__extract_month
+            , subq_3.window_start__extract_week AS window_start__extract_week
+            , subq_3.window_start__extract_day AS window_start__extract_day
+            , subq_3.window_start__extract_dayofweek AS window_start__extract_dayofweek
+            , subq_3.window_start__extract_dayofyear AS window_start__extract_dayofyear
             , subq_3.window_end__day AS window_end__day
             , subq_3.window_end__week AS window_end__week
             , subq_3.window_end__month AS window_end__month
             , subq_3.window_end__quarter AS window_end__quarter
             , subq_3.window_end__year AS window_end__year
+            , subq_3.window_end__extract_year AS window_end__extract_year
+            , subq_3.window_end__extract_quarter AS window_end__extract_quarter
+            , subq_3.window_end__extract_month AS window_end__extract_month
+            , subq_3.window_end__extract_week AS window_end__extract_week
+            , subq_3.window_end__extract_day AS window_end__extract_day
+            , subq_3.window_end__extract_dayofweek AS window_end__extract_dayofweek
+            , subq_3.window_end__extract_dayofyear AS window_end__extract_dayofyear
             , subq_3.listing__window_start__day AS listing__window_start__day
             , subq_3.listing__window_start__week AS listing__window_start__week
             , subq_3.listing__window_start__month AS listing__window_start__month
             , subq_3.listing__window_start__quarter AS listing__window_start__quarter
             , subq_3.listing__window_start__year AS listing__window_start__year
+            , subq_3.listing__window_start__extract_year AS listing__window_start__extract_year
+            , subq_3.listing__window_start__extract_quarter AS listing__window_start__extract_quarter
+            , subq_3.listing__window_start__extract_month AS listing__window_start__extract_month
+            , subq_3.listing__window_start__extract_week AS listing__window_start__extract_week
+            , subq_3.listing__window_start__extract_day AS listing__window_start__extract_day
+            , subq_3.listing__window_start__extract_dayofweek AS listing__window_start__extract_dayofweek
+            , subq_3.listing__window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
             , subq_3.listing__window_end__day AS listing__window_end__day
             , subq_3.listing__window_end__week AS listing__window_end__week
             , subq_3.listing__window_end__month AS listing__window_end__month
             , subq_3.listing__window_end__quarter AS listing__window_end__quarter
             , subq_3.listing__window_end__year AS listing__window_end__year
+            , subq_3.listing__window_end__extract_year AS listing__window_end__extract_year
+            , subq_3.listing__window_end__extract_quarter AS listing__window_end__extract_quarter
+            , subq_3.listing__window_end__extract_month AS listing__window_end__extract_month
+            , subq_3.listing__window_end__extract_week AS listing__window_end__extract_week
+            , subq_3.listing__window_end__extract_day AS listing__window_end__extract_day
+            , subq_3.listing__window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
+            , subq_3.listing__window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
             , subq_5.ds__day AS user__ds__day
             , subq_5.ds__week AS user__ds__week
             , subq_5.ds__month AS user__ds__month
             , subq_5.ds__quarter AS user__ds__quarter
             , subq_5.ds__year AS user__ds__year
+            , subq_5.ds__extract_year AS user__ds__extract_year
+            , subq_5.ds__extract_quarter AS user__ds__extract_quarter
+            , subq_5.ds__extract_month AS user__ds__extract_month
+            , subq_5.ds__extract_week AS user__ds__extract_week
+            , subq_5.ds__extract_day AS user__ds__extract_day
+            , subq_5.ds__extract_dayofweek AS user__ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS user__ds__extract_dayofyear
             , subq_3.listing AS listing
             , subq_3.user AS user
             , subq_3.listing__user AS listing__user
@@ -192,11 +311,25 @@ FROM (
               , DATE_TRUNC(listings_src_10017.active_from, month) AS window_start__month
               , DATE_TRUNC(listings_src_10017.active_from, quarter) AS window_start__quarter
               , DATE_TRUNC(listings_src_10017.active_from, year) AS window_start__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC(listings_src_10017.active_to, isoweek) AS window_end__week
               , DATE_TRUNC(listings_src_10017.active_to, month) AS window_end__month
               , DATE_TRUNC(listings_src_10017.active_to, quarter) AS window_end__quarter
               , DATE_TRUNC(listings_src_10017.active_to, year) AS window_end__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -205,11 +338,25 @@ FROM (
               , DATE_TRUNC(listings_src_10017.active_from, month) AS listing__window_start__month
               , DATE_TRUNC(listings_src_10017.active_from, quarter) AS listing__window_start__quarter
               , DATE_TRUNC(listings_src_10017.active_from, year) AS listing__window_start__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC(listings_src_10017.active_to, isoweek) AS listing__window_end__week
               , DATE_TRUNC(listings_src_10017.active_to, month) AS listing__window_end__month
               , DATE_TRUNC(listings_src_10017.active_to, quarter) AS listing__window_end__quarter
               , DATE_TRUNC(listings_src_10017.active_to, year) AS listing__window_end__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -227,11 +374,25 @@ FROM (
             --    'ds__month',
             --    'ds__quarter',
             --    'ds__year',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
             --    'user__ds__day',
             --    'user__ds__week',
             --    'user__ds__month',
             --    'user__ds__quarter',
             --    'user__ds__year',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
             --    'user']
             SELECT
               subq_4.ds__day
@@ -239,11 +400,25 @@ FROM (
               , subq_4.ds__month
               , subq_4.ds__quarter
               , subq_4.ds__year
+              , subq_4.ds__extract_year
+              , subq_4.ds__extract_quarter
+              , subq_4.ds__extract_month
+              , subq_4.ds__extract_week
+              , subq_4.ds__extract_day
+              , subq_4.ds__extract_dayofweek
+              , subq_4.ds__extract_dayofyear
               , subq_4.user__ds__day
               , subq_4.user__ds__week
               , subq_4.user__ds__month
               , subq_4.user__ds__quarter
               , subq_4.user__ds__year
+              , subq_4.user__ds__extract_year
+              , subq_4.user__ds__extract_quarter
+              , subq_4.user__ds__extract_month
+              , subq_4.user__ds__extract_week
+              , subq_4.user__ds__extract_day
+              , subq_4.user__ds__extract_dayofweek
+              , subq_4.user__ds__extract_dayofyear
               , subq_4.user
               , subq_4.home_state_latest
               , subq_4.user__home_state_latest
@@ -255,12 +430,26 @@ FROM (
                 , DATE_TRUNC(users_latest_src_10021.ds, month) AS ds__month
                 , DATE_TRUNC(users_latest_src_10021.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(users_latest_src_10021.ds, year) AS ds__year
+                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_dayofyear
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC(users_latest_src_10021.ds, isoweek) AS user__ds__week
                 , DATE_TRUNC(users_latest_src_10021.ds, month) AS user__ds__month
                 , DATE_TRUNC(users_latest_src_10021.ds, quarter) AS user__ds__quarter
                 , DATE_TRUNC(users_latest_src_10021.ds, year) AS user__ds__year
+                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS user__ds__extract_year
+                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
+                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS user__ds__extract_month
+                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
+                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS user__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_dayofyear
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
@@ -278,9 +467,9 @@ FROM (
             subq_2.metric_time__day >= subq_7.window_start__day
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.window_end__day
+              subq_2.metric_time__day < subq_7.window_end__extract_week
             ) OR (
-              subq_7.window_end__day IS NULL
+              subq_7.window_end__extract_week IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index e8abbb3f87..dfbf523e63 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -24,7 +24,7 @@ LEFT OUTER JOIN (
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
     listings_src_10017.active_from AS window_start__day
-    , listings_src_10017.active_to AS window_end__day
+    , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
   FROM ***************************.dim_listings listings_src_10017
@@ -41,9 +41,9 @@ ON
       subq_13.metric_time__day >= subq_18.window_start__day
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.window_end__day
+        subq_13.metric_time__day < subq_18.window_end__extract_week
       ) OR (
-        subq_18.window_end__day IS NULL
+        subq_18.window_end__extract_week IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
index 810e69a1cf..9114deef3f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
@@ -21,7 +21,7 @@ FROM (
       SELECT
         subq_2.metric_time__day AS metric_time__day
         , subq_7.lux_listing__window_start__day AS listing__lux_listing__window_start__day
-        , subq_7.lux_listing__window_end__day AS listing__lux_listing__window_end__day
+        , subq_7.lux_listing__window_end__extract_month AS listing__lux_listing__window_end__extract_month
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
         , subq_2.bookings AS bookings
@@ -40,31 +40,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10015.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10015.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10015.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10015.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10015.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10015.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10015.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10015.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10015.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -146,7 +230,7 @@ FROM (
         --    'listing']
         SELECT
           subq_6.lux_listing__window_start__day
-          , subq_6.lux_listing__window_end__day
+          , subq_6.lux_listing__window_end__extract_month
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
         FROM (
@@ -157,11 +241,25 @@ FROM (
             , subq_5.window_start__month AS lux_listing__window_start__month
             , subq_5.window_start__quarter AS lux_listing__window_start__quarter
             , subq_5.window_start__year AS lux_listing__window_start__year
+            , subq_5.window_start__extract_year AS lux_listing__window_start__extract_year
+            , subq_5.window_start__extract_quarter AS lux_listing__window_start__extract_quarter
+            , subq_5.window_start__extract_month AS lux_listing__window_start__extract_month
+            , subq_5.window_start__extract_week AS lux_listing__window_start__extract_week
+            , subq_5.window_start__extract_day AS lux_listing__window_start__extract_day
+            , subq_5.window_start__extract_dayofweek AS lux_listing__window_start__extract_dayofweek
+            , subq_5.window_start__extract_dayofyear AS lux_listing__window_start__extract_dayofyear
             , subq_5.window_end__day AS lux_listing__window_end__day
             , subq_5.window_end__week AS lux_listing__window_end__week
             , subq_5.window_end__month AS lux_listing__window_end__month
             , subq_5.window_end__quarter AS lux_listing__window_end__quarter
             , subq_5.window_end__year AS lux_listing__window_end__year
+            , subq_5.window_end__extract_year AS lux_listing__window_end__extract_year
+            , subq_5.window_end__extract_quarter AS lux_listing__window_end__extract_quarter
+            , subq_5.window_end__extract_month AS lux_listing__window_end__extract_month
+            , subq_5.window_end__extract_week AS lux_listing__window_end__extract_week
+            , subq_5.window_end__extract_day AS lux_listing__window_end__extract_day
+            , subq_5.window_end__extract_dayofweek AS lux_listing__window_end__extract_dayofweek
+            , subq_5.window_end__extract_dayofyear AS lux_listing__window_end__extract_dayofyear
             , subq_3.listing AS listing
             , subq_3.lux_listing AS lux_listing
             , subq_3.listing__lux_listing AS listing__lux_listing
@@ -183,21 +281,49 @@ FROM (
             --    'window_start__month',
             --    'window_start__quarter',
             --    'window_start__year',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
             --    'window_end__day',
             --    'window_end__week',
             --    'window_end__month',
             --    'window_end__quarter',
             --    'window_end__year',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
             --    'lux_listing__window_start__day',
             --    'lux_listing__window_start__week',
             --    'lux_listing__window_start__month',
             --    'lux_listing__window_start__quarter',
             --    'lux_listing__window_start__year',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
             --    'lux_listing__window_end__day',
             --    'lux_listing__window_end__week',
             --    'lux_listing__window_end__month',
             --    'lux_listing__window_end__quarter',
             --    'lux_listing__window_end__year',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
             --    'lux_listing']
             SELECT
               subq_4.window_start__day
@@ -205,21 +331,49 @@ FROM (
               , subq_4.window_start__month
               , subq_4.window_start__quarter
               , subq_4.window_start__year
+              , subq_4.window_start__extract_year
+              , subq_4.window_start__extract_quarter
+              , subq_4.window_start__extract_month
+              , subq_4.window_start__extract_week
+              , subq_4.window_start__extract_day
+              , subq_4.window_start__extract_dayofweek
+              , subq_4.window_start__extract_dayofyear
               , subq_4.window_end__day
               , subq_4.window_end__week
               , subq_4.window_end__month
               , subq_4.window_end__quarter
               , subq_4.window_end__year
+              , subq_4.window_end__extract_year
+              , subq_4.window_end__extract_quarter
+              , subq_4.window_end__extract_month
+              , subq_4.window_end__extract_week
+              , subq_4.window_end__extract_day
+              , subq_4.window_end__extract_dayofweek
+              , subq_4.window_end__extract_dayofyear
               , subq_4.lux_listing__window_start__day
               , subq_4.lux_listing__window_start__week
               , subq_4.lux_listing__window_start__month
               , subq_4.lux_listing__window_start__quarter
               , subq_4.lux_listing__window_start__year
+              , subq_4.lux_listing__window_start__extract_year
+              , subq_4.lux_listing__window_start__extract_quarter
+              , subq_4.lux_listing__window_start__extract_month
+              , subq_4.lux_listing__window_start__extract_week
+              , subq_4.lux_listing__window_start__extract_day
+              , subq_4.lux_listing__window_start__extract_dayofweek
+              , subq_4.lux_listing__window_start__extract_dayofyear
               , subq_4.lux_listing__window_end__day
               , subq_4.lux_listing__window_end__week
               , subq_4.lux_listing__window_end__month
               , subq_4.lux_listing__window_end__quarter
               , subq_4.lux_listing__window_end__year
+              , subq_4.lux_listing__window_end__extract_year
+              , subq_4.lux_listing__window_end__extract_quarter
+              , subq_4.lux_listing__window_end__extract_month
+              , subq_4.lux_listing__window_end__extract_week
+              , subq_4.lux_listing__window_end__extract_day
+              , subq_4.lux_listing__window_end__extract_dayofweek
+              , subq_4.lux_listing__window_end__extract_dayofyear
               , subq_4.lux_listing
               , subq_4.is_confirmed_lux
               , subq_4.lux_listing__is_confirmed_lux
@@ -231,22 +385,50 @@ FROM (
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, month) AS window_start__month
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, quarter) AS window_start__quarter
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, year) AS window_start__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofyear
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, isoweek) AS window_end__week
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, month) AS window_end__month
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, quarter) AS window_end__quarter
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, year) AS window_end__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofyear
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, isoweek) AS lux_listing__window_start__week
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, month) AS lux_listing__window_start__month
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, quarter) AS lux_listing__window_start__quarter
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, year) AS lux_listing__window_start__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, isoweek) AS lux_listing__window_end__week
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, month) AS lux_listing__window_end__month
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, quarter) AS lux_listing__window_end__quarter
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, year) AS lux_listing__window_end__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofyear
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
@@ -264,9 +446,9 @@ FROM (
             subq_2.metric_time__day >= subq_7.lux_listing__window_start__day
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.lux_listing__window_end__day
+              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_month
             ) OR (
-              subq_7.lux_listing__window_end__day IS NULL
+              subq_7.lux_listing__window_end__extract_month IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index 415ccb8d00..33a9a609fa 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -27,7 +27,7 @@ LEFT OUTER JOIN (
   --    'listing']
   SELECT
     lux_listings_src_10019.valid_from AS lux_listing__window_start__day
-    , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
+    , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
   FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_10018
@@ -44,9 +44,9 @@ ON
       subq_13.metric_time__day >= subq_18.lux_listing__window_start__day
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.lux_listing__window_end__day
+        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_month
       ) OR (
-        subq_18.lux_listing__window_end__day IS NULL
+        subq_18.lux_listing__window_end__extract_month IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql
index 03d53212bd..9c13f10eec 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql
@@ -33,32 +33,74 @@ FROM (
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -85,11 +127,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -98,11 +154,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -131,11 +201,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -144,11 +228,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
index 96381bbd71..28e5abd86f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
@@ -36,21 +36,49 @@ FROM (
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.ds__day
             , subq_0.ds__week
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.account_id__ds_partitioned__day
             , subq_0.account_id__ds_partitioned__week
             , subq_0.account_id__ds_partitioned__month
             , subq_0.account_id__ds_partitioned__quarter
             , subq_0.account_id__ds_partitioned__year
+            , subq_0.account_id__ds_partitioned__extract_year
+            , subq_0.account_id__ds_partitioned__extract_quarter
+            , subq_0.account_id__ds_partitioned__extract_month
+            , subq_0.account_id__ds_partitioned__extract_week
+            , subq_0.account_id__ds_partitioned__extract_day
+            , subq_0.account_id__ds_partitioned__extract_dayofweek
+            , subq_0.account_id__ds_partitioned__extract_dayofyear
             , subq_0.account_id__ds__day
             , subq_0.account_id__ds__week
             , subq_0.account_id__ds__month
             , subq_0.account_id__ds__quarter
             , subq_0.account_id__ds__year
+            , subq_0.account_id__ds__extract_year
+            , subq_0.account_id__ds__extract_quarter
+            , subq_0.account_id__ds__extract_month
+            , subq_0.account_id__ds__extract_week
+            , subq_0.account_id__ds__extract_day
+            , subq_0.account_id__ds__extract_dayofweek
+            , subq_0.account_id__ds__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -69,22 +97,50 @@ FROM (
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC(account_month_txns_src_10010.ds, isoweek) AS ds__week
               , DATE_TRUNC(account_month_txns_src_10010.ds, month) AS ds__month
               , DATE_TRUNC(account_month_txns_src_10010.ds, quarter) AS ds__quarter
               , DATE_TRUNC(account_month_txns_src_10010.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_dayofyear
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, isoweek) AS account_id__ds_partitioned__week
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, month) AS account_id__ds_partitioned__month
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, quarter) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, year) AS account_id__ds_partitioned__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC(account_month_txns_src_10010.ds, isoweek) AS account_id__ds__week
               , DATE_TRUNC(account_month_txns_src_10010.ds, month) AS account_id__ds__month
               , DATE_TRUNC(account_month_txns_src_10010.ds, quarter) AS account_id__ds__quarter
               , DATE_TRUNC(account_month_txns_src_10010.ds, year) AS account_id__ds__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofyear
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -106,16 +162,37 @@ FROM (
             , subq_3.ds_partitioned__month AS ds_partitioned__month
             , subq_3.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_3.ds_partitioned__year AS ds_partitioned__year
+            , subq_3.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_3.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_3.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_3.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_3.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_3.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_3.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_3.account_id__ds_partitioned__day AS account_id__ds_partitioned__day
             , subq_3.account_id__ds_partitioned__week AS account_id__ds_partitioned__week
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
             , subq_3.account_id__ds_partitioned__quarter AS account_id__ds_partitioned__quarter
             , subq_3.account_id__ds_partitioned__year AS account_id__ds_partitioned__year
+            , subq_3.account_id__ds_partitioned__extract_year AS account_id__ds_partitioned__extract_year
+            , subq_3.account_id__ds_partitioned__extract_quarter AS account_id__ds_partitioned__extract_quarter
+            , subq_3.account_id__ds_partitioned__extract_month AS account_id__ds_partitioned__extract_month
+            , subq_3.account_id__ds_partitioned__extract_week AS account_id__ds_partitioned__extract_week
+            , subq_3.account_id__ds_partitioned__extract_day AS account_id__ds_partitioned__extract_day
+            , subq_3.account_id__ds_partitioned__extract_dayofweek AS account_id__ds_partitioned__extract_dayofweek
+            , subq_3.account_id__ds_partitioned__extract_dayofyear AS account_id__ds_partitioned__extract_dayofyear
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
             , subq_5.ds_partitioned__quarter AS customer_id__ds_partitioned__quarter
             , subq_5.ds_partitioned__year AS customer_id__ds_partitioned__year
+            , subq_5.ds_partitioned__extract_year AS customer_id__ds_partitioned__extract_year
+            , subq_5.ds_partitioned__extract_quarter AS customer_id__ds_partitioned__extract_quarter
+            , subq_5.ds_partitioned__extract_month AS customer_id__ds_partitioned__extract_month
+            , subq_5.ds_partitioned__extract_week AS customer_id__ds_partitioned__extract_week
+            , subq_5.ds_partitioned__extract_day AS customer_id__ds_partitioned__extract_day
+            , subq_5.ds_partitioned__extract_dayofweek AS customer_id__ds_partitioned__extract_dayofweek
+            , subq_5.ds_partitioned__extract_dayofyear AS customer_id__ds_partitioned__extract_dayofyear
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
@@ -132,12 +209,26 @@ FROM (
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, isoweek) AS account_id__ds_partitioned__week
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, month) AS account_id__ds_partitioned__month
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, quarter) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, year) AS account_id__ds_partitioned__year
+              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -154,11 +245,25 @@ FROM (
             --    'ds_partitioned__month',
             --    'ds_partitioned__quarter',
             --    'ds_partitioned__year',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
             --    'customer_id__ds_partitioned__day',
             --    'customer_id__ds_partitioned__week',
             --    'customer_id__ds_partitioned__month',
             --    'customer_id__ds_partitioned__quarter',
             --    'customer_id__ds_partitioned__year',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
             --    'customer_id']
             SELECT
               subq_4.ds_partitioned__day
@@ -166,11 +271,25 @@ FROM (
               , subq_4.ds_partitioned__month
               , subq_4.ds_partitioned__quarter
               , subq_4.ds_partitioned__year
+              , subq_4.ds_partitioned__extract_year
+              , subq_4.ds_partitioned__extract_quarter
+              , subq_4.ds_partitioned__extract_month
+              , subq_4.ds_partitioned__extract_week
+              , subq_4.ds_partitioned__extract_day
+              , subq_4.ds_partitioned__extract_dayofweek
+              , subq_4.ds_partitioned__extract_dayofyear
               , subq_4.customer_id__ds_partitioned__day
               , subq_4.customer_id__ds_partitioned__week
               , subq_4.customer_id__ds_partitioned__month
               , subq_4.customer_id__ds_partitioned__quarter
               , subq_4.customer_id__ds_partitioned__year
+              , subq_4.customer_id__ds_partitioned__extract_year
+              , subq_4.customer_id__ds_partitioned__extract_quarter
+              , subq_4.customer_id__ds_partitioned__extract_month
+              , subq_4.customer_id__ds_partitioned__extract_week
+              , subq_4.customer_id__ds_partitioned__extract_day
+              , subq_4.customer_id__ds_partitioned__extract_dayofweek
+              , subq_4.customer_id__ds_partitioned__extract_dayofyear
               , subq_4.customer_id
               , subq_4.customer_name
               , subq_4.customer_atomic_weight
@@ -186,6 +305,13 @@ FROM (
                 , DATE_TRUNC(customer_table_src_10013.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(customer_table_src_10013.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(customer_table_src_10013.ds_partitioned, year) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -193,6 +319,13 @@ FROM (
                 , DATE_TRUNC(customer_table_src_10013.ds_partitioned, month) AS customer_id__ds_partitioned__month
                 , DATE_TRUNC(customer_table_src_10013.ds_partitioned, quarter) AS customer_id__ds_partitioned__quarter
                 , DATE_TRUNC(customer_table_src_10013.ds_partitioned, year) AS customer_id__ds_partitioned__year
+                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofyear
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
index 123b3e721a..696514d415 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
@@ -23,31 +23,73 @@ FROM (
           , subq_1.ds__month
           , subq_1.ds__quarter
           , subq_1.ds__year
+          , subq_1.ds__extract_year
+          , subq_1.ds__extract_quarter
+          , subq_1.ds__extract_month
+          , subq_1.ds__extract_week
+          , subq_1.ds__extract_day
+          , subq_1.ds__extract_dayofweek
+          , subq_1.ds__extract_dayofyear
           , subq_1.ds_partitioned__day
           , subq_1.ds_partitioned__week
           , subq_1.ds_partitioned__month
           , subq_1.ds_partitioned__quarter
           , subq_1.ds_partitioned__year
+          , subq_1.ds_partitioned__extract_year
+          , subq_1.ds_partitioned__extract_quarter
+          , subq_1.ds_partitioned__extract_month
+          , subq_1.ds_partitioned__extract_week
+          , subq_1.ds_partitioned__extract_day
+          , subq_1.ds_partitioned__extract_dayofweek
+          , subq_1.ds_partitioned__extract_dayofyear
           , subq_1.paid_at__day
           , subq_1.paid_at__week
           , subq_1.paid_at__month
           , subq_1.paid_at__quarter
           , subq_1.paid_at__year
+          , subq_1.paid_at__extract_year
+          , subq_1.paid_at__extract_quarter
+          , subq_1.paid_at__extract_month
+          , subq_1.paid_at__extract_week
+          , subq_1.paid_at__extract_day
+          , subq_1.paid_at__extract_dayofweek
+          , subq_1.paid_at__extract_dayofyear
           , subq_1.booking__ds__day
           , subq_1.booking__ds__week
           , subq_1.booking__ds__month
           , subq_1.booking__ds__quarter
           , subq_1.booking__ds__year
+          , subq_1.booking__ds__extract_year
+          , subq_1.booking__ds__extract_quarter
+          , subq_1.booking__ds__extract_month
+          , subq_1.booking__ds__extract_week
+          , subq_1.booking__ds__extract_day
+          , subq_1.booking__ds__extract_dayofweek
+          , subq_1.booking__ds__extract_dayofyear
           , subq_1.booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month
           , subq_1.booking__ds_partitioned__quarter
           , subq_1.booking__ds_partitioned__year
+          , subq_1.booking__ds_partitioned__extract_year
+          , subq_1.booking__ds_partitioned__extract_quarter
+          , subq_1.booking__ds_partitioned__extract_month
+          , subq_1.booking__ds_partitioned__extract_week
+          , subq_1.booking__ds_partitioned__extract_day
+          , subq_1.booking__ds_partitioned__extract_dayofweek
+          , subq_1.booking__ds_partitioned__extract_dayofyear
           , subq_1.booking__paid_at__day
           , subq_1.booking__paid_at__week
           , subq_1.booking__paid_at__month
           , subq_1.booking__paid_at__quarter
           , subq_1.booking__paid_at__year
+          , subq_1.booking__paid_at__extract_year
+          , subq_1.booking__paid_at__extract_quarter
+          , subq_1.booking__paid_at__extract_month
+          , subq_1.booking__paid_at__extract_week
+          , subq_1.booking__paid_at__extract_day
+          , subq_1.booking__paid_at__extract_dayofweek
+          , subq_1.booking__paid_at__extract_dayofyear
           , subq_1.metric_time__day
           , subq_1.metric_time__week
           , subq_1.metric_time__month
@@ -82,31 +124,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -156,32 +240,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -217,21 +343,49 @@ CROSS JOIN (
           , subq_7.ds__month
           , subq_7.ds__quarter
           , subq_7.ds__year
+          , subq_7.ds__extract_year
+          , subq_7.ds__extract_quarter
+          , subq_7.ds__extract_month
+          , subq_7.ds__extract_week
+          , subq_7.ds__extract_day
+          , subq_7.ds__extract_dayofweek
+          , subq_7.ds__extract_dayofyear
           , subq_7.created_at__day
           , subq_7.created_at__week
           , subq_7.created_at__month
           , subq_7.created_at__quarter
           , subq_7.created_at__year
+          , subq_7.created_at__extract_year
+          , subq_7.created_at__extract_quarter
+          , subq_7.created_at__extract_month
+          , subq_7.created_at__extract_week
+          , subq_7.created_at__extract_day
+          , subq_7.created_at__extract_dayofweek
+          , subq_7.created_at__extract_dayofyear
           , subq_7.listing__ds__day
           , subq_7.listing__ds__week
           , subq_7.listing__ds__month
           , subq_7.listing__ds__quarter
           , subq_7.listing__ds__year
+          , subq_7.listing__ds__extract_year
+          , subq_7.listing__ds__extract_quarter
+          , subq_7.listing__ds__extract_month
+          , subq_7.listing__ds__extract_week
+          , subq_7.listing__ds__extract_day
+          , subq_7.listing__ds__extract_dayofweek
+          , subq_7.listing__ds__extract_dayofyear
           , subq_7.listing__created_at__day
           , subq_7.listing__created_at__week
           , subq_7.listing__created_at__month
           , subq_7.listing__created_at__quarter
           , subq_7.listing__created_at__year
+          , subq_7.listing__created_at__extract_year
+          , subq_7.listing__created_at__extract_quarter
+          , subq_7.listing__created_at__extract_month
+          , subq_7.listing__created_at__extract_week
+          , subq_7.listing__created_at__extract_day
+          , subq_7.listing__created_at__extract_dayofweek
+          , subq_7.listing__created_at__extract_dayofyear
           , subq_7.metric_time__day
           , subq_7.metric_time__week
           , subq_7.metric_time__month
@@ -257,21 +411,49 @@ CROSS JOIN (
             , subq_6.ds__month
             , subq_6.ds__quarter
             , subq_6.ds__year
+            , subq_6.ds__extract_year
+            , subq_6.ds__extract_quarter
+            , subq_6.ds__extract_month
+            , subq_6.ds__extract_week
+            , subq_6.ds__extract_day
+            , subq_6.ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear
             , subq_6.created_at__day
             , subq_6.created_at__week
             , subq_6.created_at__month
             , subq_6.created_at__quarter
             , subq_6.created_at__year
+            , subq_6.created_at__extract_year
+            , subq_6.created_at__extract_quarter
+            , subq_6.created_at__extract_month
+            , subq_6.created_at__extract_week
+            , subq_6.created_at__extract_day
+            , subq_6.created_at__extract_dayofweek
+            , subq_6.created_at__extract_dayofyear
             , subq_6.listing__ds__day
             , subq_6.listing__ds__week
             , subq_6.listing__ds__month
             , subq_6.listing__ds__quarter
             , subq_6.listing__ds__year
+            , subq_6.listing__ds__extract_year
+            , subq_6.listing__ds__extract_quarter
+            , subq_6.listing__ds__extract_month
+            , subq_6.listing__ds__extract_week
+            , subq_6.listing__ds__extract_day
+            , subq_6.listing__ds__extract_dayofweek
+            , subq_6.listing__ds__extract_dayofyear
             , subq_6.listing__created_at__day
             , subq_6.listing__created_at__week
             , subq_6.listing__created_at__month
             , subq_6.listing__created_at__quarter
             , subq_6.listing__created_at__year
+            , subq_6.listing__created_at__extract_year
+            , subq_6.listing__created_at__extract_quarter
+            , subq_6.listing__created_at__extract_month
+            , subq_6.listing__created_at__extract_week
+            , subq_6.listing__created_at__extract_day
+            , subq_6.listing__created_at__extract_dayofweek
+            , subq_6.listing__created_at__extract_dayofyear
             , subq_6.ds__day AS metric_time__day
             , subq_6.ds__week AS metric_time__week
             , subq_6.ds__month AS metric_time__month
@@ -300,11 +482,25 @@ CROSS JOIN (
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -313,11 +509,25 @@ CROSS JOIN (
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
index 3ade4193b3..79e108f49f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
@@ -44,31 +44,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -118,32 +160,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -182,31 +266,73 @@ FROM (
                 , subq_5.ds__month
                 , subq_5.ds__quarter
                 , subq_5.ds__year
+                , subq_5.ds__extract_year
+                , subq_5.ds__extract_quarter
+                , subq_5.ds__extract_month
+                , subq_5.ds__extract_week
+                , subq_5.ds__extract_day
+                , subq_5.ds__extract_dayofweek
+                , subq_5.ds__extract_dayofyear
                 , subq_5.ds_partitioned__day
                 , subq_5.ds_partitioned__week
                 , subq_5.ds_partitioned__month
                 , subq_5.ds_partitioned__quarter
                 , subq_5.ds_partitioned__year
+                , subq_5.ds_partitioned__extract_year
+                , subq_5.ds_partitioned__extract_quarter
+                , subq_5.ds_partitioned__extract_month
+                , subq_5.ds_partitioned__extract_week
+                , subq_5.ds_partitioned__extract_day
+                , subq_5.ds_partitioned__extract_dayofweek
+                , subq_5.ds_partitioned__extract_dayofyear
                 , subq_5.paid_at__day
                 , subq_5.paid_at__week
                 , subq_5.paid_at__month
                 , subq_5.paid_at__quarter
                 , subq_5.paid_at__year
+                , subq_5.paid_at__extract_year
+                , subq_5.paid_at__extract_quarter
+                , subq_5.paid_at__extract_month
+                , subq_5.paid_at__extract_week
+                , subq_5.paid_at__extract_day
+                , subq_5.paid_at__extract_dayofweek
+                , subq_5.paid_at__extract_dayofyear
                 , subq_5.booking__ds__day
                 , subq_5.booking__ds__week
                 , subq_5.booking__ds__month
                 , subq_5.booking__ds__quarter
                 , subq_5.booking__ds__year
+                , subq_5.booking__ds__extract_year
+                , subq_5.booking__ds__extract_quarter
+                , subq_5.booking__ds__extract_month
+                , subq_5.booking__ds__extract_week
+                , subq_5.booking__ds__extract_day
+                , subq_5.booking__ds__extract_dayofweek
+                , subq_5.booking__ds__extract_dayofyear
                 , subq_5.booking__ds_partitioned__day
                 , subq_5.booking__ds_partitioned__week
                 , subq_5.booking__ds_partitioned__month
                 , subq_5.booking__ds_partitioned__quarter
                 , subq_5.booking__ds_partitioned__year
+                , subq_5.booking__ds_partitioned__extract_year
+                , subq_5.booking__ds_partitioned__extract_quarter
+                , subq_5.booking__ds_partitioned__extract_month
+                , subq_5.booking__ds_partitioned__extract_week
+                , subq_5.booking__ds_partitioned__extract_day
+                , subq_5.booking__ds_partitioned__extract_dayofweek
+                , subq_5.booking__ds_partitioned__extract_dayofyear
                 , subq_5.booking__paid_at__day
                 , subq_5.booking__paid_at__week
                 , subq_5.booking__paid_at__month
                 , subq_5.booking__paid_at__quarter
                 , subq_5.booking__paid_at__year
+                , subq_5.booking__paid_at__extract_year
+                , subq_5.booking__paid_at__extract_quarter
+                , subq_5.booking__paid_at__extract_month
+                , subq_5.booking__paid_at__extract_week
+                , subq_5.booking__paid_at__extract_day
+                , subq_5.booking__paid_at__extract_dayofweek
+                , subq_5.booking__paid_at__extract_dayofyear
                 , subq_5.ds__day AS metric_time__day
                 , subq_5.ds__week AS metric_time__week
                 , subq_5.ds__month AS metric_time__month
@@ -256,32 +382,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -332,31 +500,73 @@ FROM (
             , subq_12.ds__month
             , subq_12.ds__quarter
             , subq_12.ds__year
+            , subq_12.ds__extract_year
+            , subq_12.ds__extract_quarter
+            , subq_12.ds__extract_month
+            , subq_12.ds__extract_week
+            , subq_12.ds__extract_day
+            , subq_12.ds__extract_dayofweek
+            , subq_12.ds__extract_dayofyear
             , subq_12.ds_partitioned__day
             , subq_12.ds_partitioned__week
             , subq_12.ds_partitioned__month
             , subq_12.ds_partitioned__quarter
             , subq_12.ds_partitioned__year
+            , subq_12.ds_partitioned__extract_year
+            , subq_12.ds_partitioned__extract_quarter
+            , subq_12.ds_partitioned__extract_month
+            , subq_12.ds_partitioned__extract_week
+            , subq_12.ds_partitioned__extract_day
+            , subq_12.ds_partitioned__extract_dayofweek
+            , subq_12.ds_partitioned__extract_dayofyear
             , subq_12.paid_at__day
             , subq_12.paid_at__week
             , subq_12.paid_at__month
             , subq_12.paid_at__quarter
             , subq_12.paid_at__year
+            , subq_12.paid_at__extract_year
+            , subq_12.paid_at__extract_quarter
+            , subq_12.paid_at__extract_month
+            , subq_12.paid_at__extract_week
+            , subq_12.paid_at__extract_day
+            , subq_12.paid_at__extract_dayofweek
+            , subq_12.paid_at__extract_dayofyear
             , subq_12.booking__ds__day
             , subq_12.booking__ds__week
             , subq_12.booking__ds__month
             , subq_12.booking__ds__quarter
             , subq_12.booking__ds__year
+            , subq_12.booking__ds__extract_year
+            , subq_12.booking__ds__extract_quarter
+            , subq_12.booking__ds__extract_month
+            , subq_12.booking__ds__extract_week
+            , subq_12.booking__ds__extract_day
+            , subq_12.booking__ds__extract_dayofweek
+            , subq_12.booking__ds__extract_dayofyear
             , subq_12.booking__ds_partitioned__day
             , subq_12.booking__ds_partitioned__week
             , subq_12.booking__ds_partitioned__month
             , subq_12.booking__ds_partitioned__quarter
             , subq_12.booking__ds_partitioned__year
+            , subq_12.booking__ds_partitioned__extract_year
+            , subq_12.booking__ds_partitioned__extract_quarter
+            , subq_12.booking__ds_partitioned__extract_month
+            , subq_12.booking__ds_partitioned__extract_week
+            , subq_12.booking__ds_partitioned__extract_day
+            , subq_12.booking__ds_partitioned__extract_dayofweek
+            , subq_12.booking__ds_partitioned__extract_dayofyear
             , subq_12.booking__paid_at__day
             , subq_12.booking__paid_at__week
             , subq_12.booking__paid_at__month
             , subq_12.booking__paid_at__quarter
             , subq_12.booking__paid_at__year
+            , subq_12.booking__paid_at__extract_year
+            , subq_12.booking__paid_at__extract_quarter
+            , subq_12.booking__paid_at__extract_month
+            , subq_12.booking__paid_at__extract_week
+            , subq_12.booking__paid_at__extract_day
+            , subq_12.booking__paid_at__extract_dayofweek
+            , subq_12.booking__paid_at__extract_dayofyear
             , subq_12.ds__day AS metric_time__day
             , subq_12.ds__week AS metric_time__week
             , subq_12.ds__month AS metric_time__month
@@ -406,32 +616,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -480,31 +732,73 @@ FROM (
             , subq_17.ds__month
             , subq_17.ds__quarter
             , subq_17.ds__year
+            , subq_17.ds__extract_year
+            , subq_17.ds__extract_quarter
+            , subq_17.ds__extract_month
+            , subq_17.ds__extract_week
+            , subq_17.ds__extract_day
+            , subq_17.ds__extract_dayofweek
+            , subq_17.ds__extract_dayofyear
             , subq_17.ds_partitioned__day
             , subq_17.ds_partitioned__week
             , subq_17.ds_partitioned__month
             , subq_17.ds_partitioned__quarter
             , subq_17.ds_partitioned__year
+            , subq_17.ds_partitioned__extract_year
+            , subq_17.ds_partitioned__extract_quarter
+            , subq_17.ds_partitioned__extract_month
+            , subq_17.ds_partitioned__extract_week
+            , subq_17.ds_partitioned__extract_day
+            , subq_17.ds_partitioned__extract_dayofweek
+            , subq_17.ds_partitioned__extract_dayofyear
             , subq_17.paid_at__day
             , subq_17.paid_at__week
             , subq_17.paid_at__month
             , subq_17.paid_at__quarter
             , subq_17.paid_at__year
+            , subq_17.paid_at__extract_year
+            , subq_17.paid_at__extract_quarter
+            , subq_17.paid_at__extract_month
+            , subq_17.paid_at__extract_week
+            , subq_17.paid_at__extract_day
+            , subq_17.paid_at__extract_dayofweek
+            , subq_17.paid_at__extract_dayofyear
             , subq_17.booking__ds__day
             , subq_17.booking__ds__week
             , subq_17.booking__ds__month
             , subq_17.booking__ds__quarter
             , subq_17.booking__ds__year
+            , subq_17.booking__ds__extract_year
+            , subq_17.booking__ds__extract_quarter
+            , subq_17.booking__ds__extract_month
+            , subq_17.booking__ds__extract_week
+            , subq_17.booking__ds__extract_day
+            , subq_17.booking__ds__extract_dayofweek
+            , subq_17.booking__ds__extract_dayofyear
             , subq_17.booking__ds_partitioned__day
             , subq_17.booking__ds_partitioned__week
             , subq_17.booking__ds_partitioned__month
             , subq_17.booking__ds_partitioned__quarter
             , subq_17.booking__ds_partitioned__year
+            , subq_17.booking__ds_partitioned__extract_year
+            , subq_17.booking__ds_partitioned__extract_quarter
+            , subq_17.booking__ds_partitioned__extract_month
+            , subq_17.booking__ds_partitioned__extract_week
+            , subq_17.booking__ds_partitioned__extract_day
+            , subq_17.booking__ds_partitioned__extract_dayofweek
+            , subq_17.booking__ds_partitioned__extract_dayofyear
             , subq_17.booking__paid_at__day
             , subq_17.booking__paid_at__week
             , subq_17.booking__paid_at__month
             , subq_17.booking__paid_at__quarter
             , subq_17.booking__paid_at__year
+            , subq_17.booking__paid_at__extract_year
+            , subq_17.booking__paid_at__extract_quarter
+            , subq_17.booking__paid_at__extract_month
+            , subq_17.booking__paid_at__extract_week
+            , subq_17.booking__paid_at__extract_day
+            , subq_17.booking__paid_at__extract_dayofweek
+            , subq_17.booking__paid_at__extract_dayofyear
             , subq_17.ds__day AS metric_time__day
             , subq_17.ds__week AS metric_time__week
             , subq_17.ds__month AS metric_time__month
@@ -554,32 +848,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql
index 508c33253e..6fe53f5780 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql
@@ -45,32 +45,74 @@ FROM (
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
index c27cc36a57..e04b6506be 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
@@ -36,21 +36,49 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.verification__ds__day
             , subq_0.verification__ds__week
             , subq_0.verification__ds__month
             , subq_0.verification__ds__quarter
             , subq_0.verification__ds__year
+            , subq_0.verification__ds__extract_year
+            , subq_0.verification__ds__extract_quarter
+            , subq_0.verification__ds__extract_month
+            , subq_0.verification__ds__extract_week
+            , subq_0.verification__ds__extract_day
+            , subq_0.verification__ds__extract_dayofweek
+            , subq_0.verification__ds__extract_dayofyear
             , subq_0.verification__ds_partitioned__day
             , subq_0.verification__ds_partitioned__week
             , subq_0.verification__ds_partitioned__month
             , subq_0.verification__ds_partitioned__quarter
             , subq_0.verification__ds_partitioned__year
+            , subq_0.verification__ds_partitioned__extract_year
+            , subq_0.verification__ds_partitioned__extract_quarter
+            , subq_0.verification__ds_partitioned__extract_month
+            , subq_0.verification__ds_partitioned__extract_week
+            , subq_0.verification__ds_partitioned__extract_day
+            , subq_0.verification__ds_partitioned__extract_dayofweek
+            , subq_0.verification__ds_partitioned__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -71,22 +99,50 @@ FROM (
               , DATE_TRUNC(id_verifications_src_10003.ds, month) AS ds__month
               , DATE_TRUNC(id_verifications_src_10003.ds, quarter) AS ds__quarter
               , DATE_TRUNC(id_verifications_src_10003.ds, year) AS ds__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC(id_verifications_src_10003.ds, isoweek) AS verification__ds__week
               , DATE_TRUNC(id_verifications_src_10003.ds, month) AS verification__ds__month
               , DATE_TRUNC(id_verifications_src_10003.ds, quarter) AS verification__ds__quarter
               , DATE_TRUNC(id_verifications_src_10003.ds, year) AS verification__ds__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, isoweek) AS verification__ds_partitioned__week
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, month) AS verification__ds_partitioned__month
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, quarter) AS verification__ds_partitioned__quarter
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, year) AS verification__ds_partitioned__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -110,32 +166,74 @@ FROM (
             , DATE_TRUNC(users_ds_source_src_10007.ds, month) AS ds__month
             , DATE_TRUNC(users_ds_source_src_10007.ds, quarter) AS ds__quarter
             , DATE_TRUNC(users_ds_source_src_10007.ds, year) AS ds__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_dayofyear
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC(users_ds_source_src_10007.created_at, isoweek) AS created_at__week
             , DATE_TRUNC(users_ds_source_src_10007.created_at, month) AS created_at__month
             , DATE_TRUNC(users_ds_source_src_10007.created_at, quarter) AS created_at__quarter
             , DATE_TRUNC(users_ds_source_src_10007.created_at, year) AS created_at__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofyear
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, year) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC(users_ds_source_src_10007.ds, isoweek) AS user__ds__week
             , DATE_TRUNC(users_ds_source_src_10007.ds, month) AS user__ds__month
             , DATE_TRUNC(users_ds_source_src_10007.ds, quarter) AS user__ds__quarter
             , DATE_TRUNC(users_ds_source_src_10007.ds, year) AS user__ds__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofyear
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC(users_ds_source_src_10007.created_at, isoweek) AS user__created_at__week
             , DATE_TRUNC(users_ds_source_src_10007.created_at, month) AS user__created_at__month
             , DATE_TRUNC(users_ds_source_src_10007.created_at, quarter) AS user__created_at__quarter
             , DATE_TRUNC(users_ds_source_src_10007.created_at, year) AS user__created_at__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofyear
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, isoweek) AS user__ds_partitioned__week
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, month) AS user__ds_partitioned__month
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, quarter) AS user__ds_partitioned__quarter
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, year) AS user__ds_partitioned__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofyear
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql
index 019d4f0431..febccc91aa 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC(accounts_source_src_10000.ds, month) AS ds__month
     , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS ds__quarter
     , DATE_TRUNC(accounts_source_src_10000.ds, year) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
     , DATE_TRUNC(accounts_source_src_10000.ds, month) AS account__ds__month
     , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS account__ds__quarter
     , DATE_TRUNC(accounts_source_src_10000.ds, year) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -54,12 +82,26 @@ INNER JOIN (
       , DATE_TRUNC(accounts_source_src_10000.ds, month) AS ds__month
       , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS ds__quarter
       , DATE_TRUNC(accounts_source_src_10000.ds, year) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
       , DATE_TRUNC(accounts_source_src_10000.ds, month) AS account__ds__month
       , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS account__ds__quarter
       , DATE_TRUNC(accounts_source_src_10000.ds, year) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
index d8a55e4ce8..17d01a31fc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC(ds, month) AS ds__month
     , DATE_TRUNC(ds, quarter) AS ds__quarter
     , DATE_TRUNC(ds, year) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC(ds, isoweek) AS account__ds__week
     , DATE_TRUNC(ds, month) AS account__ds__month
     , DATE_TRUNC(ds, quarter) AS account__ds__quarter
     , DATE_TRUNC(ds, year) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
index be0601ac7d..cc5ef6ef07 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC(accounts_source_src_10000.ds, month) AS ds__month
     , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS ds__quarter
     , DATE_TRUNC(accounts_source_src_10000.ds, year) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
     , DATE_TRUNC(accounts_source_src_10000.ds, month) AS account__ds__month
     , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS account__ds__quarter
     , DATE_TRUNC(accounts_source_src_10000.ds, year) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -55,12 +83,26 @@ INNER JOIN (
       , DATE_TRUNC(accounts_source_src_10000.ds, month) AS ds__month
       , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS ds__quarter
       , DATE_TRUNC(accounts_source_src_10000.ds, year) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
       , DATE_TRUNC(accounts_source_src_10000.ds, month) AS account__ds__month
       , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS account__ds__quarter
       , DATE_TRUNC(accounts_source_src_10000.ds, year) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index c01273992a..8fbb61349d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC(ds, month) AS ds__month
     , DATE_TRUNC(ds, quarter) AS ds__quarter
     , DATE_TRUNC(ds, year) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC(ds, isoweek) AS account__ds__week
     , DATE_TRUNC(ds, month) AS account__ds__month
     , DATE_TRUNC(ds, quarter) AS account__ds__quarter
     , DATE_TRUNC(ds, year) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 4e696ff946..ab91ef4285 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC(accounts_source_src_10000.ds, month) AS ds__month
     , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS ds__quarter
     , DATE_TRUNC(accounts_source_src_10000.ds, year) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
     , DATE_TRUNC(accounts_source_src_10000.ds, month) AS account__ds__month
     , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS account__ds__quarter
     , DATE_TRUNC(accounts_source_src_10000.ds, year) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -55,12 +83,26 @@ INNER JOIN (
       , DATE_TRUNC(accounts_source_src_10000.ds, month) AS ds__month
       , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS ds__quarter
       , DATE_TRUNC(accounts_source_src_10000.ds, year) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
       , DATE_TRUNC(accounts_source_src_10000.ds, month) AS account__ds__month
       , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS account__ds__quarter
       , DATE_TRUNC(accounts_source_src_10000.ds, year) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index 15961c6c39..c1a7811068 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC(ds, month) AS ds__month
     , DATE_TRUNC(ds, quarter) AS ds__quarter
     , DATE_TRUNC(ds, year) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC(ds, isoweek) AS account__ds__week
     , DATE_TRUNC(ds, month) AS account__ds__month
     , DATE_TRUNC(ds, quarter) AS account__ds__quarter
     , DATE_TRUNC(ds, year) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql
index 5f0ad187f7..2f7370d5ba 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql
@@ -31,32 +31,74 @@ FROM (
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -83,11 +125,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -96,11 +152,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql
index 1f8a069b02..2f0a3bb53b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql
@@ -20,32 +20,74 @@ SELECT
   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql
index 39876db194..d68f494296 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql
@@ -20,32 +20,74 @@ SELECT
   , DATE_TRUNC(ds, month) AS ds__month
   , DATE_TRUNC(ds, quarter) AS ds__quarter
   , DATE_TRUNC(ds, year) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS ds_partitioned__month
   , DATE_TRUNC(ds_partitioned, quarter) AS ds_partitioned__quarter
   , DATE_TRUNC(ds_partitioned, year) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS paid_at__week
   , DATE_TRUNC(paid_at, month) AS paid_at__month
   , DATE_TRUNC(paid_at, quarter) AS paid_at__quarter
   , DATE_TRUNC(paid_at, year) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC(ds, isoweek) AS booking__ds__week
   , DATE_TRUNC(ds, month) AS booking__ds__month
   , DATE_TRUNC(ds, quarter) AS booking__ds__quarter
   , DATE_TRUNC(ds, year) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS booking__ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS booking__ds_partitioned__month
   , DATE_TRUNC(ds_partitioned, quarter) AS booking__ds_partitioned__quarter
   , DATE_TRUNC(ds_partitioned, year) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS booking__paid_at__week
   , DATE_TRUNC(paid_at, month) AS booking__paid_at__month
   , DATE_TRUNC(paid_at, quarter) AS booking__paid_at__quarter
   , DATE_TRUNC(paid_at, year) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql
index 214766cb17..8209ee600a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -165,31 +249,73 @@ FULL OUTER JOIN (
           , subq_5.ds__month
           , subq_5.ds__quarter
           , subq_5.ds__year
+          , subq_5.ds__extract_year
+          , subq_5.ds__extract_quarter
+          , subq_5.ds__extract_month
+          , subq_5.ds__extract_week
+          , subq_5.ds__extract_day
+          , subq_5.ds__extract_dayofweek
+          , subq_5.ds__extract_dayofyear
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
           , subq_5.ds_partitioned__quarter
           , subq_5.ds_partitioned__year
+          , subq_5.ds_partitioned__extract_year
+          , subq_5.ds_partitioned__extract_quarter
+          , subq_5.ds_partitioned__extract_month
+          , subq_5.ds_partitioned__extract_week
+          , subq_5.ds_partitioned__extract_day
+          , subq_5.ds_partitioned__extract_dayofweek
+          , subq_5.ds_partitioned__extract_dayofyear
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
           , subq_5.paid_at__quarter
           , subq_5.paid_at__year
+          , subq_5.paid_at__extract_year
+          , subq_5.paid_at__extract_quarter
+          , subq_5.paid_at__extract_month
+          , subq_5.paid_at__extract_week
+          , subq_5.paid_at__extract_day
+          , subq_5.paid_at__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
           , subq_5.booking__ds__quarter
           , subq_5.booking__ds__year
+          , subq_5.booking__ds__extract_year
+          , subq_5.booking__ds__extract_quarter
+          , subq_5.booking__ds__extract_month
+          , subq_5.booking__ds__extract_week
+          , subq_5.booking__ds__extract_day
+          , subq_5.booking__ds__extract_dayofweek
+          , subq_5.booking__ds__extract_dayofyear
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
           , subq_5.booking__ds_partitioned__quarter
           , subq_5.booking__ds_partitioned__year
+          , subq_5.booking__ds_partitioned__extract_year
+          , subq_5.booking__ds_partitioned__extract_quarter
+          , subq_5.booking__ds_partitioned__extract_month
+          , subq_5.booking__ds_partitioned__extract_week
+          , subq_5.booking__ds_partitioned__extract_day
+          , subq_5.booking__ds_partitioned__extract_dayofweek
+          , subq_5.booking__ds_partitioned__extract_dayofyear
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
           , subq_5.booking__paid_at__quarter
           , subq_5.booking__paid_at__year
+          , subq_5.booking__paid_at__extract_year
+          , subq_5.booking__paid_at__extract_quarter
+          , subq_5.booking__paid_at__extract_month
+          , subq_5.booking__paid_at__extract_week
+          , subq_5.booking__paid_at__extract_day
+          , subq_5.booking__paid_at__extract_dayofweek
+          , subq_5.booking__paid_at__extract_dayofyear
           , subq_5.ds__day AS metric_time__day
           , subq_5.ds__week AS metric_time__week
           , subq_5.ds__month AS metric_time__month
@@ -239,32 +365,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql
index 63637a9433..9ddc5fe579 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql
@@ -44,32 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -96,11 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -109,11 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 9c4d91d069..e556d194aa 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -51,31 +51,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -125,32 +167,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -175,21 +259,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -218,11 +330,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -231,11 +357,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -296,21 +436,49 @@ FROM (
                 , subq_10.ds__month
                 , subq_10.ds__quarter
                 , subq_10.ds__year
+                , subq_10.ds__extract_year
+                , subq_10.ds__extract_quarter
+                , subq_10.ds__extract_month
+                , subq_10.ds__extract_week
+                , subq_10.ds__extract_day
+                , subq_10.ds__extract_dayofweek
+                , subq_10.ds__extract_dayofyear
                 , subq_10.ds_partitioned__day
                 , subq_10.ds_partitioned__week
                 , subq_10.ds_partitioned__month
                 , subq_10.ds_partitioned__quarter
                 , subq_10.ds_partitioned__year
+                , subq_10.ds_partitioned__extract_year
+                , subq_10.ds_partitioned__extract_quarter
+                , subq_10.ds_partitioned__extract_month
+                , subq_10.ds_partitioned__extract_week
+                , subq_10.ds_partitioned__extract_day
+                , subq_10.ds_partitioned__extract_dayofweek
+                , subq_10.ds_partitioned__extract_dayofyear
                 , subq_10.view__ds__day
                 , subq_10.view__ds__week
                 , subq_10.view__ds__month
                 , subq_10.view__ds__quarter
                 , subq_10.view__ds__year
+                , subq_10.view__ds__extract_year
+                , subq_10.view__ds__extract_quarter
+                , subq_10.view__ds__extract_month
+                , subq_10.view__ds__extract_week
+                , subq_10.view__ds__extract_day
+                , subq_10.view__ds__extract_dayofweek
+                , subq_10.view__ds__extract_dayofyear
                 , subq_10.view__ds_partitioned__day
                 , subq_10.view__ds_partitioned__week
                 , subq_10.view__ds_partitioned__month
                 , subq_10.view__ds_partitioned__quarter
                 , subq_10.view__ds_partitioned__year
+                , subq_10.view__ds_partitioned__extract_year
+                , subq_10.view__ds_partitioned__extract_quarter
+                , subq_10.view__ds_partitioned__extract_month
+                , subq_10.view__ds_partitioned__extract_week
+                , subq_10.view__ds_partitioned__extract_day
+                , subq_10.view__ds_partitioned__extract_dayofweek
+                , subq_10.view__ds_partitioned__extract_dayofyear
                 , subq_10.ds__day AS metric_time__day
                 , subq_10.ds__week AS metric_time__week
                 , subq_10.ds__month AS metric_time__month
@@ -330,21 +498,49 @@ FROM (
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS ds__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DOY FROM views_source_src_10009.ds) AS ds__extract_dayofyear
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC('week', views_source_src_10009.ds) AS view__ds__week
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS view__ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS view__ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS view__ds__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS view__ds__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS view__ds__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS view__ds__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS view__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dayofweek
+                  , EXTRACT(DOY FROM views_source_src_10009.ds) AS view__ds__extract_dayofyear
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofyear
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -367,21 +563,49 @@ FROM (
                 , subq_13.ds__month
                 , subq_13.ds__quarter
                 , subq_13.ds__year
+                , subq_13.ds__extract_year
+                , subq_13.ds__extract_quarter
+                , subq_13.ds__extract_month
+                , subq_13.ds__extract_week
+                , subq_13.ds__extract_day
+                , subq_13.ds__extract_dayofweek
+                , subq_13.ds__extract_dayofyear
                 , subq_13.created_at__day
                 , subq_13.created_at__week
                 , subq_13.created_at__month
                 , subq_13.created_at__quarter
                 , subq_13.created_at__year
+                , subq_13.created_at__extract_year
+                , subq_13.created_at__extract_quarter
+                , subq_13.created_at__extract_month
+                , subq_13.created_at__extract_week
+                , subq_13.created_at__extract_day
+                , subq_13.created_at__extract_dayofweek
+                , subq_13.created_at__extract_dayofyear
                 , subq_13.listing__ds__day
                 , subq_13.listing__ds__week
                 , subq_13.listing__ds__month
                 , subq_13.listing__ds__quarter
                 , subq_13.listing__ds__year
+                , subq_13.listing__ds__extract_year
+                , subq_13.listing__ds__extract_quarter
+                , subq_13.listing__ds__extract_month
+                , subq_13.listing__ds__extract_week
+                , subq_13.listing__ds__extract_day
+                , subq_13.listing__ds__extract_dayofweek
+                , subq_13.listing__ds__extract_dayofyear
                 , subq_13.listing__created_at__day
                 , subq_13.listing__created_at__week
                 , subq_13.listing__created_at__month
                 , subq_13.listing__created_at__quarter
                 , subq_13.listing__created_at__year
+                , subq_13.listing__created_at__extract_year
+                , subq_13.listing__created_at__extract_quarter
+                , subq_13.listing__created_at__extract_month
+                , subq_13.listing__created_at__extract_week
+                , subq_13.listing__created_at__extract_day
+                , subq_13.listing__created_at__extract_dayofweek
+                , subq_13.listing__created_at__extract_dayofyear
                 , subq_13.ds__day AS metric_time__day
                 , subq_13.ds__week AS metric_time__week
                 , subq_13.ds__month AS metric_time__month
@@ -410,11 +634,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -423,11 +661,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index dd55a54b61..f47fd76de7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -47,32 +47,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -99,11 +141,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -112,11 +168,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql
index 48583b238a..3eb622fa49 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql
@@ -44,32 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -96,11 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -109,11 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql
index 4ca35f2544..2b0077fe9a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql
@@ -38,32 +38,74 @@ FROM (
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+        , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+        , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+        , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+        , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+        , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+        , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
index b515ad2da5..7a21860fcb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
index 5eb893b84a..98ba846b40 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
index 2393630095..4695227af1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
@@ -18,11 +18,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -40,11 +54,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
index 9ced88e0cc..d7d79e0e55 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index dd00d2b15e..ea1c3531d4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_1.ds__month
         , subq_1.ds__quarter
         , subq_1.ds__year
+        , subq_1.ds__extract_year
+        , subq_1.ds__extract_quarter
+        , subq_1.ds__extract_month
+        , subq_1.ds__extract_week
+        , subq_1.ds__extract_day
+        , subq_1.ds__extract_dayofweek
+        , subq_1.ds__extract_dayofyear
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
         , subq_1.company__ds__quarter
         , subq_1.company__ds__year
+        , subq_1.company__ds__extract_year
+        , subq_1.company__ds__extract_quarter
+        , subq_1.company__ds__extract_month
+        , subq_1.company__ds__extract_week
+        , subq_1.company__ds__extract_day
+        , subq_1.company__ds__extract_dayofweek
+        , subq_1.company__ds__extract_dayofyear
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -42,11 +56,25 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
           , subq_0.company__ds__quarter
           , subq_0.company__ds__year
+          , subq_0.company__ds__extract_year
+          , subq_0.company__ds__extract_quarter
+          , subq_0.company__ds__extract_month
+          , subq_0.company__ds__extract_week
+          , subq_0.company__ds__extract_day
+          , subq_0.company__ds__extract_dayofweek
+          , subq_0.company__ds__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+            , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+            , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
index 658dcf3357..553a0f19f7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_1.ds__month
         , subq_1.ds__quarter
         , subq_1.ds__year
+        , subq_1.ds__extract_year
+        , subq_1.ds__extract_quarter
+        , subq_1.ds__extract_month
+        , subq_1.ds__extract_week
+        , subq_1.ds__extract_day
+        , subq_1.ds__extract_dayofweek
+        , subq_1.ds__extract_dayofyear
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
         , subq_1.company__ds__quarter
         , subq_1.company__ds__year
+        , subq_1.company__ds__extract_year
+        , subq_1.company__ds__extract_quarter
+        , subq_1.company__ds__extract_month
+        , subq_1.company__ds__extract_week
+        , subq_1.company__ds__extract_day
+        , subq_1.company__ds__extract_dayofweek
+        , subq_1.company__ds__extract_dayofyear
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -42,11 +56,25 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
           , subq_0.company__ds__quarter
           , subq_0.company__ds__year
+          , subq_0.company__ds__extract_year
+          , subq_0.company__ds__extract_quarter
+          , subq_0.company__ds__extract_month
+          , subq_0.company__ds__extract_week
+          , subq_0.company__ds__extract_day
+          , subq_0.company__ds__extract_dayofweek
+          , subq_0.company__ds__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+            , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+            , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql
index 9bafb5e1f6..50f09e5c00 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -170,31 +254,73 @@ FROM (
             , subq_5.ds__month
             , subq_5.ds__quarter
             , subq_5.ds__year
+            , subq_5.ds__extract_year
+            , subq_5.ds__extract_quarter
+            , subq_5.ds__extract_month
+            , subq_5.ds__extract_week
+            , subq_5.ds__extract_day
+            , subq_5.ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear
             , subq_5.ds_partitioned__day
             , subq_5.ds_partitioned__week
             , subq_5.ds_partitioned__month
             , subq_5.ds_partitioned__quarter
             , subq_5.ds_partitioned__year
+            , subq_5.ds_partitioned__extract_year
+            , subq_5.ds_partitioned__extract_quarter
+            , subq_5.ds_partitioned__extract_month
+            , subq_5.ds_partitioned__extract_week
+            , subq_5.ds_partitioned__extract_day
+            , subq_5.ds_partitioned__extract_dayofweek
+            , subq_5.ds_partitioned__extract_dayofyear
             , subq_5.paid_at__day
             , subq_5.paid_at__week
             , subq_5.paid_at__month
             , subq_5.paid_at__quarter
             , subq_5.paid_at__year
+            , subq_5.paid_at__extract_year
+            , subq_5.paid_at__extract_quarter
+            , subq_5.paid_at__extract_month
+            , subq_5.paid_at__extract_week
+            , subq_5.paid_at__extract_day
+            , subq_5.paid_at__extract_dayofweek
+            , subq_5.paid_at__extract_dayofyear
             , subq_5.booking__ds__day
             , subq_5.booking__ds__week
             , subq_5.booking__ds__month
             , subq_5.booking__ds__quarter
             , subq_5.booking__ds__year
+            , subq_5.booking__ds__extract_year
+            , subq_5.booking__ds__extract_quarter
+            , subq_5.booking__ds__extract_month
+            , subq_5.booking__ds__extract_week
+            , subq_5.booking__ds__extract_day
+            , subq_5.booking__ds__extract_dayofweek
+            , subq_5.booking__ds__extract_dayofyear
             , subq_5.booking__ds_partitioned__day
             , subq_5.booking__ds_partitioned__week
             , subq_5.booking__ds_partitioned__month
             , subq_5.booking__ds_partitioned__quarter
             , subq_5.booking__ds_partitioned__year
+            , subq_5.booking__ds_partitioned__extract_year
+            , subq_5.booking__ds_partitioned__extract_quarter
+            , subq_5.booking__ds_partitioned__extract_month
+            , subq_5.booking__ds_partitioned__extract_week
+            , subq_5.booking__ds_partitioned__extract_day
+            , subq_5.booking__ds_partitioned__extract_dayofweek
+            , subq_5.booking__ds_partitioned__extract_dayofyear
             , subq_5.booking__paid_at__day
             , subq_5.booking__paid_at__week
             , subq_5.booking__paid_at__month
             , subq_5.booking__paid_at__quarter
             , subq_5.booking__paid_at__year
+            , subq_5.booking__paid_at__extract_year
+            , subq_5.booking__paid_at__extract_quarter
+            , subq_5.booking__paid_at__extract_month
+            , subq_5.booking__paid_at__extract_week
+            , subq_5.booking__paid_at__extract_day
+            , subq_5.booking__paid_at__extract_dayofweek
+            , subq_5.booking__paid_at__extract_dayofyear
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -244,32 +370,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
index edbbe545fd..82c9f10475 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index c97b8fd930..9fe9c136c1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
index 03b1c29282..daa52ca41e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 6a32edb464..aa0f8a119a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index d52164ec94..ecc7b21c32 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -33,31 +33,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -93,31 +135,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -167,32 +251,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -235,31 +361,73 @@ FROM (
             , subq_9.ds__month AS ds__month
             , subq_9.ds__quarter AS ds__quarter
             , subq_9.ds__year AS ds__year
+            , subq_9.ds__extract_year AS ds__extract_year
+            , subq_9.ds__extract_quarter AS ds__extract_quarter
+            , subq_9.ds__extract_month AS ds__extract_month
+            , subq_9.ds__extract_week AS ds__extract_week
+            , subq_9.ds__extract_day AS ds__extract_day
+            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
             , subq_9.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_9.ds_partitioned__year AS ds_partitioned__year
+            , subq_9.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_9.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
             , subq_9.paid_at__quarter AS paid_at__quarter
             , subq_9.paid_at__year AS paid_at__year
+            , subq_9.paid_at__extract_year AS paid_at__extract_year
+            , subq_9.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_9.paid_at__extract_month AS paid_at__extract_month
+            , subq_9.paid_at__extract_week AS paid_at__extract_week
+            , subq_9.paid_at__extract_day AS paid_at__extract_day
+            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
             , subq_9.booking__ds__quarter AS booking__ds__quarter
             , subq_9.booking__ds__year AS booking__ds__year
+            , subq_9.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_9.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_9.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_9.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_9.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_9.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_9.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_9.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_9.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
             , subq_9.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_9.booking__paid_at__year AS booking__paid_at__year
+            , subq_9.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_9.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -295,31 +463,73 @@ FROM (
               , subq_8.ds__month
               , subq_8.ds__quarter
               , subq_8.ds__year
+              , subq_8.ds__extract_year
+              , subq_8.ds__extract_quarter
+              , subq_8.ds__extract_month
+              , subq_8.ds__extract_week
+              , subq_8.ds__extract_day
+              , subq_8.ds__extract_dayofweek
+              , subq_8.ds__extract_dayofyear
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
               , subq_8.ds_partitioned__quarter
               , subq_8.ds_partitioned__year
+              , subq_8.ds_partitioned__extract_year
+              , subq_8.ds_partitioned__extract_quarter
+              , subq_8.ds_partitioned__extract_month
+              , subq_8.ds_partitioned__extract_week
+              , subq_8.ds_partitioned__extract_day
+              , subq_8.ds_partitioned__extract_dayofweek
+              , subq_8.ds_partitioned__extract_dayofyear
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
               , subq_8.paid_at__quarter
               , subq_8.paid_at__year
+              , subq_8.paid_at__extract_year
+              , subq_8.paid_at__extract_quarter
+              , subq_8.paid_at__extract_month
+              , subq_8.paid_at__extract_week
+              , subq_8.paid_at__extract_day
+              , subq_8.paid_at__extract_dayofweek
+              , subq_8.paid_at__extract_dayofyear
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
               , subq_8.booking__ds__quarter
               , subq_8.booking__ds__year
+              , subq_8.booking__ds__extract_year
+              , subq_8.booking__ds__extract_quarter
+              , subq_8.booking__ds__extract_month
+              , subq_8.booking__ds__extract_week
+              , subq_8.booking__ds__extract_day
+              , subq_8.booking__ds__extract_dayofweek
+              , subq_8.booking__ds__extract_dayofyear
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
               , subq_8.booking__ds_partitioned__quarter
               , subq_8.booking__ds_partitioned__year
+              , subq_8.booking__ds_partitioned__extract_year
+              , subq_8.booking__ds_partitioned__extract_quarter
+              , subq_8.booking__ds_partitioned__extract_month
+              , subq_8.booking__ds_partitioned__extract_week
+              , subq_8.booking__ds_partitioned__extract_day
+              , subq_8.booking__ds_partitioned__extract_dayofweek
+              , subq_8.booking__ds_partitioned__extract_dayofyear
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
               , subq_8.booking__paid_at__quarter
               , subq_8.booking__paid_at__year
+              , subq_8.booking__paid_at__extract_year
+              , subq_8.booking__paid_at__extract_quarter
+              , subq_8.booking__paid_at__extract_month
+              , subq_8.booking__paid_at__extract_week
+              , subq_8.booking__paid_at__extract_day
+              , subq_8.booking__paid_at__extract_dayofweek
+              , subq_8.booking__paid_at__extract_dayofyear
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -369,32 +579,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 1a2a3259ba..9ab034b843 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -33,31 +33,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -93,31 +135,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -167,32 +251,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -236,31 +362,73 @@ FROM (
             , subq_9.ds__month AS ds__month
             , subq_9.ds__quarter AS ds__quarter
             , subq_9.ds__year AS ds__year
+            , subq_9.ds__extract_year AS ds__extract_year
+            , subq_9.ds__extract_quarter AS ds__extract_quarter
+            , subq_9.ds__extract_month AS ds__extract_month
+            , subq_9.ds__extract_week AS ds__extract_week
+            , subq_9.ds__extract_day AS ds__extract_day
+            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
             , subq_9.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_9.ds_partitioned__year AS ds_partitioned__year
+            , subq_9.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_9.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
             , subq_9.paid_at__quarter AS paid_at__quarter
             , subq_9.paid_at__year AS paid_at__year
+            , subq_9.paid_at__extract_year AS paid_at__extract_year
+            , subq_9.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_9.paid_at__extract_month AS paid_at__extract_month
+            , subq_9.paid_at__extract_week AS paid_at__extract_week
+            , subq_9.paid_at__extract_day AS paid_at__extract_day
+            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
             , subq_9.booking__ds__quarter AS booking__ds__quarter
             , subq_9.booking__ds__year AS booking__ds__year
+            , subq_9.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_9.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_9.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_9.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_9.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_9.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_9.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_9.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_9.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
             , subq_9.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_9.booking__paid_at__year AS booking__paid_at__year
+            , subq_9.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_9.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -296,31 +464,73 @@ FROM (
               , subq_8.ds__month
               , subq_8.ds__quarter
               , subq_8.ds__year
+              , subq_8.ds__extract_year
+              , subq_8.ds__extract_quarter
+              , subq_8.ds__extract_month
+              , subq_8.ds__extract_week
+              , subq_8.ds__extract_day
+              , subq_8.ds__extract_dayofweek
+              , subq_8.ds__extract_dayofyear
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
               , subq_8.ds_partitioned__quarter
               , subq_8.ds_partitioned__year
+              , subq_8.ds_partitioned__extract_year
+              , subq_8.ds_partitioned__extract_quarter
+              , subq_8.ds_partitioned__extract_month
+              , subq_8.ds_partitioned__extract_week
+              , subq_8.ds_partitioned__extract_day
+              , subq_8.ds_partitioned__extract_dayofweek
+              , subq_8.ds_partitioned__extract_dayofyear
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
               , subq_8.paid_at__quarter
               , subq_8.paid_at__year
+              , subq_8.paid_at__extract_year
+              , subq_8.paid_at__extract_quarter
+              , subq_8.paid_at__extract_month
+              , subq_8.paid_at__extract_week
+              , subq_8.paid_at__extract_day
+              , subq_8.paid_at__extract_dayofweek
+              , subq_8.paid_at__extract_dayofyear
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
               , subq_8.booking__ds__quarter
               , subq_8.booking__ds__year
+              , subq_8.booking__ds__extract_year
+              , subq_8.booking__ds__extract_quarter
+              , subq_8.booking__ds__extract_month
+              , subq_8.booking__ds__extract_week
+              , subq_8.booking__ds__extract_day
+              , subq_8.booking__ds__extract_dayofweek
+              , subq_8.booking__ds__extract_dayofyear
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
               , subq_8.booking__ds_partitioned__quarter
               , subq_8.booking__ds_partitioned__year
+              , subq_8.booking__ds_partitioned__extract_year
+              , subq_8.booking__ds_partitioned__extract_quarter
+              , subq_8.booking__ds_partitioned__extract_month
+              , subq_8.booking__ds_partitioned__extract_week
+              , subq_8.booking__ds_partitioned__extract_day
+              , subq_8.booking__ds_partitioned__extract_dayofweek
+              , subq_8.booking__ds_partitioned__extract_dayofyear
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
               , subq_8.booking__paid_at__quarter
               , subq_8.booking__paid_at__year
+              , subq_8.booking__paid_at__extract_year
+              , subq_8.booking__paid_at__extract_quarter
+              , subq_8.booking__paid_at__extract_month
+              , subq_8.booking__paid_at__extract_week
+              , subq_8.booking__paid_at__extract_day
+              , subq_8.booking__paid_at__extract_dayofweek
+              , subq_8.booking__paid_at__extract_dayofyear
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -370,32 +580,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
index edd3eef59c..a3509be579 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_4.ds__month AS ds__month
           , subq_4.ds__quarter AS ds__quarter
           , subq_4.ds__year AS ds__year
+          , subq_4.ds__extract_year AS ds__extract_year
+          , subq_4.ds__extract_quarter AS ds__extract_quarter
+          , subq_4.ds__extract_month AS ds__extract_month
+          , subq_4.ds__extract_week AS ds__extract_week
+          , subq_4.ds__extract_day AS ds__extract_day
+          , subq_4.ds__extract_dayofweek AS ds__extract_dayofweek
+          , subq_4.ds__extract_dayofyear AS ds__extract_dayofyear
           , subq_4.ds_partitioned__day AS ds_partitioned__day
           , subq_4.ds_partitioned__week AS ds_partitioned__week
           , subq_4.ds_partitioned__month AS ds_partitioned__month
           , subq_4.ds_partitioned__quarter AS ds_partitioned__quarter
           , subq_4.ds_partitioned__year AS ds_partitioned__year
+          , subq_4.ds_partitioned__extract_year AS ds_partitioned__extract_year
+          , subq_4.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+          , subq_4.ds_partitioned__extract_month AS ds_partitioned__extract_month
+          , subq_4.ds_partitioned__extract_week AS ds_partitioned__extract_week
+          , subq_4.ds_partitioned__extract_day AS ds_partitioned__extract_day
+          , subq_4.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+          , subq_4.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
           , subq_4.paid_at__day AS paid_at__day
           , subq_4.paid_at__week AS paid_at__week
           , subq_4.paid_at__month AS paid_at__month
           , subq_4.paid_at__quarter AS paid_at__quarter
           , subq_4.paid_at__year AS paid_at__year
+          , subq_4.paid_at__extract_year AS paid_at__extract_year
+          , subq_4.paid_at__extract_quarter AS paid_at__extract_quarter
+          , subq_4.paid_at__extract_month AS paid_at__extract_month
+          , subq_4.paid_at__extract_week AS paid_at__extract_week
+          , subq_4.paid_at__extract_day AS paid_at__extract_day
+          , subq_4.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+          , subq_4.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
           , subq_4.booking__ds__day AS booking__ds__day
           , subq_4.booking__ds__week AS booking__ds__week
           , subq_4.booking__ds__month AS booking__ds__month
           , subq_4.booking__ds__quarter AS booking__ds__quarter
           , subq_4.booking__ds__year AS booking__ds__year
+          , subq_4.booking__ds__extract_year AS booking__ds__extract_year
+          , subq_4.booking__ds__extract_quarter AS booking__ds__extract_quarter
+          , subq_4.booking__ds__extract_month AS booking__ds__extract_month
+          , subq_4.booking__ds__extract_week AS booking__ds__extract_week
+          , subq_4.booking__ds__extract_day AS booking__ds__extract_day
+          , subq_4.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+          , subq_4.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
           , subq_4.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_4.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_4.booking__ds_partitioned__month AS booking__ds_partitioned__month
           , subq_4.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
           , subq_4.booking__ds_partitioned__year AS booking__ds_partitioned__year
+          , subq_4.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+          , subq_4.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+          , subq_4.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+          , subq_4.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+          , subq_4.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+          , subq_4.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+          , subq_4.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
           , subq_4.booking__paid_at__day AS booking__paid_at__day
           , subq_4.booking__paid_at__week AS booking__paid_at__week
           , subq_4.booking__paid_at__month AS booking__paid_at__month
           , subq_4.booking__paid_at__quarter AS booking__paid_at__quarter
           , subq_4.booking__paid_at__year AS booking__paid_at__year
+          , subq_4.booking__paid_at__extract_year AS booking__paid_at__extract_year
+          , subq_4.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+          , subq_4.booking__paid_at__extract_month AS booking__paid_at__extract_month
+          , subq_4.booking__paid_at__extract_week AS booking__paid_at__extract_week
+          , subq_4.booking__paid_at__extract_day AS booking__paid_at__extract_day
+          , subq_4.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+          , subq_4.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
           , subq_4.listing AS listing
           , subq_4.guest AS guest
           , subq_4.host AS host
@@ -88,31 +130,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.metric_time__week AS metric_time__week
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
@@ -152,31 +236,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -226,32 +352,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 26c360ab9e..466af8e156 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_1.ds__month AS ds__month
           , subq_1.ds__quarter AS ds__quarter
           , subq_1.ds__year AS ds__year
+          , subq_1.ds__extract_year AS ds__extract_year
+          , subq_1.ds__extract_quarter AS ds__extract_quarter
+          , subq_1.ds__extract_month AS ds__extract_month
+          , subq_1.ds__extract_week AS ds__extract_week
+          , subq_1.ds__extract_day AS ds__extract_day
+          , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+          , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
           , subq_1.ds_partitioned__day AS ds_partitioned__day
           , subq_1.ds_partitioned__week AS ds_partitioned__week
           , subq_1.ds_partitioned__month AS ds_partitioned__month
           , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
           , subq_1.ds_partitioned__year AS ds_partitioned__year
+          , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+          , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+          , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+          , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+          , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+          , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+          , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
           , subq_1.paid_at__day AS paid_at__day
           , subq_1.paid_at__week AS paid_at__week
           , subq_1.paid_at__month AS paid_at__month
           , subq_1.paid_at__quarter AS paid_at__quarter
           , subq_1.paid_at__year AS paid_at__year
+          , subq_1.paid_at__extract_year AS paid_at__extract_year
+          , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+          , subq_1.paid_at__extract_month AS paid_at__extract_month
+          , subq_1.paid_at__extract_week AS paid_at__extract_week
+          , subq_1.paid_at__extract_day AS paid_at__extract_day
+          , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+          , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
           , subq_1.booking__ds__day AS booking__ds__day
           , subq_1.booking__ds__week AS booking__ds__week
           , subq_1.booking__ds__month AS booking__ds__month
           , subq_1.booking__ds__quarter AS booking__ds__quarter
           , subq_1.booking__ds__year AS booking__ds__year
+          , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+          , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+          , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+          , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+          , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+          , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+          , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
           , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
           , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
           , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+          , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+          , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+          , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+          , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+          , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+          , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+          , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
           , subq_1.booking__paid_at__day AS booking__paid_at__day
           , subq_1.booking__paid_at__week AS booking__paid_at__week
           , subq_1.booking__paid_at__month AS booking__paid_at__month
           , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
           , subq_1.booking__paid_at__year AS booking__paid_at__year
+          , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+          , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+          , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+          , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+          , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+          , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+          , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
           , subq_1.listing AS listing
           , subq_1.guest AS guest
           , subq_1.host AS host
@@ -87,31 +129,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -161,32 +245,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql
index 870b2c80ea..049dfd23fb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql
@@ -42,31 +42,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -116,32 +158,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -166,21 +250,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -209,11 +321,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -222,11 +348,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql
index ddba65921c..ceb7438a40 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql
@@ -25,32 +25,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql
index 7ce1a71c7f..95f3b7ed5a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql
@@ -31,32 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 81e6d39ada..479ed8d1ef 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -48,31 +48,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -122,32 +164,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -172,21 +256,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -215,11 +327,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -228,11 +354,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
index 4caa3d07f0..35fca69027 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
@@ -30,8 +30,8 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__day AS listing__window_start__day
-            , subq_4.window_end__day AS listing__window_end__day
+            , subq_4.window_start__extract_month AS listing__window_start__extract_month
+            , subq_4.window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -50,31 +50,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -110,32 +152,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -152,8 +236,8 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__day
-              , subq_3.window_end__day
+              subq_3.window_start__extract_month
+              , subq_3.window_end__extract_dayofweek
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -164,11 +248,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
+                , EXTRACT(DOY FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+                , EXTRACT(DOY FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -177,11 +275,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
+                , EXTRACT(DOY FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
+                , EXTRACT(DOY FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
@@ -196,12 +308,12 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__day
+                subq_2.metric_time__day >= subq_4.window_start__extract_month
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__day
+                  subq_2.metric_time__day < subq_4.window_end__extract_dayofweek
                 ) OR (
-                  subq_4.window_end__day IS NULL
+                  subq_4.window_end__extract_dayofweek IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
index 86a2010b35..710e67b149 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,12 +32,12 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= listings_src_10017.active_from
+        subq_12.metric_time__day >= EXTRACT(MONTH FROM listings_src_10017.active_from)
       ) AND (
         (
-          subq_12.metric_time__day < listings_src_10017.active_to
+          subq_12.metric_time__day < EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to)
         ) OR (
-          listings_src_10017.active_to IS NULL
+          EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 6ed1bd4e99..70accec611 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 22702f0c48..a6aabb20c2 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
index 027f20ea5b..80e8fdda4b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql
index 913fed793c..42f33bb96e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql
@@ -26,31 +26,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
index 86b30c4553..973abdbb6f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
@@ -21,21 +21,49 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.created_at__day
         , subq_0.created_at__week
         , subq_0.created_at__month
         , subq_0.created_at__quarter
         , subq_0.created_at__year
+        , subq_0.created_at__extract_year
+        , subq_0.created_at__extract_quarter
+        , subq_0.created_at__extract_month
+        , subq_0.created_at__extract_week
+        , subq_0.created_at__extract_day
+        , subq_0.created_at__extract_dayofweek
+        , subq_0.created_at__extract_dayofyear
         , subq_0.listing__ds__day
         , subq_0.listing__ds__week
         , subq_0.listing__ds__month
         , subq_0.listing__ds__quarter
         , subq_0.listing__ds__year
+        , subq_0.listing__ds__extract_year
+        , subq_0.listing__ds__extract_quarter
+        , subq_0.listing__ds__extract_month
+        , subq_0.listing__ds__extract_week
+        , subq_0.listing__ds__extract_day
+        , subq_0.listing__ds__extract_dayofweek
+        , subq_0.listing__ds__extract_dayofyear
         , subq_0.listing__created_at__day
         , subq_0.listing__created_at__week
         , subq_0.listing__created_at__month
         , subq_0.listing__created_at__quarter
         , subq_0.listing__created_at__year
+        , subq_0.listing__created_at__extract_year
+        , subq_0.listing__created_at__extract_quarter
+        , subq_0.listing__created_at__extract_month
+        , subq_0.listing__created_at__extract_week
+        , subq_0.listing__created_at__extract_day
+        , subq_0.listing__created_at__extract_dayofweek
+        , subq_0.listing__created_at__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -77,11 +119,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql
index 316737d00a..97140fd5a8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql
@@ -35,32 +35,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql
index 73e6a70d92..c99d63cffa 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql
@@ -60,31 +60,73 @@ FROM (
                     , subq_0.ds__month
                     , subq_0.ds__quarter
                     , subq_0.ds__year
+                    , subq_0.ds__extract_year
+                    , subq_0.ds__extract_quarter
+                    , subq_0.ds__extract_month
+                    , subq_0.ds__extract_week
+                    , subq_0.ds__extract_day
+                    , subq_0.ds__extract_dayofweek
+                    , subq_0.ds__extract_dayofyear
                     , subq_0.ds_partitioned__day
                     , subq_0.ds_partitioned__week
                     , subq_0.ds_partitioned__month
                     , subq_0.ds_partitioned__quarter
                     , subq_0.ds_partitioned__year
+                    , subq_0.ds_partitioned__extract_year
+                    , subq_0.ds_partitioned__extract_quarter
+                    , subq_0.ds_partitioned__extract_month
+                    , subq_0.ds_partitioned__extract_week
+                    , subq_0.ds_partitioned__extract_day
+                    , subq_0.ds_partitioned__extract_dayofweek
+                    , subq_0.ds_partitioned__extract_dayofyear
                     , subq_0.paid_at__day
                     , subq_0.paid_at__week
                     , subq_0.paid_at__month
                     , subq_0.paid_at__quarter
                     , subq_0.paid_at__year
+                    , subq_0.paid_at__extract_year
+                    , subq_0.paid_at__extract_quarter
+                    , subq_0.paid_at__extract_month
+                    , subq_0.paid_at__extract_week
+                    , subq_0.paid_at__extract_day
+                    , subq_0.paid_at__extract_dayofweek
+                    , subq_0.paid_at__extract_dayofyear
                     , subq_0.booking__ds__day
                     , subq_0.booking__ds__week
                     , subq_0.booking__ds__month
                     , subq_0.booking__ds__quarter
                     , subq_0.booking__ds__year
+                    , subq_0.booking__ds__extract_year
+                    , subq_0.booking__ds__extract_quarter
+                    , subq_0.booking__ds__extract_month
+                    , subq_0.booking__ds__extract_week
+                    , subq_0.booking__ds__extract_day
+                    , subq_0.booking__ds__extract_dayofweek
+                    , subq_0.booking__ds__extract_dayofyear
                     , subq_0.booking__ds_partitioned__day
                     , subq_0.booking__ds_partitioned__week
                     , subq_0.booking__ds_partitioned__month
                     , subq_0.booking__ds_partitioned__quarter
                     , subq_0.booking__ds_partitioned__year
+                    , subq_0.booking__ds_partitioned__extract_year
+                    , subq_0.booking__ds_partitioned__extract_quarter
+                    , subq_0.booking__ds_partitioned__extract_month
+                    , subq_0.booking__ds_partitioned__extract_week
+                    , subq_0.booking__ds_partitioned__extract_day
+                    , subq_0.booking__ds_partitioned__extract_dayofweek
+                    , subq_0.booking__ds_partitioned__extract_dayofyear
                     , subq_0.booking__paid_at__day
                     , subq_0.booking__paid_at__week
                     , subq_0.booking__paid_at__month
                     , subq_0.booking__paid_at__quarter
                     , subq_0.booking__paid_at__year
+                    , subq_0.booking__paid_at__extract_year
+                    , subq_0.booking__paid_at__extract_quarter
+                    , subq_0.booking__paid_at__extract_month
+                    , subq_0.booking__paid_at__extract_week
+                    , subq_0.booking__paid_at__extract_day
+                    , subq_0.booking__paid_at__extract_dayofweek
+                    , subq_0.booking__paid_at__extract_dayofyear
                     , subq_0.ds__day AS metric_time__day
                     , subq_0.ds__week AS metric_time__week
                     , subq_0.ds__month AS metric_time__month
@@ -134,32 +176,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -184,21 +268,49 @@ FROM (
                     , subq_3.ds__month
                     , subq_3.ds__quarter
                     , subq_3.ds__year
+                    , subq_3.ds__extract_year
+                    , subq_3.ds__extract_quarter
+                    , subq_3.ds__extract_month
+                    , subq_3.ds__extract_week
+                    , subq_3.ds__extract_day
+                    , subq_3.ds__extract_dayofweek
+                    , subq_3.ds__extract_dayofyear
                     , subq_3.created_at__day
                     , subq_3.created_at__week
                     , subq_3.created_at__month
                     , subq_3.created_at__quarter
                     , subq_3.created_at__year
+                    , subq_3.created_at__extract_year
+                    , subq_3.created_at__extract_quarter
+                    , subq_3.created_at__extract_month
+                    , subq_3.created_at__extract_week
+                    , subq_3.created_at__extract_day
+                    , subq_3.created_at__extract_dayofweek
+                    , subq_3.created_at__extract_dayofyear
                     , subq_3.listing__ds__day
                     , subq_3.listing__ds__week
                     , subq_3.listing__ds__month
                     , subq_3.listing__ds__quarter
                     , subq_3.listing__ds__year
+                    , subq_3.listing__ds__extract_year
+                    , subq_3.listing__ds__extract_quarter
+                    , subq_3.listing__ds__extract_month
+                    , subq_3.listing__ds__extract_week
+                    , subq_3.listing__ds__extract_day
+                    , subq_3.listing__ds__extract_dayofweek
+                    , subq_3.listing__ds__extract_dayofyear
                     , subq_3.listing__created_at__day
                     , subq_3.listing__created_at__week
                     , subq_3.listing__created_at__month
                     , subq_3.listing__created_at__quarter
                     , subq_3.listing__created_at__year
+                    , subq_3.listing__created_at__extract_year
+                    , subq_3.listing__created_at__extract_quarter
+                    , subq_3.listing__created_at__extract_month
+                    , subq_3.listing__created_at__extract_week
+                    , subq_3.listing__created_at__extract_day
+                    , subq_3.listing__created_at__extract_dayofweek
+                    , subq_3.listing__created_at__extract_dayofyear
                     , subq_3.ds__day AS metric_time__day
                     , subq_3.ds__week AS metric_time__week
                     , subq_3.ds__month AS metric_time__month
@@ -227,11 +339,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -240,11 +366,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -317,31 +457,73 @@ FROM (
                     , subq_12.ds__month
                     , subq_12.ds__quarter
                     , subq_12.ds__year
+                    , subq_12.ds__extract_year
+                    , subq_12.ds__extract_quarter
+                    , subq_12.ds__extract_month
+                    , subq_12.ds__extract_week
+                    , subq_12.ds__extract_day
+                    , subq_12.ds__extract_dayofweek
+                    , subq_12.ds__extract_dayofyear
                     , subq_12.ds_partitioned__day
                     , subq_12.ds_partitioned__week
                     , subq_12.ds_partitioned__month
                     , subq_12.ds_partitioned__quarter
                     , subq_12.ds_partitioned__year
+                    , subq_12.ds_partitioned__extract_year
+                    , subq_12.ds_partitioned__extract_quarter
+                    , subq_12.ds_partitioned__extract_month
+                    , subq_12.ds_partitioned__extract_week
+                    , subq_12.ds_partitioned__extract_day
+                    , subq_12.ds_partitioned__extract_dayofweek
+                    , subq_12.ds_partitioned__extract_dayofyear
                     , subq_12.paid_at__day
                     , subq_12.paid_at__week
                     , subq_12.paid_at__month
                     , subq_12.paid_at__quarter
                     , subq_12.paid_at__year
+                    , subq_12.paid_at__extract_year
+                    , subq_12.paid_at__extract_quarter
+                    , subq_12.paid_at__extract_month
+                    , subq_12.paid_at__extract_week
+                    , subq_12.paid_at__extract_day
+                    , subq_12.paid_at__extract_dayofweek
+                    , subq_12.paid_at__extract_dayofyear
                     , subq_12.booking__ds__day
                     , subq_12.booking__ds__week
                     , subq_12.booking__ds__month
                     , subq_12.booking__ds__quarter
                     , subq_12.booking__ds__year
+                    , subq_12.booking__ds__extract_year
+                    , subq_12.booking__ds__extract_quarter
+                    , subq_12.booking__ds__extract_month
+                    , subq_12.booking__ds__extract_week
+                    , subq_12.booking__ds__extract_day
+                    , subq_12.booking__ds__extract_dayofweek
+                    , subq_12.booking__ds__extract_dayofyear
                     , subq_12.booking__ds_partitioned__day
                     , subq_12.booking__ds_partitioned__week
                     , subq_12.booking__ds_partitioned__month
                     , subq_12.booking__ds_partitioned__quarter
                     , subq_12.booking__ds_partitioned__year
+                    , subq_12.booking__ds_partitioned__extract_year
+                    , subq_12.booking__ds_partitioned__extract_quarter
+                    , subq_12.booking__ds_partitioned__extract_month
+                    , subq_12.booking__ds_partitioned__extract_week
+                    , subq_12.booking__ds_partitioned__extract_day
+                    , subq_12.booking__ds_partitioned__extract_dayofweek
+                    , subq_12.booking__ds_partitioned__extract_dayofyear
                     , subq_12.booking__paid_at__day
                     , subq_12.booking__paid_at__week
                     , subq_12.booking__paid_at__month
                     , subq_12.booking__paid_at__quarter
                     , subq_12.booking__paid_at__year
+                    , subq_12.booking__paid_at__extract_year
+                    , subq_12.booking__paid_at__extract_quarter
+                    , subq_12.booking__paid_at__extract_month
+                    , subq_12.booking__paid_at__extract_week
+                    , subq_12.booking__paid_at__extract_day
+                    , subq_12.booking__paid_at__extract_dayofweek
+                    , subq_12.booking__paid_at__extract_dayofyear
                     , subq_12.ds__day AS metric_time__day
                     , subq_12.ds__week AS metric_time__week
                     , subq_12.ds__month AS metric_time__month
@@ -391,32 +573,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -441,21 +665,49 @@ FROM (
                     , subq_15.ds__month
                     , subq_15.ds__quarter
                     , subq_15.ds__year
+                    , subq_15.ds__extract_year
+                    , subq_15.ds__extract_quarter
+                    , subq_15.ds__extract_month
+                    , subq_15.ds__extract_week
+                    , subq_15.ds__extract_day
+                    , subq_15.ds__extract_dayofweek
+                    , subq_15.ds__extract_dayofyear
                     , subq_15.created_at__day
                     , subq_15.created_at__week
                     , subq_15.created_at__month
                     , subq_15.created_at__quarter
                     , subq_15.created_at__year
+                    , subq_15.created_at__extract_year
+                    , subq_15.created_at__extract_quarter
+                    , subq_15.created_at__extract_month
+                    , subq_15.created_at__extract_week
+                    , subq_15.created_at__extract_day
+                    , subq_15.created_at__extract_dayofweek
+                    , subq_15.created_at__extract_dayofyear
                     , subq_15.listing__ds__day
                     , subq_15.listing__ds__week
                     , subq_15.listing__ds__month
                     , subq_15.listing__ds__quarter
                     , subq_15.listing__ds__year
+                    , subq_15.listing__ds__extract_year
+                    , subq_15.listing__ds__extract_quarter
+                    , subq_15.listing__ds__extract_month
+                    , subq_15.listing__ds__extract_week
+                    , subq_15.listing__ds__extract_day
+                    , subq_15.listing__ds__extract_dayofweek
+                    , subq_15.listing__ds__extract_dayofyear
                     , subq_15.listing__created_at__day
                     , subq_15.listing__created_at__week
                     , subq_15.listing__created_at__month
                     , subq_15.listing__created_at__quarter
                     , subq_15.listing__created_at__year
+                    , subq_15.listing__created_at__extract_year
+                    , subq_15.listing__created_at__extract_quarter
+                    , subq_15.listing__created_at__extract_month
+                    , subq_15.listing__created_at__extract_week
+                    , subq_15.listing__created_at__extract_day
+                    , subq_15.listing__created_at__extract_dayofweek
+                    , subq_15.listing__created_at__extract_dayofyear
                     , subq_15.ds__day AS metric_time__day
                     , subq_15.ds__week AS metric_time__week
                     , subq_15.ds__month AS metric_time__month
@@ -484,11 +736,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -497,11 +763,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -557,31 +837,73 @@ FROM (
             , subq_24.ds__month
             , subq_24.ds__quarter
             , subq_24.ds__year
+            , subq_24.ds__extract_year
+            , subq_24.ds__extract_quarter
+            , subq_24.ds__extract_month
+            , subq_24.ds__extract_week
+            , subq_24.ds__extract_day
+            , subq_24.ds__extract_dayofweek
+            , subq_24.ds__extract_dayofyear
             , subq_24.ds_partitioned__day
             , subq_24.ds_partitioned__week
             , subq_24.ds_partitioned__month
             , subq_24.ds_partitioned__quarter
             , subq_24.ds_partitioned__year
+            , subq_24.ds_partitioned__extract_year
+            , subq_24.ds_partitioned__extract_quarter
+            , subq_24.ds_partitioned__extract_month
+            , subq_24.ds_partitioned__extract_week
+            , subq_24.ds_partitioned__extract_day
+            , subq_24.ds_partitioned__extract_dayofweek
+            , subq_24.ds_partitioned__extract_dayofyear
             , subq_24.paid_at__day
             , subq_24.paid_at__week
             , subq_24.paid_at__month
             , subq_24.paid_at__quarter
             , subq_24.paid_at__year
+            , subq_24.paid_at__extract_year
+            , subq_24.paid_at__extract_quarter
+            , subq_24.paid_at__extract_month
+            , subq_24.paid_at__extract_week
+            , subq_24.paid_at__extract_day
+            , subq_24.paid_at__extract_dayofweek
+            , subq_24.paid_at__extract_dayofyear
             , subq_24.booking__ds__day
             , subq_24.booking__ds__week
             , subq_24.booking__ds__month
             , subq_24.booking__ds__quarter
             , subq_24.booking__ds__year
+            , subq_24.booking__ds__extract_year
+            , subq_24.booking__ds__extract_quarter
+            , subq_24.booking__ds__extract_month
+            , subq_24.booking__ds__extract_week
+            , subq_24.booking__ds__extract_day
+            , subq_24.booking__ds__extract_dayofweek
+            , subq_24.booking__ds__extract_dayofyear
             , subq_24.booking__ds_partitioned__day
             , subq_24.booking__ds_partitioned__week
             , subq_24.booking__ds_partitioned__month
             , subq_24.booking__ds_partitioned__quarter
             , subq_24.booking__ds_partitioned__year
+            , subq_24.booking__ds_partitioned__extract_year
+            , subq_24.booking__ds_partitioned__extract_quarter
+            , subq_24.booking__ds_partitioned__extract_month
+            , subq_24.booking__ds_partitioned__extract_week
+            , subq_24.booking__ds_partitioned__extract_day
+            , subq_24.booking__ds_partitioned__extract_dayofweek
+            , subq_24.booking__ds_partitioned__extract_dayofyear
             , subq_24.booking__paid_at__day
             , subq_24.booking__paid_at__week
             , subq_24.booking__paid_at__month
             , subq_24.booking__paid_at__quarter
             , subq_24.booking__paid_at__year
+            , subq_24.booking__paid_at__extract_year
+            , subq_24.booking__paid_at__extract_quarter
+            , subq_24.booking__paid_at__extract_month
+            , subq_24.booking__paid_at__extract_week
+            , subq_24.booking__paid_at__extract_day
+            , subq_24.booking__paid_at__extract_dayofweek
+            , subq_24.booking__paid_at__extract_dayofyear
             , subq_24.ds__day AS metric_time__day
             , subq_24.ds__week AS metric_time__week
             , subq_24.ds__month AS metric_time__month
@@ -631,32 +953,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
index 4176ca90e9..1e3f035827 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
@@ -45,31 +45,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -119,32 +161,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -186,31 +270,73 @@ FROM (
             , subq_7.ds__month
             , subq_7.ds__quarter
             , subq_7.ds__year
+            , subq_7.ds__extract_year
+            , subq_7.ds__extract_quarter
+            , subq_7.ds__extract_month
+            , subq_7.ds__extract_week
+            , subq_7.ds__extract_day
+            , subq_7.ds__extract_dayofweek
+            , subq_7.ds__extract_dayofyear
             , subq_7.ds_partitioned__day
             , subq_7.ds_partitioned__week
             , subq_7.ds_partitioned__month
             , subq_7.ds_partitioned__quarter
             , subq_7.ds_partitioned__year
+            , subq_7.ds_partitioned__extract_year
+            , subq_7.ds_partitioned__extract_quarter
+            , subq_7.ds_partitioned__extract_month
+            , subq_7.ds_partitioned__extract_week
+            , subq_7.ds_partitioned__extract_day
+            , subq_7.ds_partitioned__extract_dayofweek
+            , subq_7.ds_partitioned__extract_dayofyear
             , subq_7.paid_at__day
             , subq_7.paid_at__week
             , subq_7.paid_at__month
             , subq_7.paid_at__quarter
             , subq_7.paid_at__year
+            , subq_7.paid_at__extract_year
+            , subq_7.paid_at__extract_quarter
+            , subq_7.paid_at__extract_month
+            , subq_7.paid_at__extract_week
+            , subq_7.paid_at__extract_day
+            , subq_7.paid_at__extract_dayofweek
+            , subq_7.paid_at__extract_dayofyear
             , subq_7.booking__ds__day
             , subq_7.booking__ds__week
             , subq_7.booking__ds__month
             , subq_7.booking__ds__quarter
             , subq_7.booking__ds__year
+            , subq_7.booking__ds__extract_year
+            , subq_7.booking__ds__extract_quarter
+            , subq_7.booking__ds__extract_month
+            , subq_7.booking__ds__extract_week
+            , subq_7.booking__ds__extract_day
+            , subq_7.booking__ds__extract_dayofweek
+            , subq_7.booking__ds__extract_dayofyear
             , subq_7.booking__ds_partitioned__day
             , subq_7.booking__ds_partitioned__week
             , subq_7.booking__ds_partitioned__month
             , subq_7.booking__ds_partitioned__quarter
             , subq_7.booking__ds_partitioned__year
+            , subq_7.booking__ds_partitioned__extract_year
+            , subq_7.booking__ds_partitioned__extract_quarter
+            , subq_7.booking__ds_partitioned__extract_month
+            , subq_7.booking__ds_partitioned__extract_week
+            , subq_7.booking__ds_partitioned__extract_day
+            , subq_7.booking__ds_partitioned__extract_dayofweek
+            , subq_7.booking__ds_partitioned__extract_dayofyear
             , subq_7.booking__paid_at__day
             , subq_7.booking__paid_at__week
             , subq_7.booking__paid_at__month
             , subq_7.booking__paid_at__quarter
             , subq_7.booking__paid_at__year
+            , subq_7.booking__paid_at__extract_year
+            , subq_7.booking__paid_at__extract_quarter
+            , subq_7.booking__paid_at__extract_month
+            , subq_7.booking__paid_at__extract_week
+            , subq_7.booking__paid_at__extract_day
+            , subq_7.booking__paid_at__extract_dayofweek
+            , subq_7.booking__paid_at__extract_dayofyear
             , subq_7.ds__day AS metric_time__day
             , subq_7.ds__week AS metric_time__week
             , subq_7.ds__month AS metric_time__month
@@ -260,32 +386,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 13d80a91d0..1286214deb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -39,31 +39,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -113,32 +155,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 14ec230f17..0b3cc84657 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -27,31 +27,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -160,21 +244,49 @@ FROM (
             , subq_5.ds__month
             , subq_5.ds__quarter
             , subq_5.ds__year
+            , subq_5.ds__extract_year
+            , subq_5.ds__extract_quarter
+            , subq_5.ds__extract_month
+            , subq_5.ds__extract_week
+            , subq_5.ds__extract_day
+            , subq_5.ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear
             , subq_5.created_at__day
             , subq_5.created_at__week
             , subq_5.created_at__month
             , subq_5.created_at__quarter
             , subq_5.created_at__year
+            , subq_5.created_at__extract_year
+            , subq_5.created_at__extract_quarter
+            , subq_5.created_at__extract_month
+            , subq_5.created_at__extract_week
+            , subq_5.created_at__extract_day
+            , subq_5.created_at__extract_dayofweek
+            , subq_5.created_at__extract_dayofyear
             , subq_5.listing__ds__day
             , subq_5.listing__ds__week
             , subq_5.listing__ds__month
             , subq_5.listing__ds__quarter
             , subq_5.listing__ds__year
+            , subq_5.listing__ds__extract_year
+            , subq_5.listing__ds__extract_quarter
+            , subq_5.listing__ds__extract_month
+            , subq_5.listing__ds__extract_week
+            , subq_5.listing__ds__extract_day
+            , subq_5.listing__ds__extract_dayofweek
+            , subq_5.listing__ds__extract_dayofyear
             , subq_5.listing__created_at__day
             , subq_5.listing__created_at__week
             , subq_5.listing__created_at__month
             , subq_5.listing__created_at__quarter
             , subq_5.listing__created_at__year
+            , subq_5.listing__created_at__extract_year
+            , subq_5.listing__created_at__extract_quarter
+            , subq_5.listing__created_at__extract_month
+            , subq_5.listing__created_at__extract_week
+            , subq_5.listing__created_at__extract_day
+            , subq_5.listing__created_at__extract_dayofweek
+            , subq_5.listing__created_at__extract_dayofyear
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -203,11 +315,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -216,11 +342,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
index 88cc0b431d..e0644705db 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__day AS listing__window_start__day
-        , subq_7.window_end__day AS listing__window_end__day
+        , subq_7.window_start__extract_month AS listing__window_start__extract_month
+        , subq_7.window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
         , subq_2.bookings AS bookings
@@ -40,31 +40,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -142,8 +226,8 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__day
-          , subq_6.window_end__day
+          subq_6.window_start__extract_month
+          , subq_6.window_end__extract_dayofweek
           , subq_6.listing
           , subq_6.user__home_state_latest
         FROM (
@@ -154,26 +238,61 @@ FROM (
             , subq_3.window_start__month AS window_start__month
             , subq_3.window_start__quarter AS window_start__quarter
             , subq_3.window_start__year AS window_start__year
+            , subq_3.window_start__extract_year AS window_start__extract_year
+            , subq_3.window_start__extract_quarter AS window_start__extract_quarter
+            , subq_3.window_start__extract_month AS window_start__extract_month
+            , subq_3.window_start__extract_week AS window_start__extract_week
+            , subq_3.window_start__extract_day AS window_start__extract_day
+            , subq_3.window_start__extract_dayofweek AS window_start__extract_dayofweek
+            , subq_3.window_start__extract_dayofyear AS window_start__extract_dayofyear
             , subq_3.window_end__day AS window_end__day
             , subq_3.window_end__week AS window_end__week
             , subq_3.window_end__month AS window_end__month
             , subq_3.window_end__quarter AS window_end__quarter
             , subq_3.window_end__year AS window_end__year
+            , subq_3.window_end__extract_year AS window_end__extract_year
+            , subq_3.window_end__extract_quarter AS window_end__extract_quarter
+            , subq_3.window_end__extract_month AS window_end__extract_month
+            , subq_3.window_end__extract_week AS window_end__extract_week
+            , subq_3.window_end__extract_day AS window_end__extract_day
+            , subq_3.window_end__extract_dayofweek AS window_end__extract_dayofweek
+            , subq_3.window_end__extract_dayofyear AS window_end__extract_dayofyear
             , subq_3.listing__window_start__day AS listing__window_start__day
             , subq_3.listing__window_start__week AS listing__window_start__week
             , subq_3.listing__window_start__month AS listing__window_start__month
             , subq_3.listing__window_start__quarter AS listing__window_start__quarter
             , subq_3.listing__window_start__year AS listing__window_start__year
+            , subq_3.listing__window_start__extract_year AS listing__window_start__extract_year
+            , subq_3.listing__window_start__extract_quarter AS listing__window_start__extract_quarter
+            , subq_3.listing__window_start__extract_month AS listing__window_start__extract_month
+            , subq_3.listing__window_start__extract_week AS listing__window_start__extract_week
+            , subq_3.listing__window_start__extract_day AS listing__window_start__extract_day
+            , subq_3.listing__window_start__extract_dayofweek AS listing__window_start__extract_dayofweek
+            , subq_3.listing__window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
             , subq_3.listing__window_end__day AS listing__window_end__day
             , subq_3.listing__window_end__week AS listing__window_end__week
             , subq_3.listing__window_end__month AS listing__window_end__month
             , subq_3.listing__window_end__quarter AS listing__window_end__quarter
             , subq_3.listing__window_end__year AS listing__window_end__year
+            , subq_3.listing__window_end__extract_year AS listing__window_end__extract_year
+            , subq_3.listing__window_end__extract_quarter AS listing__window_end__extract_quarter
+            , subq_3.listing__window_end__extract_month AS listing__window_end__extract_month
+            , subq_3.listing__window_end__extract_week AS listing__window_end__extract_week
+            , subq_3.listing__window_end__extract_day AS listing__window_end__extract_day
+            , subq_3.listing__window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
+            , subq_3.listing__window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
             , subq_5.ds__day AS user__ds__day
             , subq_5.ds__week AS user__ds__week
             , subq_5.ds__month AS user__ds__month
             , subq_5.ds__quarter AS user__ds__quarter
             , subq_5.ds__year AS user__ds__year
+            , subq_5.ds__extract_year AS user__ds__extract_year
+            , subq_5.ds__extract_quarter AS user__ds__extract_quarter
+            , subq_5.ds__extract_month AS user__ds__extract_month
+            , subq_5.ds__extract_week AS user__ds__extract_week
+            , subq_5.ds__extract_day AS user__ds__extract_day
+            , subq_5.ds__extract_dayofweek AS user__ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS user__ds__extract_dayofyear
             , subq_3.listing AS listing
             , subq_3.user AS user
             , subq_3.listing__user AS listing__user
@@ -192,11 +311,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
+              , EXTRACT(DOY FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+              , EXTRACT(DOY FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -205,11 +338,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
+              , EXTRACT(DOY FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
+              , EXTRACT(DOY FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -227,11 +374,25 @@ FROM (
             --    'ds__month',
             --    'ds__quarter',
             --    'ds__year',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
             --    'user__ds__day',
             --    'user__ds__week',
             --    'user__ds__month',
             --    'user__ds__quarter',
             --    'user__ds__year',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
             --    'user']
             SELECT
               subq_4.ds__day
@@ -239,11 +400,25 @@ FROM (
               , subq_4.ds__month
               , subq_4.ds__quarter
               , subq_4.ds__year
+              , subq_4.ds__extract_year
+              , subq_4.ds__extract_quarter
+              , subq_4.ds__extract_month
+              , subq_4.ds__extract_week
+              , subq_4.ds__extract_day
+              , subq_4.ds__extract_dayofweek
+              , subq_4.ds__extract_dayofyear
               , subq_4.user__ds__day
               , subq_4.user__ds__week
               , subq_4.user__ds__month
               , subq_4.user__ds__quarter
               , subq_4.user__ds__year
+              , subq_4.user__ds__extract_year
+              , subq_4.user__ds__extract_quarter
+              , subq_4.user__ds__extract_month
+              , subq_4.user__ds__extract_week
+              , subq_4.user__ds__extract_day
+              , subq_4.user__ds__extract_dayofweek
+              , subq_4.user__ds__extract_dayofyear
               , subq_4.user
               , subq_4.home_state_latest
               , subq_4.user__home_state_latest
@@ -255,12 +430,26 @@ FROM (
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS ds__year
+                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dayofweek
+                , EXTRACT(DOY FROM users_latest_src_10021.ds) AS ds__extract_dayofyear
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC('week', users_latest_src_10021.ds) AS user__ds__week
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS user__ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS user__ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS user__ds__year
+                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS user__ds__extract_year
+                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
+                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS user__ds__extract_month
+                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
+                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS user__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dayofweek
+                , EXTRACT(DOY FROM users_latest_src_10021.ds) AS user__ds__extract_dayofyear
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
@@ -275,12 +464,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__day
+            subq_2.metric_time__day >= subq_7.window_start__extract_month
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.window_end__day
+              subq_2.metric_time__day < subq_7.window_end__extract_dayofweek
             ) OR (
-              subq_7.window_end__day IS NULL
+              subq_7.window_end__extract_dayofweek IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index feb5ed0fdc..425b62e62c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,8 +23,8 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    listings_src_10017.active_from AS window_start__day
-    , listings_src_10017.active_to AS window_end__day
+    EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+    , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
   FROM ***************************.dim_listings listings_src_10017
@@ -38,12 +38,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__day
+      subq_13.metric_time__day >= subq_18.window_start__extract_month
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.window_end__day
+        subq_13.metric_time__day < subq_18.window_end__extract_dayofweek
       ) OR (
-        subq_18.window_end__day IS NULL
+        subq_18.window_end__extract_dayofweek IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
index 94054a124c..20137a0df6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.lux_listing__window_start__day AS listing__lux_listing__window_start__day
-        , subq_7.lux_listing__window_end__day AS listing__lux_listing__window_end__day
+        , subq_7.lux_listing__window_start__extract_day AS listing__lux_listing__window_start__extract_day
+        , subq_7.lux_listing__window_end__extract_month AS listing__lux_listing__window_end__extract_month
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
         , subq_2.bookings AS bookings
@@ -40,31 +40,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -145,8 +229,8 @@ FROM (
         --    'lux_listing__window_end__day',
         --    'listing']
         SELECT
-          subq_6.lux_listing__window_start__day
-          , subq_6.lux_listing__window_end__day
+          subq_6.lux_listing__window_start__extract_day
+          , subq_6.lux_listing__window_end__extract_month
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
         FROM (
@@ -157,11 +241,25 @@ FROM (
             , subq_5.window_start__month AS lux_listing__window_start__month
             , subq_5.window_start__quarter AS lux_listing__window_start__quarter
             , subq_5.window_start__year AS lux_listing__window_start__year
+            , subq_5.window_start__extract_year AS lux_listing__window_start__extract_year
+            , subq_5.window_start__extract_quarter AS lux_listing__window_start__extract_quarter
+            , subq_5.window_start__extract_month AS lux_listing__window_start__extract_month
+            , subq_5.window_start__extract_week AS lux_listing__window_start__extract_week
+            , subq_5.window_start__extract_day AS lux_listing__window_start__extract_day
+            , subq_5.window_start__extract_dayofweek AS lux_listing__window_start__extract_dayofweek
+            , subq_5.window_start__extract_dayofyear AS lux_listing__window_start__extract_dayofyear
             , subq_5.window_end__day AS lux_listing__window_end__day
             , subq_5.window_end__week AS lux_listing__window_end__week
             , subq_5.window_end__month AS lux_listing__window_end__month
             , subq_5.window_end__quarter AS lux_listing__window_end__quarter
             , subq_5.window_end__year AS lux_listing__window_end__year
+            , subq_5.window_end__extract_year AS lux_listing__window_end__extract_year
+            , subq_5.window_end__extract_quarter AS lux_listing__window_end__extract_quarter
+            , subq_5.window_end__extract_month AS lux_listing__window_end__extract_month
+            , subq_5.window_end__extract_week AS lux_listing__window_end__extract_week
+            , subq_5.window_end__extract_day AS lux_listing__window_end__extract_day
+            , subq_5.window_end__extract_dayofweek AS lux_listing__window_end__extract_dayofweek
+            , subq_5.window_end__extract_dayofyear AS lux_listing__window_end__extract_dayofyear
             , subq_3.listing AS listing
             , subq_3.lux_listing AS lux_listing
             , subq_3.listing__lux_listing AS listing__lux_listing
@@ -183,21 +281,49 @@ FROM (
             --    'window_start__month',
             --    'window_start__quarter',
             --    'window_start__year',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
             --    'window_end__day',
             --    'window_end__week',
             --    'window_end__month',
             --    'window_end__quarter',
             --    'window_end__year',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
             --    'lux_listing__window_start__day',
             --    'lux_listing__window_start__week',
             --    'lux_listing__window_start__month',
             --    'lux_listing__window_start__quarter',
             --    'lux_listing__window_start__year',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
             --    'lux_listing__window_end__day',
             --    'lux_listing__window_end__week',
             --    'lux_listing__window_end__month',
             --    'lux_listing__window_end__quarter',
             --    'lux_listing__window_end__year',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
             --    'lux_listing']
             SELECT
               subq_4.window_start__day
@@ -205,21 +331,49 @@ FROM (
               , subq_4.window_start__month
               , subq_4.window_start__quarter
               , subq_4.window_start__year
+              , subq_4.window_start__extract_year
+              , subq_4.window_start__extract_quarter
+              , subq_4.window_start__extract_month
+              , subq_4.window_start__extract_week
+              , subq_4.window_start__extract_day
+              , subq_4.window_start__extract_dayofweek
+              , subq_4.window_start__extract_dayofyear
               , subq_4.window_end__day
               , subq_4.window_end__week
               , subq_4.window_end__month
               , subq_4.window_end__quarter
               , subq_4.window_end__year
+              , subq_4.window_end__extract_year
+              , subq_4.window_end__extract_quarter
+              , subq_4.window_end__extract_month
+              , subq_4.window_end__extract_week
+              , subq_4.window_end__extract_day
+              , subq_4.window_end__extract_dayofweek
+              , subq_4.window_end__extract_dayofyear
               , subq_4.lux_listing__window_start__day
               , subq_4.lux_listing__window_start__week
               , subq_4.lux_listing__window_start__month
               , subq_4.lux_listing__window_start__quarter
               , subq_4.lux_listing__window_start__year
+              , subq_4.lux_listing__window_start__extract_year
+              , subq_4.lux_listing__window_start__extract_quarter
+              , subq_4.lux_listing__window_start__extract_month
+              , subq_4.lux_listing__window_start__extract_week
+              , subq_4.lux_listing__window_start__extract_day
+              , subq_4.lux_listing__window_start__extract_dayofweek
+              , subq_4.lux_listing__window_start__extract_dayofyear
               , subq_4.lux_listing__window_end__day
               , subq_4.lux_listing__window_end__week
               , subq_4.lux_listing__window_end__month
               , subq_4.lux_listing__window_end__quarter
               , subq_4.lux_listing__window_end__year
+              , subq_4.lux_listing__window_end__extract_year
+              , subq_4.lux_listing__window_end__extract_quarter
+              , subq_4.lux_listing__window_end__extract_month
+              , subq_4.lux_listing__window_end__extract_week
+              , subq_4.lux_listing__window_end__extract_day
+              , subq_4.lux_listing__window_end__extract_dayofweek
+              , subq_4.lux_listing__window_end__extract_dayofyear
               , subq_4.lux_listing
               , subq_4.is_confirmed_lux
               , subq_4.lux_listing__is_confirmed_lux
@@ -231,22 +385,50 @@ FROM (
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS window_start__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofweek
+                , EXTRACT(DOY FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofyear
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS window_end__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofweek
+                , EXTRACT(DOY FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofyear
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_from) AS lux_listing__window_start__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS lux_listing__window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS lux_listing__window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS lux_listing__window_start__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
+                , EXTRACT(DOY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS lux_listing__window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS lux_listing__window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS lux_listing__window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS lux_listing__window_end__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
+                , EXTRACT(DOY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofyear
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
@@ -261,12 +443,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.lux_listing__window_start__day
+            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_day
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.lux_listing__window_end__day
+              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_month
             ) OR (
-              subq_7.lux_listing__window_end__day IS NULL
+              subq_7.lux_listing__window_end__extract_month IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index f1b419a284..b495cc4b52 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -26,8 +26,8 @@ LEFT OUTER JOIN (
   --    'lux_listing__window_end__day',
   --    'listing']
   SELECT
-    lux_listings_src_10019.valid_from AS lux_listing__window_start__day
-    , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
+    EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+    , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
   FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_10018
@@ -41,12 +41,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.lux_listing__window_start__day
+      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_day
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.lux_listing__window_end__day
+        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_month
       ) OR (
-        subq_18.lux_listing__window_end__day IS NULL
+        subq_18.lux_listing__window_end__extract_month IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql
index ae8b7838b7..027d1adb23 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql
@@ -33,32 +33,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -85,11 +127,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -98,11 +154,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -131,11 +201,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -144,11 +228,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
index d35179ebf0..234bd823d2 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
@@ -36,21 +36,49 @@ FROM (
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.ds__day
             , subq_0.ds__week
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.account_id__ds_partitioned__day
             , subq_0.account_id__ds_partitioned__week
             , subq_0.account_id__ds_partitioned__month
             , subq_0.account_id__ds_partitioned__quarter
             , subq_0.account_id__ds_partitioned__year
+            , subq_0.account_id__ds_partitioned__extract_year
+            , subq_0.account_id__ds_partitioned__extract_quarter
+            , subq_0.account_id__ds_partitioned__extract_month
+            , subq_0.account_id__ds_partitioned__extract_week
+            , subq_0.account_id__ds_partitioned__extract_day
+            , subq_0.account_id__ds_partitioned__extract_dayofweek
+            , subq_0.account_id__ds_partitioned__extract_dayofyear
             , subq_0.account_id__ds__day
             , subq_0.account_id__ds__week
             , subq_0.account_id__ds__month
             , subq_0.account_id__ds__quarter
             , subq_0.account_id__ds__year
+            , subq_0.account_id__ds__extract_year
+            , subq_0.account_id__ds__extract_quarter
+            , subq_0.account_id__ds__extract_month
+            , subq_0.account_id__ds__extract_week
+            , subq_0.account_id__ds__extract_day
+            , subq_0.account_id__ds__extract_dayofweek
+            , subq_0.account_id__ds__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -69,22 +97,50 @@ FROM (
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS ds__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM account_month_txns_src_10010.ds) AS ds__extract_dayofyear
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS account_id__ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS account_id__ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS account_id__ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS account_id__ds__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofweek
+              , EXTRACT(DOY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofyear
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -106,16 +162,37 @@ FROM (
             , subq_3.ds_partitioned__month AS ds_partitioned__month
             , subq_3.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_3.ds_partitioned__year AS ds_partitioned__year
+            , subq_3.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_3.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_3.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_3.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_3.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_3.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_3.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_3.account_id__ds_partitioned__day AS account_id__ds_partitioned__day
             , subq_3.account_id__ds_partitioned__week AS account_id__ds_partitioned__week
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
             , subq_3.account_id__ds_partitioned__quarter AS account_id__ds_partitioned__quarter
             , subq_3.account_id__ds_partitioned__year AS account_id__ds_partitioned__year
+            , subq_3.account_id__ds_partitioned__extract_year AS account_id__ds_partitioned__extract_year
+            , subq_3.account_id__ds_partitioned__extract_quarter AS account_id__ds_partitioned__extract_quarter
+            , subq_3.account_id__ds_partitioned__extract_month AS account_id__ds_partitioned__extract_month
+            , subq_3.account_id__ds_partitioned__extract_week AS account_id__ds_partitioned__extract_week
+            , subq_3.account_id__ds_partitioned__extract_day AS account_id__ds_partitioned__extract_day
+            , subq_3.account_id__ds_partitioned__extract_dayofweek AS account_id__ds_partitioned__extract_dayofweek
+            , subq_3.account_id__ds_partitioned__extract_dayofyear AS account_id__ds_partitioned__extract_dayofyear
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
             , subq_5.ds_partitioned__quarter AS customer_id__ds_partitioned__quarter
             , subq_5.ds_partitioned__year AS customer_id__ds_partitioned__year
+            , subq_5.ds_partitioned__extract_year AS customer_id__ds_partitioned__extract_year
+            , subq_5.ds_partitioned__extract_quarter AS customer_id__ds_partitioned__extract_quarter
+            , subq_5.ds_partitioned__extract_month AS customer_id__ds_partitioned__extract_month
+            , subq_5.ds_partitioned__extract_week AS customer_id__ds_partitioned__extract_week
+            , subq_5.ds_partitioned__extract_day AS customer_id__ds_partitioned__extract_day
+            , subq_5.ds_partitioned__extract_dayofweek AS customer_id__ds_partitioned__extract_dayofweek
+            , subq_5.ds_partitioned__extract_dayofyear AS customer_id__ds_partitioned__extract_dayofyear
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
@@ -132,12 +209,26 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
+              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -154,11 +245,25 @@ FROM (
             --    'ds_partitioned__month',
             --    'ds_partitioned__quarter',
             --    'ds_partitioned__year',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
             --    'customer_id__ds_partitioned__day',
             --    'customer_id__ds_partitioned__week',
             --    'customer_id__ds_partitioned__month',
             --    'customer_id__ds_partitioned__quarter',
             --    'customer_id__ds_partitioned__year',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
             --    'customer_id']
             SELECT
               subq_4.ds_partitioned__day
@@ -166,11 +271,25 @@ FROM (
               , subq_4.ds_partitioned__month
               , subq_4.ds_partitioned__quarter
               , subq_4.ds_partitioned__year
+              , subq_4.ds_partitioned__extract_year
+              , subq_4.ds_partitioned__extract_quarter
+              , subq_4.ds_partitioned__extract_month
+              , subq_4.ds_partitioned__extract_week
+              , subq_4.ds_partitioned__extract_day
+              , subq_4.ds_partitioned__extract_dayofweek
+              , subq_4.ds_partitioned__extract_dayofyear
               , subq_4.customer_id__ds_partitioned__day
               , subq_4.customer_id__ds_partitioned__week
               , subq_4.customer_id__ds_partitioned__month
               , subq_4.customer_id__ds_partitioned__quarter
               , subq_4.customer_id__ds_partitioned__year
+              , subq_4.customer_id__ds_partitioned__extract_year
+              , subq_4.customer_id__ds_partitioned__extract_quarter
+              , subq_4.customer_id__ds_partitioned__extract_month
+              , subq_4.customer_id__ds_partitioned__extract_week
+              , subq_4.customer_id__ds_partitioned__extract_day
+              , subq_4.customer_id__ds_partitioned__extract_dayofweek
+              , subq_4.customer_id__ds_partitioned__extract_dayofyear
               , subq_4.customer_id
               , subq_4.customer_name
               , subq_4.customer_atomic_weight
@@ -186,6 +305,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -193,6 +319,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__year
+                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofweek
+                , EXTRACT(DOY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofyear
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
index 5c9089deaf..1ee70afb0b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
@@ -23,31 +23,73 @@ FROM (
           , subq_1.ds__month
           , subq_1.ds__quarter
           , subq_1.ds__year
+          , subq_1.ds__extract_year
+          , subq_1.ds__extract_quarter
+          , subq_1.ds__extract_month
+          , subq_1.ds__extract_week
+          , subq_1.ds__extract_day
+          , subq_1.ds__extract_dayofweek
+          , subq_1.ds__extract_dayofyear
           , subq_1.ds_partitioned__day
           , subq_1.ds_partitioned__week
           , subq_1.ds_partitioned__month
           , subq_1.ds_partitioned__quarter
           , subq_1.ds_partitioned__year
+          , subq_1.ds_partitioned__extract_year
+          , subq_1.ds_partitioned__extract_quarter
+          , subq_1.ds_partitioned__extract_month
+          , subq_1.ds_partitioned__extract_week
+          , subq_1.ds_partitioned__extract_day
+          , subq_1.ds_partitioned__extract_dayofweek
+          , subq_1.ds_partitioned__extract_dayofyear
           , subq_1.paid_at__day
           , subq_1.paid_at__week
           , subq_1.paid_at__month
           , subq_1.paid_at__quarter
           , subq_1.paid_at__year
+          , subq_1.paid_at__extract_year
+          , subq_1.paid_at__extract_quarter
+          , subq_1.paid_at__extract_month
+          , subq_1.paid_at__extract_week
+          , subq_1.paid_at__extract_day
+          , subq_1.paid_at__extract_dayofweek
+          , subq_1.paid_at__extract_dayofyear
           , subq_1.booking__ds__day
           , subq_1.booking__ds__week
           , subq_1.booking__ds__month
           , subq_1.booking__ds__quarter
           , subq_1.booking__ds__year
+          , subq_1.booking__ds__extract_year
+          , subq_1.booking__ds__extract_quarter
+          , subq_1.booking__ds__extract_month
+          , subq_1.booking__ds__extract_week
+          , subq_1.booking__ds__extract_day
+          , subq_1.booking__ds__extract_dayofweek
+          , subq_1.booking__ds__extract_dayofyear
           , subq_1.booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month
           , subq_1.booking__ds_partitioned__quarter
           , subq_1.booking__ds_partitioned__year
+          , subq_1.booking__ds_partitioned__extract_year
+          , subq_1.booking__ds_partitioned__extract_quarter
+          , subq_1.booking__ds_partitioned__extract_month
+          , subq_1.booking__ds_partitioned__extract_week
+          , subq_1.booking__ds_partitioned__extract_day
+          , subq_1.booking__ds_partitioned__extract_dayofweek
+          , subq_1.booking__ds_partitioned__extract_dayofyear
           , subq_1.booking__paid_at__day
           , subq_1.booking__paid_at__week
           , subq_1.booking__paid_at__month
           , subq_1.booking__paid_at__quarter
           , subq_1.booking__paid_at__year
+          , subq_1.booking__paid_at__extract_year
+          , subq_1.booking__paid_at__extract_quarter
+          , subq_1.booking__paid_at__extract_month
+          , subq_1.booking__paid_at__extract_week
+          , subq_1.booking__paid_at__extract_day
+          , subq_1.booking__paid_at__extract_dayofweek
+          , subq_1.booking__paid_at__extract_dayofyear
           , subq_1.metric_time__day
           , subq_1.metric_time__week
           , subq_1.metric_time__month
@@ -82,31 +124,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -156,32 +240,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -217,21 +343,49 @@ CROSS JOIN (
           , subq_7.ds__month
           , subq_7.ds__quarter
           , subq_7.ds__year
+          , subq_7.ds__extract_year
+          , subq_7.ds__extract_quarter
+          , subq_7.ds__extract_month
+          , subq_7.ds__extract_week
+          , subq_7.ds__extract_day
+          , subq_7.ds__extract_dayofweek
+          , subq_7.ds__extract_dayofyear
           , subq_7.created_at__day
           , subq_7.created_at__week
           , subq_7.created_at__month
           , subq_7.created_at__quarter
           , subq_7.created_at__year
+          , subq_7.created_at__extract_year
+          , subq_7.created_at__extract_quarter
+          , subq_7.created_at__extract_month
+          , subq_7.created_at__extract_week
+          , subq_7.created_at__extract_day
+          , subq_7.created_at__extract_dayofweek
+          , subq_7.created_at__extract_dayofyear
           , subq_7.listing__ds__day
           , subq_7.listing__ds__week
           , subq_7.listing__ds__month
           , subq_7.listing__ds__quarter
           , subq_7.listing__ds__year
+          , subq_7.listing__ds__extract_year
+          , subq_7.listing__ds__extract_quarter
+          , subq_7.listing__ds__extract_month
+          , subq_7.listing__ds__extract_week
+          , subq_7.listing__ds__extract_day
+          , subq_7.listing__ds__extract_dayofweek
+          , subq_7.listing__ds__extract_dayofyear
           , subq_7.listing__created_at__day
           , subq_7.listing__created_at__week
           , subq_7.listing__created_at__month
           , subq_7.listing__created_at__quarter
           , subq_7.listing__created_at__year
+          , subq_7.listing__created_at__extract_year
+          , subq_7.listing__created_at__extract_quarter
+          , subq_7.listing__created_at__extract_month
+          , subq_7.listing__created_at__extract_week
+          , subq_7.listing__created_at__extract_day
+          , subq_7.listing__created_at__extract_dayofweek
+          , subq_7.listing__created_at__extract_dayofyear
           , subq_7.metric_time__day
           , subq_7.metric_time__week
           , subq_7.metric_time__month
@@ -257,21 +411,49 @@ CROSS JOIN (
             , subq_6.ds__month
             , subq_6.ds__quarter
             , subq_6.ds__year
+            , subq_6.ds__extract_year
+            , subq_6.ds__extract_quarter
+            , subq_6.ds__extract_month
+            , subq_6.ds__extract_week
+            , subq_6.ds__extract_day
+            , subq_6.ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear
             , subq_6.created_at__day
             , subq_6.created_at__week
             , subq_6.created_at__month
             , subq_6.created_at__quarter
             , subq_6.created_at__year
+            , subq_6.created_at__extract_year
+            , subq_6.created_at__extract_quarter
+            , subq_6.created_at__extract_month
+            , subq_6.created_at__extract_week
+            , subq_6.created_at__extract_day
+            , subq_6.created_at__extract_dayofweek
+            , subq_6.created_at__extract_dayofyear
             , subq_6.listing__ds__day
             , subq_6.listing__ds__week
             , subq_6.listing__ds__month
             , subq_6.listing__ds__quarter
             , subq_6.listing__ds__year
+            , subq_6.listing__ds__extract_year
+            , subq_6.listing__ds__extract_quarter
+            , subq_6.listing__ds__extract_month
+            , subq_6.listing__ds__extract_week
+            , subq_6.listing__ds__extract_day
+            , subq_6.listing__ds__extract_dayofweek
+            , subq_6.listing__ds__extract_dayofyear
             , subq_6.listing__created_at__day
             , subq_6.listing__created_at__week
             , subq_6.listing__created_at__month
             , subq_6.listing__created_at__quarter
             , subq_6.listing__created_at__year
+            , subq_6.listing__created_at__extract_year
+            , subq_6.listing__created_at__extract_quarter
+            , subq_6.listing__created_at__extract_month
+            , subq_6.listing__created_at__extract_week
+            , subq_6.listing__created_at__extract_day
+            , subq_6.listing__created_at__extract_dayofweek
+            , subq_6.listing__created_at__extract_dayofyear
             , subq_6.ds__day AS metric_time__day
             , subq_6.ds__week AS metric_time__week
             , subq_6.ds__month AS metric_time__month
@@ -300,11 +482,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -313,11 +509,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql
index 14a9f0385a..7cc6e2d906 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql
@@ -44,31 +44,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -118,32 +160,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -182,31 +266,73 @@ FROM (
                 , subq_5.ds__month
                 , subq_5.ds__quarter
                 , subq_5.ds__year
+                , subq_5.ds__extract_year
+                , subq_5.ds__extract_quarter
+                , subq_5.ds__extract_month
+                , subq_5.ds__extract_week
+                , subq_5.ds__extract_day
+                , subq_5.ds__extract_dayofweek
+                , subq_5.ds__extract_dayofyear
                 , subq_5.ds_partitioned__day
                 , subq_5.ds_partitioned__week
                 , subq_5.ds_partitioned__month
                 , subq_5.ds_partitioned__quarter
                 , subq_5.ds_partitioned__year
+                , subq_5.ds_partitioned__extract_year
+                , subq_5.ds_partitioned__extract_quarter
+                , subq_5.ds_partitioned__extract_month
+                , subq_5.ds_partitioned__extract_week
+                , subq_5.ds_partitioned__extract_day
+                , subq_5.ds_partitioned__extract_dayofweek
+                , subq_5.ds_partitioned__extract_dayofyear
                 , subq_5.paid_at__day
                 , subq_5.paid_at__week
                 , subq_5.paid_at__month
                 , subq_5.paid_at__quarter
                 , subq_5.paid_at__year
+                , subq_5.paid_at__extract_year
+                , subq_5.paid_at__extract_quarter
+                , subq_5.paid_at__extract_month
+                , subq_5.paid_at__extract_week
+                , subq_5.paid_at__extract_day
+                , subq_5.paid_at__extract_dayofweek
+                , subq_5.paid_at__extract_dayofyear
                 , subq_5.booking__ds__day
                 , subq_5.booking__ds__week
                 , subq_5.booking__ds__month
                 , subq_5.booking__ds__quarter
                 , subq_5.booking__ds__year
+                , subq_5.booking__ds__extract_year
+                , subq_5.booking__ds__extract_quarter
+                , subq_5.booking__ds__extract_month
+                , subq_5.booking__ds__extract_week
+                , subq_5.booking__ds__extract_day
+                , subq_5.booking__ds__extract_dayofweek
+                , subq_5.booking__ds__extract_dayofyear
                 , subq_5.booking__ds_partitioned__day
                 , subq_5.booking__ds_partitioned__week
                 , subq_5.booking__ds_partitioned__month
                 , subq_5.booking__ds_partitioned__quarter
                 , subq_5.booking__ds_partitioned__year
+                , subq_5.booking__ds_partitioned__extract_year
+                , subq_5.booking__ds_partitioned__extract_quarter
+                , subq_5.booking__ds_partitioned__extract_month
+                , subq_5.booking__ds_partitioned__extract_week
+                , subq_5.booking__ds_partitioned__extract_day
+                , subq_5.booking__ds_partitioned__extract_dayofweek
+                , subq_5.booking__ds_partitioned__extract_dayofyear
                 , subq_5.booking__paid_at__day
                 , subq_5.booking__paid_at__week
                 , subq_5.booking__paid_at__month
                 , subq_5.booking__paid_at__quarter
                 , subq_5.booking__paid_at__year
+                , subq_5.booking__paid_at__extract_year
+                , subq_5.booking__paid_at__extract_quarter
+                , subq_5.booking__paid_at__extract_month
+                , subq_5.booking__paid_at__extract_week
+                , subq_5.booking__paid_at__extract_day
+                , subq_5.booking__paid_at__extract_dayofweek
+                , subq_5.booking__paid_at__extract_dayofyear
                 , subq_5.ds__day AS metric_time__day
                 , subq_5.ds__week AS metric_time__week
                 , subq_5.ds__month AS metric_time__month
@@ -256,32 +382,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -332,31 +500,73 @@ FROM (
             , subq_12.ds__month
             , subq_12.ds__quarter
             , subq_12.ds__year
+            , subq_12.ds__extract_year
+            , subq_12.ds__extract_quarter
+            , subq_12.ds__extract_month
+            , subq_12.ds__extract_week
+            , subq_12.ds__extract_day
+            , subq_12.ds__extract_dayofweek
+            , subq_12.ds__extract_dayofyear
             , subq_12.ds_partitioned__day
             , subq_12.ds_partitioned__week
             , subq_12.ds_partitioned__month
             , subq_12.ds_partitioned__quarter
             , subq_12.ds_partitioned__year
+            , subq_12.ds_partitioned__extract_year
+            , subq_12.ds_partitioned__extract_quarter
+            , subq_12.ds_partitioned__extract_month
+            , subq_12.ds_partitioned__extract_week
+            , subq_12.ds_partitioned__extract_day
+            , subq_12.ds_partitioned__extract_dayofweek
+            , subq_12.ds_partitioned__extract_dayofyear
             , subq_12.paid_at__day
             , subq_12.paid_at__week
             , subq_12.paid_at__month
             , subq_12.paid_at__quarter
             , subq_12.paid_at__year
+            , subq_12.paid_at__extract_year
+            , subq_12.paid_at__extract_quarter
+            , subq_12.paid_at__extract_month
+            , subq_12.paid_at__extract_week
+            , subq_12.paid_at__extract_day
+            , subq_12.paid_at__extract_dayofweek
+            , subq_12.paid_at__extract_dayofyear
             , subq_12.booking__ds__day
             , subq_12.booking__ds__week
             , subq_12.booking__ds__month
             , subq_12.booking__ds__quarter
             , subq_12.booking__ds__year
+            , subq_12.booking__ds__extract_year
+            , subq_12.booking__ds__extract_quarter
+            , subq_12.booking__ds__extract_month
+            , subq_12.booking__ds__extract_week
+            , subq_12.booking__ds__extract_day
+            , subq_12.booking__ds__extract_dayofweek
+            , subq_12.booking__ds__extract_dayofyear
             , subq_12.booking__ds_partitioned__day
             , subq_12.booking__ds_partitioned__week
             , subq_12.booking__ds_partitioned__month
             , subq_12.booking__ds_partitioned__quarter
             , subq_12.booking__ds_partitioned__year
+            , subq_12.booking__ds_partitioned__extract_year
+            , subq_12.booking__ds_partitioned__extract_quarter
+            , subq_12.booking__ds_partitioned__extract_month
+            , subq_12.booking__ds_partitioned__extract_week
+            , subq_12.booking__ds_partitioned__extract_day
+            , subq_12.booking__ds_partitioned__extract_dayofweek
+            , subq_12.booking__ds_partitioned__extract_dayofyear
             , subq_12.booking__paid_at__day
             , subq_12.booking__paid_at__week
             , subq_12.booking__paid_at__month
             , subq_12.booking__paid_at__quarter
             , subq_12.booking__paid_at__year
+            , subq_12.booking__paid_at__extract_year
+            , subq_12.booking__paid_at__extract_quarter
+            , subq_12.booking__paid_at__extract_month
+            , subq_12.booking__paid_at__extract_week
+            , subq_12.booking__paid_at__extract_day
+            , subq_12.booking__paid_at__extract_dayofweek
+            , subq_12.booking__paid_at__extract_dayofyear
             , subq_12.ds__day AS metric_time__day
             , subq_12.ds__week AS metric_time__week
             , subq_12.ds__month AS metric_time__month
@@ -406,32 +616,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -480,31 +732,73 @@ FROM (
             , subq_17.ds__month
             , subq_17.ds__quarter
             , subq_17.ds__year
+            , subq_17.ds__extract_year
+            , subq_17.ds__extract_quarter
+            , subq_17.ds__extract_month
+            , subq_17.ds__extract_week
+            , subq_17.ds__extract_day
+            , subq_17.ds__extract_dayofweek
+            , subq_17.ds__extract_dayofyear
             , subq_17.ds_partitioned__day
             , subq_17.ds_partitioned__week
             , subq_17.ds_partitioned__month
             , subq_17.ds_partitioned__quarter
             , subq_17.ds_partitioned__year
+            , subq_17.ds_partitioned__extract_year
+            , subq_17.ds_partitioned__extract_quarter
+            , subq_17.ds_partitioned__extract_month
+            , subq_17.ds_partitioned__extract_week
+            , subq_17.ds_partitioned__extract_day
+            , subq_17.ds_partitioned__extract_dayofweek
+            , subq_17.ds_partitioned__extract_dayofyear
             , subq_17.paid_at__day
             , subq_17.paid_at__week
             , subq_17.paid_at__month
             , subq_17.paid_at__quarter
             , subq_17.paid_at__year
+            , subq_17.paid_at__extract_year
+            , subq_17.paid_at__extract_quarter
+            , subq_17.paid_at__extract_month
+            , subq_17.paid_at__extract_week
+            , subq_17.paid_at__extract_day
+            , subq_17.paid_at__extract_dayofweek
+            , subq_17.paid_at__extract_dayofyear
             , subq_17.booking__ds__day
             , subq_17.booking__ds__week
             , subq_17.booking__ds__month
             , subq_17.booking__ds__quarter
             , subq_17.booking__ds__year
+            , subq_17.booking__ds__extract_year
+            , subq_17.booking__ds__extract_quarter
+            , subq_17.booking__ds__extract_month
+            , subq_17.booking__ds__extract_week
+            , subq_17.booking__ds__extract_day
+            , subq_17.booking__ds__extract_dayofweek
+            , subq_17.booking__ds__extract_dayofyear
             , subq_17.booking__ds_partitioned__day
             , subq_17.booking__ds_partitioned__week
             , subq_17.booking__ds_partitioned__month
             , subq_17.booking__ds_partitioned__quarter
             , subq_17.booking__ds_partitioned__year
+            , subq_17.booking__ds_partitioned__extract_year
+            , subq_17.booking__ds_partitioned__extract_quarter
+            , subq_17.booking__ds_partitioned__extract_month
+            , subq_17.booking__ds_partitioned__extract_week
+            , subq_17.booking__ds_partitioned__extract_day
+            , subq_17.booking__ds_partitioned__extract_dayofweek
+            , subq_17.booking__ds_partitioned__extract_dayofyear
             , subq_17.booking__paid_at__day
             , subq_17.booking__paid_at__week
             , subq_17.booking__paid_at__month
             , subq_17.booking__paid_at__quarter
             , subq_17.booking__paid_at__year
+            , subq_17.booking__paid_at__extract_year
+            , subq_17.booking__paid_at__extract_quarter
+            , subq_17.booking__paid_at__extract_month
+            , subq_17.booking__paid_at__extract_week
+            , subq_17.booking__paid_at__extract_day
+            , subq_17.booking__paid_at__extract_dayofweek
+            , subq_17.booking__paid_at__extract_dayofyear
             , subq_17.ds__day AS metric_time__day
             , subq_17.ds__week AS metric_time__week
             , subq_17.ds__month AS metric_time__month
@@ -554,32 +848,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql
index be96decab5..3ada9bf35a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql
@@ -45,32 +45,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql
index a5288e7009..e7c3deecdb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql
@@ -36,21 +36,49 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.verification__ds__day
             , subq_0.verification__ds__week
             , subq_0.verification__ds__month
             , subq_0.verification__ds__quarter
             , subq_0.verification__ds__year
+            , subq_0.verification__ds__extract_year
+            , subq_0.verification__ds__extract_quarter
+            , subq_0.verification__ds__extract_month
+            , subq_0.verification__ds__extract_week
+            , subq_0.verification__ds__extract_day
+            , subq_0.verification__ds__extract_dayofweek
+            , subq_0.verification__ds__extract_dayofyear
             , subq_0.verification__ds_partitioned__day
             , subq_0.verification__ds_partitioned__week
             , subq_0.verification__ds_partitioned__month
             , subq_0.verification__ds_partitioned__quarter
             , subq_0.verification__ds_partitioned__year
+            , subq_0.verification__ds_partitioned__extract_year
+            , subq_0.verification__ds_partitioned__extract_quarter
+            , subq_0.verification__ds_partitioned__extract_month
+            , subq_0.verification__ds_partitioned__extract_week
+            , subq_0.verification__ds_partitioned__extract_day
+            , subq_0.verification__ds_partitioned__extract_dayofweek
+            , subq_0.verification__ds_partitioned__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -71,22 +99,50 @@ FROM (
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
+              , EXTRACT(DOY FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
+              , EXTRACT(DOY FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
+              , EXTRACT(DOY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -110,32 +166,74 @@ FROM (
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS ds__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dayofweek
+            , EXTRACT(DOY FROM users_ds_source_src_10007.ds) AS ds__extract_dayofyear
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS created_at__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofweek
+            , EXTRACT(DOY FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofyear
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds) AS user__ds__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS user__ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS user__ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS user__ds__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofweek
+            , EXTRACT(DOY FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofyear
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS user__created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS user__created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS user__created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS user__created_at__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofweek
+            , EXTRACT(DOY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofyear
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofyear
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql
index c65a58a300..f26bd34521 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -54,12 +82,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql
index 603dac8609..0e5972d3ea 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DOY FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DOY FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql
index adfa1c3f03..fa1d4a6720 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -55,12 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index 48a1b43de5..3c78b2147d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DOY FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DOY FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 08a913aa57..3dcd0390ef 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -55,12 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index ed796b148d..e722f24125 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DOY FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DOY FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql
index 782ccc2826..e2cc098fae 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql
@@ -31,32 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -83,11 +125,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -96,11 +152,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql
index 0f449eb59e..e337bd9061 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql
@@ -20,32 +20,74 @@ SELECT
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql
index ee19129508..82a5abe48e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql
@@ -20,32 +20,74 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DOY FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DOY FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DOY FROM paid_at) AS paid_at__extract_dayofyear
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DOY FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DOY FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DOY FROM paid_at) AS booking__paid_at__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
index 214766cb17..073c7964da 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -165,31 +249,73 @@ FULL OUTER JOIN (
           , subq_5.ds__month
           , subq_5.ds__quarter
           , subq_5.ds__year
+          , subq_5.ds__extract_year
+          , subq_5.ds__extract_quarter
+          , subq_5.ds__extract_month
+          , subq_5.ds__extract_week
+          , subq_5.ds__extract_day
+          , subq_5.ds__extract_dayofweek
+          , subq_5.ds__extract_dayofyear
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
           , subq_5.ds_partitioned__quarter
           , subq_5.ds_partitioned__year
+          , subq_5.ds_partitioned__extract_year
+          , subq_5.ds_partitioned__extract_quarter
+          , subq_5.ds_partitioned__extract_month
+          , subq_5.ds_partitioned__extract_week
+          , subq_5.ds_partitioned__extract_day
+          , subq_5.ds_partitioned__extract_dayofweek
+          , subq_5.ds_partitioned__extract_dayofyear
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
           , subq_5.paid_at__quarter
           , subq_5.paid_at__year
+          , subq_5.paid_at__extract_year
+          , subq_5.paid_at__extract_quarter
+          , subq_5.paid_at__extract_month
+          , subq_5.paid_at__extract_week
+          , subq_5.paid_at__extract_day
+          , subq_5.paid_at__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
           , subq_5.booking__ds__quarter
           , subq_5.booking__ds__year
+          , subq_5.booking__ds__extract_year
+          , subq_5.booking__ds__extract_quarter
+          , subq_5.booking__ds__extract_month
+          , subq_5.booking__ds__extract_week
+          , subq_5.booking__ds__extract_day
+          , subq_5.booking__ds__extract_dayofweek
+          , subq_5.booking__ds__extract_dayofyear
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
           , subq_5.booking__ds_partitioned__quarter
           , subq_5.booking__ds_partitioned__year
+          , subq_5.booking__ds_partitioned__extract_year
+          , subq_5.booking__ds_partitioned__extract_quarter
+          , subq_5.booking__ds_partitioned__extract_month
+          , subq_5.booking__ds_partitioned__extract_week
+          , subq_5.booking__ds_partitioned__extract_day
+          , subq_5.booking__ds_partitioned__extract_dayofweek
+          , subq_5.booking__ds_partitioned__extract_dayofyear
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
           , subq_5.booking__paid_at__quarter
           , subq_5.booking__paid_at__year
+          , subq_5.booking__paid_at__extract_year
+          , subq_5.booking__paid_at__extract_quarter
+          , subq_5.booking__paid_at__extract_month
+          , subq_5.booking__paid_at__extract_week
+          , subq_5.booking__paid_at__extract_day
+          , subq_5.booking__paid_at__extract_dayofweek
+          , subq_5.booking__paid_at__extract_dayofyear
           , subq_5.ds__day AS metric_time__day
           , subq_5.ds__week AS metric_time__week
           , subq_5.ds__month AS metric_time__month
@@ -239,32 +365,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql
index 63637a9433..c80b16baf0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql
@@ -44,32 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -96,11 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -109,11 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 9c4d91d069..d5d52443ea 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -51,31 +51,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -125,32 +167,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -175,21 +259,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -218,11 +330,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -231,11 +357,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -296,21 +436,49 @@ FROM (
                 , subq_10.ds__month
                 , subq_10.ds__quarter
                 , subq_10.ds__year
+                , subq_10.ds__extract_year
+                , subq_10.ds__extract_quarter
+                , subq_10.ds__extract_month
+                , subq_10.ds__extract_week
+                , subq_10.ds__extract_day
+                , subq_10.ds__extract_dayofweek
+                , subq_10.ds__extract_dayofyear
                 , subq_10.ds_partitioned__day
                 , subq_10.ds_partitioned__week
                 , subq_10.ds_partitioned__month
                 , subq_10.ds_partitioned__quarter
                 , subq_10.ds_partitioned__year
+                , subq_10.ds_partitioned__extract_year
+                , subq_10.ds_partitioned__extract_quarter
+                , subq_10.ds_partitioned__extract_month
+                , subq_10.ds_partitioned__extract_week
+                , subq_10.ds_partitioned__extract_day
+                , subq_10.ds_partitioned__extract_dayofweek
+                , subq_10.ds_partitioned__extract_dayofyear
                 , subq_10.view__ds__day
                 , subq_10.view__ds__week
                 , subq_10.view__ds__month
                 , subq_10.view__ds__quarter
                 , subq_10.view__ds__year
+                , subq_10.view__ds__extract_year
+                , subq_10.view__ds__extract_quarter
+                , subq_10.view__ds__extract_month
+                , subq_10.view__ds__extract_week
+                , subq_10.view__ds__extract_day
+                , subq_10.view__ds__extract_dayofweek
+                , subq_10.view__ds__extract_dayofyear
                 , subq_10.view__ds_partitioned__day
                 , subq_10.view__ds_partitioned__week
                 , subq_10.view__ds_partitioned__month
                 , subq_10.view__ds_partitioned__quarter
                 , subq_10.view__ds_partitioned__year
+                , subq_10.view__ds_partitioned__extract_year
+                , subq_10.view__ds_partitioned__extract_quarter
+                , subq_10.view__ds_partitioned__extract_month
+                , subq_10.view__ds_partitioned__extract_week
+                , subq_10.view__ds_partitioned__extract_day
+                , subq_10.view__ds_partitioned__extract_dayofweek
+                , subq_10.view__ds_partitioned__extract_dayofyear
                 , subq_10.ds__day AS metric_time__day
                 , subq_10.ds__week AS metric_time__week
                 , subq_10.ds__month AS metric_time__month
@@ -330,21 +498,49 @@ FROM (
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS ds__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_dayofyear
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC('week', views_source_src_10009.ds) AS view__ds__week
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS view__ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS view__ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS view__ds__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS view__ds__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS view__ds__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS view__ds__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS view__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_dayofyear
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofyear
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -367,21 +563,49 @@ FROM (
                 , subq_13.ds__month
                 , subq_13.ds__quarter
                 , subq_13.ds__year
+                , subq_13.ds__extract_year
+                , subq_13.ds__extract_quarter
+                , subq_13.ds__extract_month
+                , subq_13.ds__extract_week
+                , subq_13.ds__extract_day
+                , subq_13.ds__extract_dayofweek
+                , subq_13.ds__extract_dayofyear
                 , subq_13.created_at__day
                 , subq_13.created_at__week
                 , subq_13.created_at__month
                 , subq_13.created_at__quarter
                 , subq_13.created_at__year
+                , subq_13.created_at__extract_year
+                , subq_13.created_at__extract_quarter
+                , subq_13.created_at__extract_month
+                , subq_13.created_at__extract_week
+                , subq_13.created_at__extract_day
+                , subq_13.created_at__extract_dayofweek
+                , subq_13.created_at__extract_dayofyear
                 , subq_13.listing__ds__day
                 , subq_13.listing__ds__week
                 , subq_13.listing__ds__month
                 , subq_13.listing__ds__quarter
                 , subq_13.listing__ds__year
+                , subq_13.listing__ds__extract_year
+                , subq_13.listing__ds__extract_quarter
+                , subq_13.listing__ds__extract_month
+                , subq_13.listing__ds__extract_week
+                , subq_13.listing__ds__extract_day
+                , subq_13.listing__ds__extract_dayofweek
+                , subq_13.listing__ds__extract_dayofyear
                 , subq_13.listing__created_at__day
                 , subq_13.listing__created_at__week
                 , subq_13.listing__created_at__month
                 , subq_13.listing__created_at__quarter
                 , subq_13.listing__created_at__year
+                , subq_13.listing__created_at__extract_year
+                , subq_13.listing__created_at__extract_quarter
+                , subq_13.listing__created_at__extract_month
+                , subq_13.listing__created_at__extract_week
+                , subq_13.listing__created_at__extract_day
+                , subq_13.listing__created_at__extract_dayofweek
+                , subq_13.listing__created_at__extract_dayofyear
                 , subq_13.ds__day AS metric_time__day
                 , subq_13.ds__week AS metric_time__week
                 , subq_13.ds__month AS metric_time__month
@@ -410,11 +634,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -423,11 +661,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index dd55a54b61..a56183e745 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -47,32 +47,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -99,11 +141,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -112,11 +168,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
index 48583b238a..b6f01861d7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
@@ -44,32 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -96,11 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -109,11 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql
index 4ca35f2544..d480357663 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql
@@ -38,32 +38,74 @@ FROM (
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
index b515ad2da5..f52c8d6acf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
index 5eb893b84a..4e79154b70 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
index 2393630095..f44071348d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
@@ -18,11 +18,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -40,11 +54,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
index 9ced88e0cc..4c321e73b0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index dd00d2b15e..4821d797fe 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_1.ds__month
         , subq_1.ds__quarter
         , subq_1.ds__year
+        , subq_1.ds__extract_year
+        , subq_1.ds__extract_quarter
+        , subq_1.ds__extract_month
+        , subq_1.ds__extract_week
+        , subq_1.ds__extract_day
+        , subq_1.ds__extract_dayofweek
+        , subq_1.ds__extract_dayofyear
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
         , subq_1.company__ds__quarter
         , subq_1.company__ds__year
+        , subq_1.company__ds__extract_year
+        , subq_1.company__ds__extract_quarter
+        , subq_1.company__ds__extract_month
+        , subq_1.company__ds__extract_week
+        , subq_1.company__ds__extract_day
+        , subq_1.company__ds__extract_dayofweek
+        , subq_1.company__ds__extract_dayofyear
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -42,11 +56,25 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
           , subq_0.company__ds__quarter
           , subq_0.company__ds__year
+          , subq_0.company__ds__extract_year
+          , subq_0.company__ds__extract_quarter
+          , subq_0.company__ds__extract_month
+          , subq_0.company__ds__extract_week
+          , subq_0.company__ds__extract_day
+          , subq_0.company__ds__extract_dayofweek
+          , subq_0.company__ds__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
index 658dcf3357..2a39c9282f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_1.ds__month
         , subq_1.ds__quarter
         , subq_1.ds__year
+        , subq_1.ds__extract_year
+        , subq_1.ds__extract_quarter
+        , subq_1.ds__extract_month
+        , subq_1.ds__extract_week
+        , subq_1.ds__extract_day
+        , subq_1.ds__extract_dayofweek
+        , subq_1.ds__extract_dayofyear
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
         , subq_1.company__ds__quarter
         , subq_1.company__ds__year
+        , subq_1.company__ds__extract_year
+        , subq_1.company__ds__extract_quarter
+        , subq_1.company__ds__extract_month
+        , subq_1.company__ds__extract_week
+        , subq_1.company__ds__extract_day
+        , subq_1.company__ds__extract_dayofweek
+        , subq_1.company__ds__extract_dayofyear
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -42,11 +56,25 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
           , subq_0.company__ds__quarter
           , subq_0.company__ds__year
+          , subq_0.company__ds__extract_year
+          , subq_0.company__ds__extract_quarter
+          , subq_0.company__ds__extract_month
+          , subq_0.company__ds__extract_week
+          , subq_0.company__ds__extract_day
+          , subq_0.company__ds__extract_dayofweek
+          , subq_0.company__ds__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
index 9bafb5e1f6..82ded0a878 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -170,31 +254,73 @@ FROM (
             , subq_5.ds__month
             , subq_5.ds__quarter
             , subq_5.ds__year
+            , subq_5.ds__extract_year
+            , subq_5.ds__extract_quarter
+            , subq_5.ds__extract_month
+            , subq_5.ds__extract_week
+            , subq_5.ds__extract_day
+            , subq_5.ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear
             , subq_5.ds_partitioned__day
             , subq_5.ds_partitioned__week
             , subq_5.ds_partitioned__month
             , subq_5.ds_partitioned__quarter
             , subq_5.ds_partitioned__year
+            , subq_5.ds_partitioned__extract_year
+            , subq_5.ds_partitioned__extract_quarter
+            , subq_5.ds_partitioned__extract_month
+            , subq_5.ds_partitioned__extract_week
+            , subq_5.ds_partitioned__extract_day
+            , subq_5.ds_partitioned__extract_dayofweek
+            , subq_5.ds_partitioned__extract_dayofyear
             , subq_5.paid_at__day
             , subq_5.paid_at__week
             , subq_5.paid_at__month
             , subq_5.paid_at__quarter
             , subq_5.paid_at__year
+            , subq_5.paid_at__extract_year
+            , subq_5.paid_at__extract_quarter
+            , subq_5.paid_at__extract_month
+            , subq_5.paid_at__extract_week
+            , subq_5.paid_at__extract_day
+            , subq_5.paid_at__extract_dayofweek
+            , subq_5.paid_at__extract_dayofyear
             , subq_5.booking__ds__day
             , subq_5.booking__ds__week
             , subq_5.booking__ds__month
             , subq_5.booking__ds__quarter
             , subq_5.booking__ds__year
+            , subq_5.booking__ds__extract_year
+            , subq_5.booking__ds__extract_quarter
+            , subq_5.booking__ds__extract_month
+            , subq_5.booking__ds__extract_week
+            , subq_5.booking__ds__extract_day
+            , subq_5.booking__ds__extract_dayofweek
+            , subq_5.booking__ds__extract_dayofyear
             , subq_5.booking__ds_partitioned__day
             , subq_5.booking__ds_partitioned__week
             , subq_5.booking__ds_partitioned__month
             , subq_5.booking__ds_partitioned__quarter
             , subq_5.booking__ds_partitioned__year
+            , subq_5.booking__ds_partitioned__extract_year
+            , subq_5.booking__ds_partitioned__extract_quarter
+            , subq_5.booking__ds_partitioned__extract_month
+            , subq_5.booking__ds_partitioned__extract_week
+            , subq_5.booking__ds_partitioned__extract_day
+            , subq_5.booking__ds_partitioned__extract_dayofweek
+            , subq_5.booking__ds_partitioned__extract_dayofyear
             , subq_5.booking__paid_at__day
             , subq_5.booking__paid_at__week
             , subq_5.booking__paid_at__month
             , subq_5.booking__paid_at__quarter
             , subq_5.booking__paid_at__year
+            , subq_5.booking__paid_at__extract_year
+            , subq_5.booking__paid_at__extract_quarter
+            , subq_5.booking__paid_at__extract_month
+            , subq_5.booking__paid_at__extract_week
+            , subq_5.booking__paid_at__extract_day
+            , subq_5.booking__paid_at__extract_dayofweek
+            , subq_5.booking__paid_at__extract_dayofyear
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -244,32 +370,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
index edbbe545fd..f21c6e33a7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index c97b8fd930..34b929887f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
index bbc8999a91..de24654075 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index f9871f024a..3da362bd96 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 5906b2b836..001633ef6d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -33,31 +33,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -93,31 +135,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -167,32 +251,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -235,31 +361,73 @@ FROM (
             , subq_9.ds__month AS ds__month
             , subq_9.ds__quarter AS ds__quarter
             , subq_9.ds__year AS ds__year
+            , subq_9.ds__extract_year AS ds__extract_year
+            , subq_9.ds__extract_quarter AS ds__extract_quarter
+            , subq_9.ds__extract_month AS ds__extract_month
+            , subq_9.ds__extract_week AS ds__extract_week
+            , subq_9.ds__extract_day AS ds__extract_day
+            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
             , subq_9.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_9.ds_partitioned__year AS ds_partitioned__year
+            , subq_9.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_9.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
             , subq_9.paid_at__quarter AS paid_at__quarter
             , subq_9.paid_at__year AS paid_at__year
+            , subq_9.paid_at__extract_year AS paid_at__extract_year
+            , subq_9.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_9.paid_at__extract_month AS paid_at__extract_month
+            , subq_9.paid_at__extract_week AS paid_at__extract_week
+            , subq_9.paid_at__extract_day AS paid_at__extract_day
+            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
             , subq_9.booking__ds__quarter AS booking__ds__quarter
             , subq_9.booking__ds__year AS booking__ds__year
+            , subq_9.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_9.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_9.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_9.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_9.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_9.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_9.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_9.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_9.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
             , subq_9.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_9.booking__paid_at__year AS booking__paid_at__year
+            , subq_9.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_9.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -295,31 +463,73 @@ FROM (
               , subq_8.ds__month
               , subq_8.ds__quarter
               , subq_8.ds__year
+              , subq_8.ds__extract_year
+              , subq_8.ds__extract_quarter
+              , subq_8.ds__extract_month
+              , subq_8.ds__extract_week
+              , subq_8.ds__extract_day
+              , subq_8.ds__extract_dayofweek
+              , subq_8.ds__extract_dayofyear
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
               , subq_8.ds_partitioned__quarter
               , subq_8.ds_partitioned__year
+              , subq_8.ds_partitioned__extract_year
+              , subq_8.ds_partitioned__extract_quarter
+              , subq_8.ds_partitioned__extract_month
+              , subq_8.ds_partitioned__extract_week
+              , subq_8.ds_partitioned__extract_day
+              , subq_8.ds_partitioned__extract_dayofweek
+              , subq_8.ds_partitioned__extract_dayofyear
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
               , subq_8.paid_at__quarter
               , subq_8.paid_at__year
+              , subq_8.paid_at__extract_year
+              , subq_8.paid_at__extract_quarter
+              , subq_8.paid_at__extract_month
+              , subq_8.paid_at__extract_week
+              , subq_8.paid_at__extract_day
+              , subq_8.paid_at__extract_dayofweek
+              , subq_8.paid_at__extract_dayofyear
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
               , subq_8.booking__ds__quarter
               , subq_8.booking__ds__year
+              , subq_8.booking__ds__extract_year
+              , subq_8.booking__ds__extract_quarter
+              , subq_8.booking__ds__extract_month
+              , subq_8.booking__ds__extract_week
+              , subq_8.booking__ds__extract_day
+              , subq_8.booking__ds__extract_dayofweek
+              , subq_8.booking__ds__extract_dayofyear
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
               , subq_8.booking__ds_partitioned__quarter
               , subq_8.booking__ds_partitioned__year
+              , subq_8.booking__ds_partitioned__extract_year
+              , subq_8.booking__ds_partitioned__extract_quarter
+              , subq_8.booking__ds_partitioned__extract_month
+              , subq_8.booking__ds_partitioned__extract_week
+              , subq_8.booking__ds_partitioned__extract_day
+              , subq_8.booking__ds_partitioned__extract_dayofweek
+              , subq_8.booking__ds_partitioned__extract_dayofyear
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
               , subq_8.booking__paid_at__quarter
               , subq_8.booking__paid_at__year
+              , subq_8.booking__paid_at__extract_year
+              , subq_8.booking__paid_at__extract_quarter
+              , subq_8.booking__paid_at__extract_month
+              , subq_8.booking__paid_at__extract_week
+              , subq_8.booking__paid_at__extract_day
+              , subq_8.booking__paid_at__extract_dayofweek
+              , subq_8.booking__paid_at__extract_dayofyear
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -369,32 +579,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index f8f4db398a..0d2a73ccaa 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -33,31 +33,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -93,31 +135,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -167,32 +251,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -236,31 +362,73 @@ FROM (
             , subq_9.ds__month AS ds__month
             , subq_9.ds__quarter AS ds__quarter
             , subq_9.ds__year AS ds__year
+            , subq_9.ds__extract_year AS ds__extract_year
+            , subq_9.ds__extract_quarter AS ds__extract_quarter
+            , subq_9.ds__extract_month AS ds__extract_month
+            , subq_9.ds__extract_week AS ds__extract_week
+            , subq_9.ds__extract_day AS ds__extract_day
+            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
             , subq_9.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_9.ds_partitioned__year AS ds_partitioned__year
+            , subq_9.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_9.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
             , subq_9.paid_at__quarter AS paid_at__quarter
             , subq_9.paid_at__year AS paid_at__year
+            , subq_9.paid_at__extract_year AS paid_at__extract_year
+            , subq_9.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_9.paid_at__extract_month AS paid_at__extract_month
+            , subq_9.paid_at__extract_week AS paid_at__extract_week
+            , subq_9.paid_at__extract_day AS paid_at__extract_day
+            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
             , subq_9.booking__ds__quarter AS booking__ds__quarter
             , subq_9.booking__ds__year AS booking__ds__year
+            , subq_9.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_9.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_9.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_9.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_9.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_9.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_9.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_9.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_9.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
             , subq_9.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_9.booking__paid_at__year AS booking__paid_at__year
+            , subq_9.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_9.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -296,31 +464,73 @@ FROM (
               , subq_8.ds__month
               , subq_8.ds__quarter
               , subq_8.ds__year
+              , subq_8.ds__extract_year
+              , subq_8.ds__extract_quarter
+              , subq_8.ds__extract_month
+              , subq_8.ds__extract_week
+              , subq_8.ds__extract_day
+              , subq_8.ds__extract_dayofweek
+              , subq_8.ds__extract_dayofyear
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
               , subq_8.ds_partitioned__quarter
               , subq_8.ds_partitioned__year
+              , subq_8.ds_partitioned__extract_year
+              , subq_8.ds_partitioned__extract_quarter
+              , subq_8.ds_partitioned__extract_month
+              , subq_8.ds_partitioned__extract_week
+              , subq_8.ds_partitioned__extract_day
+              , subq_8.ds_partitioned__extract_dayofweek
+              , subq_8.ds_partitioned__extract_dayofyear
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
               , subq_8.paid_at__quarter
               , subq_8.paid_at__year
+              , subq_8.paid_at__extract_year
+              , subq_8.paid_at__extract_quarter
+              , subq_8.paid_at__extract_month
+              , subq_8.paid_at__extract_week
+              , subq_8.paid_at__extract_day
+              , subq_8.paid_at__extract_dayofweek
+              , subq_8.paid_at__extract_dayofyear
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
               , subq_8.booking__ds__quarter
               , subq_8.booking__ds__year
+              , subq_8.booking__ds__extract_year
+              , subq_8.booking__ds__extract_quarter
+              , subq_8.booking__ds__extract_month
+              , subq_8.booking__ds__extract_week
+              , subq_8.booking__ds__extract_day
+              , subq_8.booking__ds__extract_dayofweek
+              , subq_8.booking__ds__extract_dayofyear
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
               , subq_8.booking__ds_partitioned__quarter
               , subq_8.booking__ds_partitioned__year
+              , subq_8.booking__ds_partitioned__extract_year
+              , subq_8.booking__ds_partitioned__extract_quarter
+              , subq_8.booking__ds_partitioned__extract_month
+              , subq_8.booking__ds_partitioned__extract_week
+              , subq_8.booking__ds_partitioned__extract_day
+              , subq_8.booking__ds_partitioned__extract_dayofweek
+              , subq_8.booking__ds_partitioned__extract_dayofyear
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
               , subq_8.booking__paid_at__quarter
               , subq_8.booking__paid_at__year
+              , subq_8.booking__paid_at__extract_year
+              , subq_8.booking__paid_at__extract_quarter
+              , subq_8.booking__paid_at__extract_month
+              , subq_8.booking__paid_at__extract_week
+              , subq_8.booking__paid_at__extract_day
+              , subq_8.booking__paid_at__extract_dayofweek
+              , subq_8.booking__paid_at__extract_dayofyear
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -370,32 +580,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
index b0135c14b3..11133f2d42 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_4.ds__month AS ds__month
           , subq_4.ds__quarter AS ds__quarter
           , subq_4.ds__year AS ds__year
+          , subq_4.ds__extract_year AS ds__extract_year
+          , subq_4.ds__extract_quarter AS ds__extract_quarter
+          , subq_4.ds__extract_month AS ds__extract_month
+          , subq_4.ds__extract_week AS ds__extract_week
+          , subq_4.ds__extract_day AS ds__extract_day
+          , subq_4.ds__extract_dayofweek AS ds__extract_dayofweek
+          , subq_4.ds__extract_dayofyear AS ds__extract_dayofyear
           , subq_4.ds_partitioned__day AS ds_partitioned__day
           , subq_4.ds_partitioned__week AS ds_partitioned__week
           , subq_4.ds_partitioned__month AS ds_partitioned__month
           , subq_4.ds_partitioned__quarter AS ds_partitioned__quarter
           , subq_4.ds_partitioned__year AS ds_partitioned__year
+          , subq_4.ds_partitioned__extract_year AS ds_partitioned__extract_year
+          , subq_4.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+          , subq_4.ds_partitioned__extract_month AS ds_partitioned__extract_month
+          , subq_4.ds_partitioned__extract_week AS ds_partitioned__extract_week
+          , subq_4.ds_partitioned__extract_day AS ds_partitioned__extract_day
+          , subq_4.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+          , subq_4.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
           , subq_4.paid_at__day AS paid_at__day
           , subq_4.paid_at__week AS paid_at__week
           , subq_4.paid_at__month AS paid_at__month
           , subq_4.paid_at__quarter AS paid_at__quarter
           , subq_4.paid_at__year AS paid_at__year
+          , subq_4.paid_at__extract_year AS paid_at__extract_year
+          , subq_4.paid_at__extract_quarter AS paid_at__extract_quarter
+          , subq_4.paid_at__extract_month AS paid_at__extract_month
+          , subq_4.paid_at__extract_week AS paid_at__extract_week
+          , subq_4.paid_at__extract_day AS paid_at__extract_day
+          , subq_4.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+          , subq_4.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
           , subq_4.booking__ds__day AS booking__ds__day
           , subq_4.booking__ds__week AS booking__ds__week
           , subq_4.booking__ds__month AS booking__ds__month
           , subq_4.booking__ds__quarter AS booking__ds__quarter
           , subq_4.booking__ds__year AS booking__ds__year
+          , subq_4.booking__ds__extract_year AS booking__ds__extract_year
+          , subq_4.booking__ds__extract_quarter AS booking__ds__extract_quarter
+          , subq_4.booking__ds__extract_month AS booking__ds__extract_month
+          , subq_4.booking__ds__extract_week AS booking__ds__extract_week
+          , subq_4.booking__ds__extract_day AS booking__ds__extract_day
+          , subq_4.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+          , subq_4.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
           , subq_4.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_4.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_4.booking__ds_partitioned__month AS booking__ds_partitioned__month
           , subq_4.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
           , subq_4.booking__ds_partitioned__year AS booking__ds_partitioned__year
+          , subq_4.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+          , subq_4.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+          , subq_4.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+          , subq_4.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+          , subq_4.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+          , subq_4.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+          , subq_4.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
           , subq_4.booking__paid_at__day AS booking__paid_at__day
           , subq_4.booking__paid_at__week AS booking__paid_at__week
           , subq_4.booking__paid_at__month AS booking__paid_at__month
           , subq_4.booking__paid_at__quarter AS booking__paid_at__quarter
           , subq_4.booking__paid_at__year AS booking__paid_at__year
+          , subq_4.booking__paid_at__extract_year AS booking__paid_at__extract_year
+          , subq_4.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+          , subq_4.booking__paid_at__extract_month AS booking__paid_at__extract_month
+          , subq_4.booking__paid_at__extract_week AS booking__paid_at__extract_week
+          , subq_4.booking__paid_at__extract_day AS booking__paid_at__extract_day
+          , subq_4.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+          , subq_4.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
           , subq_4.listing AS listing
           , subq_4.guest AS guest
           , subq_4.host AS host
@@ -88,31 +130,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.metric_time__week AS metric_time__week
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
@@ -152,31 +236,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -226,32 +352,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
index f9062ca85f..467707f734 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_1.ds__month AS ds__month
           , subq_1.ds__quarter AS ds__quarter
           , subq_1.ds__year AS ds__year
+          , subq_1.ds__extract_year AS ds__extract_year
+          , subq_1.ds__extract_quarter AS ds__extract_quarter
+          , subq_1.ds__extract_month AS ds__extract_month
+          , subq_1.ds__extract_week AS ds__extract_week
+          , subq_1.ds__extract_day AS ds__extract_day
+          , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+          , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
           , subq_1.ds_partitioned__day AS ds_partitioned__day
           , subq_1.ds_partitioned__week AS ds_partitioned__week
           , subq_1.ds_partitioned__month AS ds_partitioned__month
           , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
           , subq_1.ds_partitioned__year AS ds_partitioned__year
+          , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+          , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+          , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+          , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+          , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+          , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+          , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
           , subq_1.paid_at__day AS paid_at__day
           , subq_1.paid_at__week AS paid_at__week
           , subq_1.paid_at__month AS paid_at__month
           , subq_1.paid_at__quarter AS paid_at__quarter
           , subq_1.paid_at__year AS paid_at__year
+          , subq_1.paid_at__extract_year AS paid_at__extract_year
+          , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+          , subq_1.paid_at__extract_month AS paid_at__extract_month
+          , subq_1.paid_at__extract_week AS paid_at__extract_week
+          , subq_1.paid_at__extract_day AS paid_at__extract_day
+          , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+          , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
           , subq_1.booking__ds__day AS booking__ds__day
           , subq_1.booking__ds__week AS booking__ds__week
           , subq_1.booking__ds__month AS booking__ds__month
           , subq_1.booking__ds__quarter AS booking__ds__quarter
           , subq_1.booking__ds__year AS booking__ds__year
+          , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+          , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+          , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+          , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+          , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+          , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+          , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
           , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
           , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
           , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+          , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+          , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+          , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+          , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+          , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+          , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+          , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
           , subq_1.booking__paid_at__day AS booking__paid_at__day
           , subq_1.booking__paid_at__week AS booking__paid_at__week
           , subq_1.booking__paid_at__month AS booking__paid_at__month
           , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
           , subq_1.booking__paid_at__year AS booking__paid_at__year
+          , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+          , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+          , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+          , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+          , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+          , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+          , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
           , subq_1.listing AS listing
           , subq_1.guest AS guest
           , subq_1.host AS host
@@ -87,31 +129,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -161,32 +245,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
index 870b2c80ea..3adff18e62 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
@@ -42,31 +42,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -116,32 +158,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -166,21 +250,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -209,11 +321,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -222,11 +348,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql
index ddba65921c..00efad0383 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql
@@ -25,32 +25,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
index 7ce1a71c7f..7e0fdff19e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
@@ -31,32 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 81e6d39ada..eb70f04221 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -48,31 +48,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -122,32 +164,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -172,21 +256,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -215,11 +327,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -228,11 +354,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
index 4caa3d07f0..a1b2d01a0f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
@@ -30,8 +30,8 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__day AS listing__window_start__day
-            , subq_4.window_end__day AS listing__window_end__day
+            , subq_4.window_start__extract_month AS listing__window_start__extract_month
+            , subq_4.window_end__extract_quarter AS listing__window_end__extract_quarter
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -50,31 +50,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -110,32 +152,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -152,8 +236,8 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__day
-              , subq_3.window_end__day
+              subq_3.window_start__extract_month
+              , subq_3.window_end__extract_quarter
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -164,11 +248,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -177,11 +275,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
@@ -196,12 +308,12 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__day
+                subq_2.metric_time__day >= subq_4.window_start__extract_month
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__day
+                  subq_2.metric_time__day < subq_4.window_end__extract_quarter
                 ) OR (
-                  subq_4.window_end__day IS NULL
+                  subq_4.window_end__extract_quarter IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
index 86a2010b35..28a4fe2ec0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,12 +32,12 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= listings_src_10017.active_from
+        subq_12.metric_time__day >= EXTRACT(MONTH FROM listings_src_10017.active_from)
       ) AND (
         (
-          subq_12.metric_time__day < listings_src_10017.active_to
+          subq_12.metric_time__day < EXTRACT(QUARTER FROM listings_src_10017.active_to)
         ) OR (
-          listings_src_10017.active_to IS NULL
+          EXTRACT(QUARTER FROM listings_src_10017.active_to) IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 6ed1bd4e99..6ef8853985 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 0834ca012d..18e509dd5c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
index 027f20ea5b..16e8afe8d0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
index 913fed793c..b00d690648 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
@@ -26,31 +26,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
index 86b30c4553..583b4a4bf0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
@@ -21,21 +21,49 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.created_at__day
         , subq_0.created_at__week
         , subq_0.created_at__month
         , subq_0.created_at__quarter
         , subq_0.created_at__year
+        , subq_0.created_at__extract_year
+        , subq_0.created_at__extract_quarter
+        , subq_0.created_at__extract_month
+        , subq_0.created_at__extract_week
+        , subq_0.created_at__extract_day
+        , subq_0.created_at__extract_dayofweek
+        , subq_0.created_at__extract_dayofyear
         , subq_0.listing__ds__day
         , subq_0.listing__ds__week
         , subq_0.listing__ds__month
         , subq_0.listing__ds__quarter
         , subq_0.listing__ds__year
+        , subq_0.listing__ds__extract_year
+        , subq_0.listing__ds__extract_quarter
+        , subq_0.listing__ds__extract_month
+        , subq_0.listing__ds__extract_week
+        , subq_0.listing__ds__extract_day
+        , subq_0.listing__ds__extract_dayofweek
+        , subq_0.listing__ds__extract_dayofyear
         , subq_0.listing__created_at__day
         , subq_0.listing__created_at__week
         , subq_0.listing__created_at__month
         , subq_0.listing__created_at__quarter
         , subq_0.listing__created_at__year
+        , subq_0.listing__created_at__extract_year
+        , subq_0.listing__created_at__extract_quarter
+        , subq_0.listing__created_at__extract_month
+        , subq_0.listing__created_at__extract_week
+        , subq_0.listing__created_at__extract_day
+        , subq_0.listing__created_at__extract_dayofweek
+        , subq_0.listing__created_at__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -77,11 +119,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql
index 316737d00a..b05da97264 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql
@@ -35,32 +35,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
index 73e6a70d92..437dc887b4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
@@ -60,31 +60,73 @@ FROM (
                     , subq_0.ds__month
                     , subq_0.ds__quarter
                     , subq_0.ds__year
+                    , subq_0.ds__extract_year
+                    , subq_0.ds__extract_quarter
+                    , subq_0.ds__extract_month
+                    , subq_0.ds__extract_week
+                    , subq_0.ds__extract_day
+                    , subq_0.ds__extract_dayofweek
+                    , subq_0.ds__extract_dayofyear
                     , subq_0.ds_partitioned__day
                     , subq_0.ds_partitioned__week
                     , subq_0.ds_partitioned__month
                     , subq_0.ds_partitioned__quarter
                     , subq_0.ds_partitioned__year
+                    , subq_0.ds_partitioned__extract_year
+                    , subq_0.ds_partitioned__extract_quarter
+                    , subq_0.ds_partitioned__extract_month
+                    , subq_0.ds_partitioned__extract_week
+                    , subq_0.ds_partitioned__extract_day
+                    , subq_0.ds_partitioned__extract_dayofweek
+                    , subq_0.ds_partitioned__extract_dayofyear
                     , subq_0.paid_at__day
                     , subq_0.paid_at__week
                     , subq_0.paid_at__month
                     , subq_0.paid_at__quarter
                     , subq_0.paid_at__year
+                    , subq_0.paid_at__extract_year
+                    , subq_0.paid_at__extract_quarter
+                    , subq_0.paid_at__extract_month
+                    , subq_0.paid_at__extract_week
+                    , subq_0.paid_at__extract_day
+                    , subq_0.paid_at__extract_dayofweek
+                    , subq_0.paid_at__extract_dayofyear
                     , subq_0.booking__ds__day
                     , subq_0.booking__ds__week
                     , subq_0.booking__ds__month
                     , subq_0.booking__ds__quarter
                     , subq_0.booking__ds__year
+                    , subq_0.booking__ds__extract_year
+                    , subq_0.booking__ds__extract_quarter
+                    , subq_0.booking__ds__extract_month
+                    , subq_0.booking__ds__extract_week
+                    , subq_0.booking__ds__extract_day
+                    , subq_0.booking__ds__extract_dayofweek
+                    , subq_0.booking__ds__extract_dayofyear
                     , subq_0.booking__ds_partitioned__day
                     , subq_0.booking__ds_partitioned__week
                     , subq_0.booking__ds_partitioned__month
                     , subq_0.booking__ds_partitioned__quarter
                     , subq_0.booking__ds_partitioned__year
+                    , subq_0.booking__ds_partitioned__extract_year
+                    , subq_0.booking__ds_partitioned__extract_quarter
+                    , subq_0.booking__ds_partitioned__extract_month
+                    , subq_0.booking__ds_partitioned__extract_week
+                    , subq_0.booking__ds_partitioned__extract_day
+                    , subq_0.booking__ds_partitioned__extract_dayofweek
+                    , subq_0.booking__ds_partitioned__extract_dayofyear
                     , subq_0.booking__paid_at__day
                     , subq_0.booking__paid_at__week
                     , subq_0.booking__paid_at__month
                     , subq_0.booking__paid_at__quarter
                     , subq_0.booking__paid_at__year
+                    , subq_0.booking__paid_at__extract_year
+                    , subq_0.booking__paid_at__extract_quarter
+                    , subq_0.booking__paid_at__extract_month
+                    , subq_0.booking__paid_at__extract_week
+                    , subq_0.booking__paid_at__extract_day
+                    , subq_0.booking__paid_at__extract_dayofweek
+                    , subq_0.booking__paid_at__extract_dayofyear
                     , subq_0.ds__day AS metric_time__day
                     , subq_0.ds__week AS metric_time__week
                     , subq_0.ds__month AS metric_time__month
@@ -134,32 +176,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -184,21 +268,49 @@ FROM (
                     , subq_3.ds__month
                     , subq_3.ds__quarter
                     , subq_3.ds__year
+                    , subq_3.ds__extract_year
+                    , subq_3.ds__extract_quarter
+                    , subq_3.ds__extract_month
+                    , subq_3.ds__extract_week
+                    , subq_3.ds__extract_day
+                    , subq_3.ds__extract_dayofweek
+                    , subq_3.ds__extract_dayofyear
                     , subq_3.created_at__day
                     , subq_3.created_at__week
                     , subq_3.created_at__month
                     , subq_3.created_at__quarter
                     , subq_3.created_at__year
+                    , subq_3.created_at__extract_year
+                    , subq_3.created_at__extract_quarter
+                    , subq_3.created_at__extract_month
+                    , subq_3.created_at__extract_week
+                    , subq_3.created_at__extract_day
+                    , subq_3.created_at__extract_dayofweek
+                    , subq_3.created_at__extract_dayofyear
                     , subq_3.listing__ds__day
                     , subq_3.listing__ds__week
                     , subq_3.listing__ds__month
                     , subq_3.listing__ds__quarter
                     , subq_3.listing__ds__year
+                    , subq_3.listing__ds__extract_year
+                    , subq_3.listing__ds__extract_quarter
+                    , subq_3.listing__ds__extract_month
+                    , subq_3.listing__ds__extract_week
+                    , subq_3.listing__ds__extract_day
+                    , subq_3.listing__ds__extract_dayofweek
+                    , subq_3.listing__ds__extract_dayofyear
                     , subq_3.listing__created_at__day
                     , subq_3.listing__created_at__week
                     , subq_3.listing__created_at__month
                     , subq_3.listing__created_at__quarter
                     , subq_3.listing__created_at__year
+                    , subq_3.listing__created_at__extract_year
+                    , subq_3.listing__created_at__extract_quarter
+                    , subq_3.listing__created_at__extract_month
+                    , subq_3.listing__created_at__extract_week
+                    , subq_3.listing__created_at__extract_day
+                    , subq_3.listing__created_at__extract_dayofweek
+                    , subq_3.listing__created_at__extract_dayofyear
                     , subq_3.ds__day AS metric_time__day
                     , subq_3.ds__week AS metric_time__week
                     , subq_3.ds__month AS metric_time__month
@@ -227,11 +339,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -240,11 +366,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -317,31 +457,73 @@ FROM (
                     , subq_12.ds__month
                     , subq_12.ds__quarter
                     , subq_12.ds__year
+                    , subq_12.ds__extract_year
+                    , subq_12.ds__extract_quarter
+                    , subq_12.ds__extract_month
+                    , subq_12.ds__extract_week
+                    , subq_12.ds__extract_day
+                    , subq_12.ds__extract_dayofweek
+                    , subq_12.ds__extract_dayofyear
                     , subq_12.ds_partitioned__day
                     , subq_12.ds_partitioned__week
                     , subq_12.ds_partitioned__month
                     , subq_12.ds_partitioned__quarter
                     , subq_12.ds_partitioned__year
+                    , subq_12.ds_partitioned__extract_year
+                    , subq_12.ds_partitioned__extract_quarter
+                    , subq_12.ds_partitioned__extract_month
+                    , subq_12.ds_partitioned__extract_week
+                    , subq_12.ds_partitioned__extract_day
+                    , subq_12.ds_partitioned__extract_dayofweek
+                    , subq_12.ds_partitioned__extract_dayofyear
                     , subq_12.paid_at__day
                     , subq_12.paid_at__week
                     , subq_12.paid_at__month
                     , subq_12.paid_at__quarter
                     , subq_12.paid_at__year
+                    , subq_12.paid_at__extract_year
+                    , subq_12.paid_at__extract_quarter
+                    , subq_12.paid_at__extract_month
+                    , subq_12.paid_at__extract_week
+                    , subq_12.paid_at__extract_day
+                    , subq_12.paid_at__extract_dayofweek
+                    , subq_12.paid_at__extract_dayofyear
                     , subq_12.booking__ds__day
                     , subq_12.booking__ds__week
                     , subq_12.booking__ds__month
                     , subq_12.booking__ds__quarter
                     , subq_12.booking__ds__year
+                    , subq_12.booking__ds__extract_year
+                    , subq_12.booking__ds__extract_quarter
+                    , subq_12.booking__ds__extract_month
+                    , subq_12.booking__ds__extract_week
+                    , subq_12.booking__ds__extract_day
+                    , subq_12.booking__ds__extract_dayofweek
+                    , subq_12.booking__ds__extract_dayofyear
                     , subq_12.booking__ds_partitioned__day
                     , subq_12.booking__ds_partitioned__week
                     , subq_12.booking__ds_partitioned__month
                     , subq_12.booking__ds_partitioned__quarter
                     , subq_12.booking__ds_partitioned__year
+                    , subq_12.booking__ds_partitioned__extract_year
+                    , subq_12.booking__ds_partitioned__extract_quarter
+                    , subq_12.booking__ds_partitioned__extract_month
+                    , subq_12.booking__ds_partitioned__extract_week
+                    , subq_12.booking__ds_partitioned__extract_day
+                    , subq_12.booking__ds_partitioned__extract_dayofweek
+                    , subq_12.booking__ds_partitioned__extract_dayofyear
                     , subq_12.booking__paid_at__day
                     , subq_12.booking__paid_at__week
                     , subq_12.booking__paid_at__month
                     , subq_12.booking__paid_at__quarter
                     , subq_12.booking__paid_at__year
+                    , subq_12.booking__paid_at__extract_year
+                    , subq_12.booking__paid_at__extract_quarter
+                    , subq_12.booking__paid_at__extract_month
+                    , subq_12.booking__paid_at__extract_week
+                    , subq_12.booking__paid_at__extract_day
+                    , subq_12.booking__paid_at__extract_dayofweek
+                    , subq_12.booking__paid_at__extract_dayofyear
                     , subq_12.ds__day AS metric_time__day
                     , subq_12.ds__week AS metric_time__week
                     , subq_12.ds__month AS metric_time__month
@@ -391,32 +573,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -441,21 +665,49 @@ FROM (
                     , subq_15.ds__month
                     , subq_15.ds__quarter
                     , subq_15.ds__year
+                    , subq_15.ds__extract_year
+                    , subq_15.ds__extract_quarter
+                    , subq_15.ds__extract_month
+                    , subq_15.ds__extract_week
+                    , subq_15.ds__extract_day
+                    , subq_15.ds__extract_dayofweek
+                    , subq_15.ds__extract_dayofyear
                     , subq_15.created_at__day
                     , subq_15.created_at__week
                     , subq_15.created_at__month
                     , subq_15.created_at__quarter
                     , subq_15.created_at__year
+                    , subq_15.created_at__extract_year
+                    , subq_15.created_at__extract_quarter
+                    , subq_15.created_at__extract_month
+                    , subq_15.created_at__extract_week
+                    , subq_15.created_at__extract_day
+                    , subq_15.created_at__extract_dayofweek
+                    , subq_15.created_at__extract_dayofyear
                     , subq_15.listing__ds__day
                     , subq_15.listing__ds__week
                     , subq_15.listing__ds__month
                     , subq_15.listing__ds__quarter
                     , subq_15.listing__ds__year
+                    , subq_15.listing__ds__extract_year
+                    , subq_15.listing__ds__extract_quarter
+                    , subq_15.listing__ds__extract_month
+                    , subq_15.listing__ds__extract_week
+                    , subq_15.listing__ds__extract_day
+                    , subq_15.listing__ds__extract_dayofweek
+                    , subq_15.listing__ds__extract_dayofyear
                     , subq_15.listing__created_at__day
                     , subq_15.listing__created_at__week
                     , subq_15.listing__created_at__month
                     , subq_15.listing__created_at__quarter
                     , subq_15.listing__created_at__year
+                    , subq_15.listing__created_at__extract_year
+                    , subq_15.listing__created_at__extract_quarter
+                    , subq_15.listing__created_at__extract_month
+                    , subq_15.listing__created_at__extract_week
+                    , subq_15.listing__created_at__extract_day
+                    , subq_15.listing__created_at__extract_dayofweek
+                    , subq_15.listing__created_at__extract_dayofyear
                     , subq_15.ds__day AS metric_time__day
                     , subq_15.ds__week AS metric_time__week
                     , subq_15.ds__month AS metric_time__month
@@ -484,11 +736,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -497,11 +763,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -557,31 +837,73 @@ FROM (
             , subq_24.ds__month
             , subq_24.ds__quarter
             , subq_24.ds__year
+            , subq_24.ds__extract_year
+            , subq_24.ds__extract_quarter
+            , subq_24.ds__extract_month
+            , subq_24.ds__extract_week
+            , subq_24.ds__extract_day
+            , subq_24.ds__extract_dayofweek
+            , subq_24.ds__extract_dayofyear
             , subq_24.ds_partitioned__day
             , subq_24.ds_partitioned__week
             , subq_24.ds_partitioned__month
             , subq_24.ds_partitioned__quarter
             , subq_24.ds_partitioned__year
+            , subq_24.ds_partitioned__extract_year
+            , subq_24.ds_partitioned__extract_quarter
+            , subq_24.ds_partitioned__extract_month
+            , subq_24.ds_partitioned__extract_week
+            , subq_24.ds_partitioned__extract_day
+            , subq_24.ds_partitioned__extract_dayofweek
+            , subq_24.ds_partitioned__extract_dayofyear
             , subq_24.paid_at__day
             , subq_24.paid_at__week
             , subq_24.paid_at__month
             , subq_24.paid_at__quarter
             , subq_24.paid_at__year
+            , subq_24.paid_at__extract_year
+            , subq_24.paid_at__extract_quarter
+            , subq_24.paid_at__extract_month
+            , subq_24.paid_at__extract_week
+            , subq_24.paid_at__extract_day
+            , subq_24.paid_at__extract_dayofweek
+            , subq_24.paid_at__extract_dayofyear
             , subq_24.booking__ds__day
             , subq_24.booking__ds__week
             , subq_24.booking__ds__month
             , subq_24.booking__ds__quarter
             , subq_24.booking__ds__year
+            , subq_24.booking__ds__extract_year
+            , subq_24.booking__ds__extract_quarter
+            , subq_24.booking__ds__extract_month
+            , subq_24.booking__ds__extract_week
+            , subq_24.booking__ds__extract_day
+            , subq_24.booking__ds__extract_dayofweek
+            , subq_24.booking__ds__extract_dayofyear
             , subq_24.booking__ds_partitioned__day
             , subq_24.booking__ds_partitioned__week
             , subq_24.booking__ds_partitioned__month
             , subq_24.booking__ds_partitioned__quarter
             , subq_24.booking__ds_partitioned__year
+            , subq_24.booking__ds_partitioned__extract_year
+            , subq_24.booking__ds_partitioned__extract_quarter
+            , subq_24.booking__ds_partitioned__extract_month
+            , subq_24.booking__ds_partitioned__extract_week
+            , subq_24.booking__ds_partitioned__extract_day
+            , subq_24.booking__ds_partitioned__extract_dayofweek
+            , subq_24.booking__ds_partitioned__extract_dayofyear
             , subq_24.booking__paid_at__day
             , subq_24.booking__paid_at__week
             , subq_24.booking__paid_at__month
             , subq_24.booking__paid_at__quarter
             , subq_24.booking__paid_at__year
+            , subq_24.booking__paid_at__extract_year
+            , subq_24.booking__paid_at__extract_quarter
+            , subq_24.booking__paid_at__extract_month
+            , subq_24.booking__paid_at__extract_week
+            , subq_24.booking__paid_at__extract_day
+            , subq_24.booking__paid_at__extract_dayofweek
+            , subq_24.booking__paid_at__extract_dayofyear
             , subq_24.ds__day AS metric_time__day
             , subq_24.ds__week AS metric_time__week
             , subq_24.ds__month AS metric_time__month
@@ -631,32 +953,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
index 4176ca90e9..37ad3a608e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
@@ -45,31 +45,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -119,32 +161,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -186,31 +270,73 @@ FROM (
             , subq_7.ds__month
             , subq_7.ds__quarter
             , subq_7.ds__year
+            , subq_7.ds__extract_year
+            , subq_7.ds__extract_quarter
+            , subq_7.ds__extract_month
+            , subq_7.ds__extract_week
+            , subq_7.ds__extract_day
+            , subq_7.ds__extract_dayofweek
+            , subq_7.ds__extract_dayofyear
             , subq_7.ds_partitioned__day
             , subq_7.ds_partitioned__week
             , subq_7.ds_partitioned__month
             , subq_7.ds_partitioned__quarter
             , subq_7.ds_partitioned__year
+            , subq_7.ds_partitioned__extract_year
+            , subq_7.ds_partitioned__extract_quarter
+            , subq_7.ds_partitioned__extract_month
+            , subq_7.ds_partitioned__extract_week
+            , subq_7.ds_partitioned__extract_day
+            , subq_7.ds_partitioned__extract_dayofweek
+            , subq_7.ds_partitioned__extract_dayofyear
             , subq_7.paid_at__day
             , subq_7.paid_at__week
             , subq_7.paid_at__month
             , subq_7.paid_at__quarter
             , subq_7.paid_at__year
+            , subq_7.paid_at__extract_year
+            , subq_7.paid_at__extract_quarter
+            , subq_7.paid_at__extract_month
+            , subq_7.paid_at__extract_week
+            , subq_7.paid_at__extract_day
+            , subq_7.paid_at__extract_dayofweek
+            , subq_7.paid_at__extract_dayofyear
             , subq_7.booking__ds__day
             , subq_7.booking__ds__week
             , subq_7.booking__ds__month
             , subq_7.booking__ds__quarter
             , subq_7.booking__ds__year
+            , subq_7.booking__ds__extract_year
+            , subq_7.booking__ds__extract_quarter
+            , subq_7.booking__ds__extract_month
+            , subq_7.booking__ds__extract_week
+            , subq_7.booking__ds__extract_day
+            , subq_7.booking__ds__extract_dayofweek
+            , subq_7.booking__ds__extract_dayofyear
             , subq_7.booking__ds_partitioned__day
             , subq_7.booking__ds_partitioned__week
             , subq_7.booking__ds_partitioned__month
             , subq_7.booking__ds_partitioned__quarter
             , subq_7.booking__ds_partitioned__year
+            , subq_7.booking__ds_partitioned__extract_year
+            , subq_7.booking__ds_partitioned__extract_quarter
+            , subq_7.booking__ds_partitioned__extract_month
+            , subq_7.booking__ds_partitioned__extract_week
+            , subq_7.booking__ds_partitioned__extract_day
+            , subq_7.booking__ds_partitioned__extract_dayofweek
+            , subq_7.booking__ds_partitioned__extract_dayofyear
             , subq_7.booking__paid_at__day
             , subq_7.booking__paid_at__week
             , subq_7.booking__paid_at__month
             , subq_7.booking__paid_at__quarter
             , subq_7.booking__paid_at__year
+            , subq_7.booking__paid_at__extract_year
+            , subq_7.booking__paid_at__extract_quarter
+            , subq_7.booking__paid_at__extract_month
+            , subq_7.booking__paid_at__extract_week
+            , subq_7.booking__paid_at__extract_day
+            , subq_7.booking__paid_at__extract_dayofweek
+            , subq_7.booking__paid_at__extract_dayofyear
             , subq_7.ds__day AS metric_time__day
             , subq_7.ds__week AS metric_time__week
             , subq_7.ds__month AS metric_time__month
@@ -260,32 +386,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 13d80a91d0..a495423238 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -39,31 +39,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -113,32 +155,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 14ec230f17..0e4cdb1a6a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -27,31 +27,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -160,21 +244,49 @@ FROM (
             , subq_5.ds__month
             , subq_5.ds__quarter
             , subq_5.ds__year
+            , subq_5.ds__extract_year
+            , subq_5.ds__extract_quarter
+            , subq_5.ds__extract_month
+            , subq_5.ds__extract_week
+            , subq_5.ds__extract_day
+            , subq_5.ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear
             , subq_5.created_at__day
             , subq_5.created_at__week
             , subq_5.created_at__month
             , subq_5.created_at__quarter
             , subq_5.created_at__year
+            , subq_5.created_at__extract_year
+            , subq_5.created_at__extract_quarter
+            , subq_5.created_at__extract_month
+            , subq_5.created_at__extract_week
+            , subq_5.created_at__extract_day
+            , subq_5.created_at__extract_dayofweek
+            , subq_5.created_at__extract_dayofyear
             , subq_5.listing__ds__day
             , subq_5.listing__ds__week
             , subq_5.listing__ds__month
             , subq_5.listing__ds__quarter
             , subq_5.listing__ds__year
+            , subq_5.listing__ds__extract_year
+            , subq_5.listing__ds__extract_quarter
+            , subq_5.listing__ds__extract_month
+            , subq_5.listing__ds__extract_week
+            , subq_5.listing__ds__extract_day
+            , subq_5.listing__ds__extract_dayofweek
+            , subq_5.listing__ds__extract_dayofyear
             , subq_5.listing__created_at__day
             , subq_5.listing__created_at__week
             , subq_5.listing__created_at__month
             , subq_5.listing__created_at__quarter
             , subq_5.listing__created_at__year
+            , subq_5.listing__created_at__extract_year
+            , subq_5.listing__created_at__extract_quarter
+            , subq_5.listing__created_at__extract_month
+            , subq_5.listing__created_at__extract_week
+            , subq_5.listing__created_at__extract_day
+            , subq_5.listing__created_at__extract_dayofweek
+            , subq_5.listing__created_at__extract_dayofyear
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -203,11 +315,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -216,11 +342,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
index 88cc0b431d..c65a26cd35 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__day AS listing__window_start__day
-        , subq_7.window_end__day AS listing__window_end__day
+        , subq_7.window_start__extract_month AS listing__window_start__extract_month
+        , subq_7.window_end__extract_quarter AS listing__window_end__extract_quarter
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
         , subq_2.bookings AS bookings
@@ -40,31 +40,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -142,8 +226,8 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__day
-          , subq_6.window_end__day
+          subq_6.window_start__extract_month
+          , subq_6.window_end__extract_quarter
           , subq_6.listing
           , subq_6.user__home_state_latest
         FROM (
@@ -154,26 +238,61 @@ FROM (
             , subq_3.window_start__month AS window_start__month
             , subq_3.window_start__quarter AS window_start__quarter
             , subq_3.window_start__year AS window_start__year
+            , subq_3.window_start__extract_year AS window_start__extract_year
+            , subq_3.window_start__extract_quarter AS window_start__extract_quarter
+            , subq_3.window_start__extract_month AS window_start__extract_month
+            , subq_3.window_start__extract_week AS window_start__extract_week
+            , subq_3.window_start__extract_day AS window_start__extract_day
+            , subq_3.window_start__extract_dayofweek AS window_start__extract_dayofweek
+            , subq_3.window_start__extract_dayofyear AS window_start__extract_dayofyear
             , subq_3.window_end__day AS window_end__day
             , subq_3.window_end__week AS window_end__week
             , subq_3.window_end__month AS window_end__month
             , subq_3.window_end__quarter AS window_end__quarter
             , subq_3.window_end__year AS window_end__year
+            , subq_3.window_end__extract_year AS window_end__extract_year
+            , subq_3.window_end__extract_quarter AS window_end__extract_quarter
+            , subq_3.window_end__extract_month AS window_end__extract_month
+            , subq_3.window_end__extract_week AS window_end__extract_week
+            , subq_3.window_end__extract_day AS window_end__extract_day
+            , subq_3.window_end__extract_dayofweek AS window_end__extract_dayofweek
+            , subq_3.window_end__extract_dayofyear AS window_end__extract_dayofyear
             , subq_3.listing__window_start__day AS listing__window_start__day
             , subq_3.listing__window_start__week AS listing__window_start__week
             , subq_3.listing__window_start__month AS listing__window_start__month
             , subq_3.listing__window_start__quarter AS listing__window_start__quarter
             , subq_3.listing__window_start__year AS listing__window_start__year
+            , subq_3.listing__window_start__extract_year AS listing__window_start__extract_year
+            , subq_3.listing__window_start__extract_quarter AS listing__window_start__extract_quarter
+            , subq_3.listing__window_start__extract_month AS listing__window_start__extract_month
+            , subq_3.listing__window_start__extract_week AS listing__window_start__extract_week
+            , subq_3.listing__window_start__extract_day AS listing__window_start__extract_day
+            , subq_3.listing__window_start__extract_dayofweek AS listing__window_start__extract_dayofweek
+            , subq_3.listing__window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
             , subq_3.listing__window_end__day AS listing__window_end__day
             , subq_3.listing__window_end__week AS listing__window_end__week
             , subq_3.listing__window_end__month AS listing__window_end__month
             , subq_3.listing__window_end__quarter AS listing__window_end__quarter
             , subq_3.listing__window_end__year AS listing__window_end__year
+            , subq_3.listing__window_end__extract_year AS listing__window_end__extract_year
+            , subq_3.listing__window_end__extract_quarter AS listing__window_end__extract_quarter
+            , subq_3.listing__window_end__extract_month AS listing__window_end__extract_month
+            , subq_3.listing__window_end__extract_week AS listing__window_end__extract_week
+            , subq_3.listing__window_end__extract_day AS listing__window_end__extract_day
+            , subq_3.listing__window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
+            , subq_3.listing__window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
             , subq_5.ds__day AS user__ds__day
             , subq_5.ds__week AS user__ds__week
             , subq_5.ds__month AS user__ds__month
             , subq_5.ds__quarter AS user__ds__quarter
             , subq_5.ds__year AS user__ds__year
+            , subq_5.ds__extract_year AS user__ds__extract_year
+            , subq_5.ds__extract_quarter AS user__ds__extract_quarter
+            , subq_5.ds__extract_month AS user__ds__extract_month
+            , subq_5.ds__extract_week AS user__ds__extract_week
+            , subq_5.ds__extract_day AS user__ds__extract_day
+            , subq_5.ds__extract_dayofweek AS user__ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS user__ds__extract_dayofyear
             , subq_3.listing AS listing
             , subq_3.user AS user
             , subq_3.listing__user AS listing__user
@@ -192,11 +311,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -205,11 +338,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -227,11 +374,25 @@ FROM (
             --    'ds__month',
             --    'ds__quarter',
             --    'ds__year',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
             --    'user__ds__day',
             --    'user__ds__week',
             --    'user__ds__month',
             --    'user__ds__quarter',
             --    'user__ds__year',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
             --    'user']
             SELECT
               subq_4.ds__day
@@ -239,11 +400,25 @@ FROM (
               , subq_4.ds__month
               , subq_4.ds__quarter
               , subq_4.ds__year
+              , subq_4.ds__extract_year
+              , subq_4.ds__extract_quarter
+              , subq_4.ds__extract_month
+              , subq_4.ds__extract_week
+              , subq_4.ds__extract_day
+              , subq_4.ds__extract_dayofweek
+              , subq_4.ds__extract_dayofyear
               , subq_4.user__ds__day
               , subq_4.user__ds__week
               , subq_4.user__ds__month
               , subq_4.user__ds__quarter
               , subq_4.user__ds__year
+              , subq_4.user__ds__extract_year
+              , subq_4.user__ds__extract_quarter
+              , subq_4.user__ds__extract_month
+              , subq_4.user__ds__extract_week
+              , subq_4.user__ds__extract_day
+              , subq_4.user__ds__extract_dayofweek
+              , subq_4.user__ds__extract_dayofyear
               , subq_4.user
               , subq_4.home_state_latest
               , subq_4.user__home_state_latest
@@ -255,12 +430,26 @@ FROM (
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS ds__year
+                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_dayofyear
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC('week', users_latest_src_10021.ds) AS user__ds__week
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS user__ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS user__ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS user__ds__year
+                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS user__ds__extract_year
+                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
+                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS user__ds__extract_month
+                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
+                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS user__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_dayofyear
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
@@ -275,12 +464,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__day
+            subq_2.metric_time__day >= subq_7.window_start__extract_month
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.window_end__day
+              subq_2.metric_time__day < subq_7.window_end__extract_quarter
             ) OR (
-              subq_7.window_end__day IS NULL
+              subq_7.window_end__extract_quarter IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index feb5ed0fdc..7633c731a1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,8 +23,8 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    listings_src_10017.active_from AS window_start__day
-    , listings_src_10017.active_to AS window_end__day
+    EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+    , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
   FROM ***************************.dim_listings listings_src_10017
@@ -38,12 +38,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__day
+      subq_13.metric_time__day >= subq_18.window_start__extract_month
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.window_end__day
+        subq_13.metric_time__day < subq_18.window_end__extract_quarter
       ) OR (
-        subq_18.window_end__day IS NULL
+        subq_18.window_end__extract_quarter IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
index 94054a124c..a451f1ac42 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
@@ -21,7 +21,7 @@ FROM (
       SELECT
         subq_2.metric_time__day AS metric_time__day
         , subq_7.lux_listing__window_start__day AS listing__lux_listing__window_start__day
-        , subq_7.lux_listing__window_end__day AS listing__lux_listing__window_end__day
+        , subq_7.lux_listing__window_end__extract_day AS listing__lux_listing__window_end__extract_day
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
         , subq_2.bookings AS bookings
@@ -40,31 +40,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -146,7 +230,7 @@ FROM (
         --    'listing']
         SELECT
           subq_6.lux_listing__window_start__day
-          , subq_6.lux_listing__window_end__day
+          , subq_6.lux_listing__window_end__extract_day
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
         FROM (
@@ -157,11 +241,25 @@ FROM (
             , subq_5.window_start__month AS lux_listing__window_start__month
             , subq_5.window_start__quarter AS lux_listing__window_start__quarter
             , subq_5.window_start__year AS lux_listing__window_start__year
+            , subq_5.window_start__extract_year AS lux_listing__window_start__extract_year
+            , subq_5.window_start__extract_quarter AS lux_listing__window_start__extract_quarter
+            , subq_5.window_start__extract_month AS lux_listing__window_start__extract_month
+            , subq_5.window_start__extract_week AS lux_listing__window_start__extract_week
+            , subq_5.window_start__extract_day AS lux_listing__window_start__extract_day
+            , subq_5.window_start__extract_dayofweek AS lux_listing__window_start__extract_dayofweek
+            , subq_5.window_start__extract_dayofyear AS lux_listing__window_start__extract_dayofyear
             , subq_5.window_end__day AS lux_listing__window_end__day
             , subq_5.window_end__week AS lux_listing__window_end__week
             , subq_5.window_end__month AS lux_listing__window_end__month
             , subq_5.window_end__quarter AS lux_listing__window_end__quarter
             , subq_5.window_end__year AS lux_listing__window_end__year
+            , subq_5.window_end__extract_year AS lux_listing__window_end__extract_year
+            , subq_5.window_end__extract_quarter AS lux_listing__window_end__extract_quarter
+            , subq_5.window_end__extract_month AS lux_listing__window_end__extract_month
+            , subq_5.window_end__extract_week AS lux_listing__window_end__extract_week
+            , subq_5.window_end__extract_day AS lux_listing__window_end__extract_day
+            , subq_5.window_end__extract_dayofweek AS lux_listing__window_end__extract_dayofweek
+            , subq_5.window_end__extract_dayofyear AS lux_listing__window_end__extract_dayofyear
             , subq_3.listing AS listing
             , subq_3.lux_listing AS lux_listing
             , subq_3.listing__lux_listing AS listing__lux_listing
@@ -183,21 +281,49 @@ FROM (
             --    'window_start__month',
             --    'window_start__quarter',
             --    'window_start__year',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
             --    'window_end__day',
             --    'window_end__week',
             --    'window_end__month',
             --    'window_end__quarter',
             --    'window_end__year',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
             --    'lux_listing__window_start__day',
             --    'lux_listing__window_start__week',
             --    'lux_listing__window_start__month',
             --    'lux_listing__window_start__quarter',
             --    'lux_listing__window_start__year',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
             --    'lux_listing__window_end__day',
             --    'lux_listing__window_end__week',
             --    'lux_listing__window_end__month',
             --    'lux_listing__window_end__quarter',
             --    'lux_listing__window_end__year',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
             --    'lux_listing']
             SELECT
               subq_4.window_start__day
@@ -205,21 +331,49 @@ FROM (
               , subq_4.window_start__month
               , subq_4.window_start__quarter
               , subq_4.window_start__year
+              , subq_4.window_start__extract_year
+              , subq_4.window_start__extract_quarter
+              , subq_4.window_start__extract_month
+              , subq_4.window_start__extract_week
+              , subq_4.window_start__extract_day
+              , subq_4.window_start__extract_dayofweek
+              , subq_4.window_start__extract_dayofyear
               , subq_4.window_end__day
               , subq_4.window_end__week
               , subq_4.window_end__month
               , subq_4.window_end__quarter
               , subq_4.window_end__year
+              , subq_4.window_end__extract_year
+              , subq_4.window_end__extract_quarter
+              , subq_4.window_end__extract_month
+              , subq_4.window_end__extract_week
+              , subq_4.window_end__extract_day
+              , subq_4.window_end__extract_dayofweek
+              , subq_4.window_end__extract_dayofyear
               , subq_4.lux_listing__window_start__day
               , subq_4.lux_listing__window_start__week
               , subq_4.lux_listing__window_start__month
               , subq_4.lux_listing__window_start__quarter
               , subq_4.lux_listing__window_start__year
+              , subq_4.lux_listing__window_start__extract_year
+              , subq_4.lux_listing__window_start__extract_quarter
+              , subq_4.lux_listing__window_start__extract_month
+              , subq_4.lux_listing__window_start__extract_week
+              , subq_4.lux_listing__window_start__extract_day
+              , subq_4.lux_listing__window_start__extract_dayofweek
+              , subq_4.lux_listing__window_start__extract_dayofyear
               , subq_4.lux_listing__window_end__day
               , subq_4.lux_listing__window_end__week
               , subq_4.lux_listing__window_end__month
               , subq_4.lux_listing__window_end__quarter
               , subq_4.lux_listing__window_end__year
+              , subq_4.lux_listing__window_end__extract_year
+              , subq_4.lux_listing__window_end__extract_quarter
+              , subq_4.lux_listing__window_end__extract_month
+              , subq_4.lux_listing__window_end__extract_week
+              , subq_4.lux_listing__window_end__extract_day
+              , subq_4.lux_listing__window_end__extract_dayofweek
+              , subq_4.lux_listing__window_end__extract_dayofyear
               , subq_4.lux_listing
               , subq_4.is_confirmed_lux
               , subq_4.lux_listing__is_confirmed_lux
@@ -231,22 +385,50 @@ FROM (
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS window_start__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofyear
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS window_end__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofyear
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_from) AS lux_listing__window_start__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS lux_listing__window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS lux_listing__window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS lux_listing__window_start__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS lux_listing__window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS lux_listing__window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS lux_listing__window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS lux_listing__window_end__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofyear
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
@@ -264,9 +446,9 @@ FROM (
             subq_2.metric_time__day >= subq_7.lux_listing__window_start__day
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.lux_listing__window_end__day
+              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_day
             ) OR (
-              subq_7.lux_listing__window_end__day IS NULL
+              subq_7.lux_listing__window_end__extract_day IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index f1b419a284..ff50adbf8b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -27,7 +27,7 @@ LEFT OUTER JOIN (
   --    'listing']
   SELECT
     lux_listings_src_10019.valid_from AS lux_listing__window_start__day
-    , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
+    , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
   FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_10018
@@ -44,9 +44,9 @@ ON
       subq_13.metric_time__day >= subq_18.lux_listing__window_start__day
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.lux_listing__window_end__day
+        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_day
       ) OR (
-        subq_18.lux_listing__window_end__day IS NULL
+        subq_18.lux_listing__window_end__extract_day IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql
index ae8b7838b7..cb9670f074 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql
@@ -33,32 +33,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -85,11 +127,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -98,11 +154,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -131,11 +201,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -144,11 +228,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
index d35179ebf0..fbddd59f54 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
@@ -36,21 +36,49 @@ FROM (
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.ds__day
             , subq_0.ds__week
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.account_id__ds_partitioned__day
             , subq_0.account_id__ds_partitioned__week
             , subq_0.account_id__ds_partitioned__month
             , subq_0.account_id__ds_partitioned__quarter
             , subq_0.account_id__ds_partitioned__year
+            , subq_0.account_id__ds_partitioned__extract_year
+            , subq_0.account_id__ds_partitioned__extract_quarter
+            , subq_0.account_id__ds_partitioned__extract_month
+            , subq_0.account_id__ds_partitioned__extract_week
+            , subq_0.account_id__ds_partitioned__extract_day
+            , subq_0.account_id__ds_partitioned__extract_dayofweek
+            , subq_0.account_id__ds_partitioned__extract_dayofyear
             , subq_0.account_id__ds__day
             , subq_0.account_id__ds__week
             , subq_0.account_id__ds__month
             , subq_0.account_id__ds__quarter
             , subq_0.account_id__ds__year
+            , subq_0.account_id__ds__extract_year
+            , subq_0.account_id__ds__extract_quarter
+            , subq_0.account_id__ds__extract_month
+            , subq_0.account_id__ds__extract_week
+            , subq_0.account_id__ds__extract_day
+            , subq_0.account_id__ds__extract_dayofweek
+            , subq_0.account_id__ds__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -69,22 +97,50 @@ FROM (
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS ds__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_dayofyear
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS account_id__ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS account_id__ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS account_id__ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS account_id__ds__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofyear
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -106,16 +162,37 @@ FROM (
             , subq_3.ds_partitioned__month AS ds_partitioned__month
             , subq_3.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_3.ds_partitioned__year AS ds_partitioned__year
+            , subq_3.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_3.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_3.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_3.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_3.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_3.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_3.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_3.account_id__ds_partitioned__day AS account_id__ds_partitioned__day
             , subq_3.account_id__ds_partitioned__week AS account_id__ds_partitioned__week
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
             , subq_3.account_id__ds_partitioned__quarter AS account_id__ds_partitioned__quarter
             , subq_3.account_id__ds_partitioned__year AS account_id__ds_partitioned__year
+            , subq_3.account_id__ds_partitioned__extract_year AS account_id__ds_partitioned__extract_year
+            , subq_3.account_id__ds_partitioned__extract_quarter AS account_id__ds_partitioned__extract_quarter
+            , subq_3.account_id__ds_partitioned__extract_month AS account_id__ds_partitioned__extract_month
+            , subq_3.account_id__ds_partitioned__extract_week AS account_id__ds_partitioned__extract_week
+            , subq_3.account_id__ds_partitioned__extract_day AS account_id__ds_partitioned__extract_day
+            , subq_3.account_id__ds_partitioned__extract_dayofweek AS account_id__ds_partitioned__extract_dayofweek
+            , subq_3.account_id__ds_partitioned__extract_dayofyear AS account_id__ds_partitioned__extract_dayofyear
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
             , subq_5.ds_partitioned__quarter AS customer_id__ds_partitioned__quarter
             , subq_5.ds_partitioned__year AS customer_id__ds_partitioned__year
+            , subq_5.ds_partitioned__extract_year AS customer_id__ds_partitioned__extract_year
+            , subq_5.ds_partitioned__extract_quarter AS customer_id__ds_partitioned__extract_quarter
+            , subq_5.ds_partitioned__extract_month AS customer_id__ds_partitioned__extract_month
+            , subq_5.ds_partitioned__extract_week AS customer_id__ds_partitioned__extract_week
+            , subq_5.ds_partitioned__extract_day AS customer_id__ds_partitioned__extract_day
+            , subq_5.ds_partitioned__extract_dayofweek AS customer_id__ds_partitioned__extract_dayofweek
+            , subq_5.ds_partitioned__extract_dayofyear AS customer_id__ds_partitioned__extract_dayofyear
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
@@ -132,12 +209,26 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
+              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -154,11 +245,25 @@ FROM (
             --    'ds_partitioned__month',
             --    'ds_partitioned__quarter',
             --    'ds_partitioned__year',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
             --    'customer_id__ds_partitioned__day',
             --    'customer_id__ds_partitioned__week',
             --    'customer_id__ds_partitioned__month',
             --    'customer_id__ds_partitioned__quarter',
             --    'customer_id__ds_partitioned__year',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
             --    'customer_id']
             SELECT
               subq_4.ds_partitioned__day
@@ -166,11 +271,25 @@ FROM (
               , subq_4.ds_partitioned__month
               , subq_4.ds_partitioned__quarter
               , subq_4.ds_partitioned__year
+              , subq_4.ds_partitioned__extract_year
+              , subq_4.ds_partitioned__extract_quarter
+              , subq_4.ds_partitioned__extract_month
+              , subq_4.ds_partitioned__extract_week
+              , subq_4.ds_partitioned__extract_day
+              , subq_4.ds_partitioned__extract_dayofweek
+              , subq_4.ds_partitioned__extract_dayofyear
               , subq_4.customer_id__ds_partitioned__day
               , subq_4.customer_id__ds_partitioned__week
               , subq_4.customer_id__ds_partitioned__month
               , subq_4.customer_id__ds_partitioned__quarter
               , subq_4.customer_id__ds_partitioned__year
+              , subq_4.customer_id__ds_partitioned__extract_year
+              , subq_4.customer_id__ds_partitioned__extract_quarter
+              , subq_4.customer_id__ds_partitioned__extract_month
+              , subq_4.customer_id__ds_partitioned__extract_week
+              , subq_4.customer_id__ds_partitioned__extract_day
+              , subq_4.customer_id__ds_partitioned__extract_dayofweek
+              , subq_4.customer_id__ds_partitioned__extract_dayofyear
               , subq_4.customer_id
               , subq_4.customer_name
               , subq_4.customer_atomic_weight
@@ -186,6 +305,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -193,6 +319,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__year
+                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofyear
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
index 5c9089deaf..eb31a4fb3a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
@@ -23,31 +23,73 @@ FROM (
           , subq_1.ds__month
           , subq_1.ds__quarter
           , subq_1.ds__year
+          , subq_1.ds__extract_year
+          , subq_1.ds__extract_quarter
+          , subq_1.ds__extract_month
+          , subq_1.ds__extract_week
+          , subq_1.ds__extract_day
+          , subq_1.ds__extract_dayofweek
+          , subq_1.ds__extract_dayofyear
           , subq_1.ds_partitioned__day
           , subq_1.ds_partitioned__week
           , subq_1.ds_partitioned__month
           , subq_1.ds_partitioned__quarter
           , subq_1.ds_partitioned__year
+          , subq_1.ds_partitioned__extract_year
+          , subq_1.ds_partitioned__extract_quarter
+          , subq_1.ds_partitioned__extract_month
+          , subq_1.ds_partitioned__extract_week
+          , subq_1.ds_partitioned__extract_day
+          , subq_1.ds_partitioned__extract_dayofweek
+          , subq_1.ds_partitioned__extract_dayofyear
           , subq_1.paid_at__day
           , subq_1.paid_at__week
           , subq_1.paid_at__month
           , subq_1.paid_at__quarter
           , subq_1.paid_at__year
+          , subq_1.paid_at__extract_year
+          , subq_1.paid_at__extract_quarter
+          , subq_1.paid_at__extract_month
+          , subq_1.paid_at__extract_week
+          , subq_1.paid_at__extract_day
+          , subq_1.paid_at__extract_dayofweek
+          , subq_1.paid_at__extract_dayofyear
           , subq_1.booking__ds__day
           , subq_1.booking__ds__week
           , subq_1.booking__ds__month
           , subq_1.booking__ds__quarter
           , subq_1.booking__ds__year
+          , subq_1.booking__ds__extract_year
+          , subq_1.booking__ds__extract_quarter
+          , subq_1.booking__ds__extract_month
+          , subq_1.booking__ds__extract_week
+          , subq_1.booking__ds__extract_day
+          , subq_1.booking__ds__extract_dayofweek
+          , subq_1.booking__ds__extract_dayofyear
           , subq_1.booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month
           , subq_1.booking__ds_partitioned__quarter
           , subq_1.booking__ds_partitioned__year
+          , subq_1.booking__ds_partitioned__extract_year
+          , subq_1.booking__ds_partitioned__extract_quarter
+          , subq_1.booking__ds_partitioned__extract_month
+          , subq_1.booking__ds_partitioned__extract_week
+          , subq_1.booking__ds_partitioned__extract_day
+          , subq_1.booking__ds_partitioned__extract_dayofweek
+          , subq_1.booking__ds_partitioned__extract_dayofyear
           , subq_1.booking__paid_at__day
           , subq_1.booking__paid_at__week
           , subq_1.booking__paid_at__month
           , subq_1.booking__paid_at__quarter
           , subq_1.booking__paid_at__year
+          , subq_1.booking__paid_at__extract_year
+          , subq_1.booking__paid_at__extract_quarter
+          , subq_1.booking__paid_at__extract_month
+          , subq_1.booking__paid_at__extract_week
+          , subq_1.booking__paid_at__extract_day
+          , subq_1.booking__paid_at__extract_dayofweek
+          , subq_1.booking__paid_at__extract_dayofyear
           , subq_1.metric_time__day
           , subq_1.metric_time__week
           , subq_1.metric_time__month
@@ -82,31 +124,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -156,32 +240,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -217,21 +343,49 @@ CROSS JOIN (
           , subq_7.ds__month
           , subq_7.ds__quarter
           , subq_7.ds__year
+          , subq_7.ds__extract_year
+          , subq_7.ds__extract_quarter
+          , subq_7.ds__extract_month
+          , subq_7.ds__extract_week
+          , subq_7.ds__extract_day
+          , subq_7.ds__extract_dayofweek
+          , subq_7.ds__extract_dayofyear
           , subq_7.created_at__day
           , subq_7.created_at__week
           , subq_7.created_at__month
           , subq_7.created_at__quarter
           , subq_7.created_at__year
+          , subq_7.created_at__extract_year
+          , subq_7.created_at__extract_quarter
+          , subq_7.created_at__extract_month
+          , subq_7.created_at__extract_week
+          , subq_7.created_at__extract_day
+          , subq_7.created_at__extract_dayofweek
+          , subq_7.created_at__extract_dayofyear
           , subq_7.listing__ds__day
           , subq_7.listing__ds__week
           , subq_7.listing__ds__month
           , subq_7.listing__ds__quarter
           , subq_7.listing__ds__year
+          , subq_7.listing__ds__extract_year
+          , subq_7.listing__ds__extract_quarter
+          , subq_7.listing__ds__extract_month
+          , subq_7.listing__ds__extract_week
+          , subq_7.listing__ds__extract_day
+          , subq_7.listing__ds__extract_dayofweek
+          , subq_7.listing__ds__extract_dayofyear
           , subq_7.listing__created_at__day
           , subq_7.listing__created_at__week
           , subq_7.listing__created_at__month
           , subq_7.listing__created_at__quarter
           , subq_7.listing__created_at__year
+          , subq_7.listing__created_at__extract_year
+          , subq_7.listing__created_at__extract_quarter
+          , subq_7.listing__created_at__extract_month
+          , subq_7.listing__created_at__extract_week
+          , subq_7.listing__created_at__extract_day
+          , subq_7.listing__created_at__extract_dayofweek
+          , subq_7.listing__created_at__extract_dayofyear
           , subq_7.metric_time__day
           , subq_7.metric_time__week
           , subq_7.metric_time__month
@@ -257,21 +411,49 @@ CROSS JOIN (
             , subq_6.ds__month
             , subq_6.ds__quarter
             , subq_6.ds__year
+            , subq_6.ds__extract_year
+            , subq_6.ds__extract_quarter
+            , subq_6.ds__extract_month
+            , subq_6.ds__extract_week
+            , subq_6.ds__extract_day
+            , subq_6.ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear
             , subq_6.created_at__day
             , subq_6.created_at__week
             , subq_6.created_at__month
             , subq_6.created_at__quarter
             , subq_6.created_at__year
+            , subq_6.created_at__extract_year
+            , subq_6.created_at__extract_quarter
+            , subq_6.created_at__extract_month
+            , subq_6.created_at__extract_week
+            , subq_6.created_at__extract_day
+            , subq_6.created_at__extract_dayofweek
+            , subq_6.created_at__extract_dayofyear
             , subq_6.listing__ds__day
             , subq_6.listing__ds__week
             , subq_6.listing__ds__month
             , subq_6.listing__ds__quarter
             , subq_6.listing__ds__year
+            , subq_6.listing__ds__extract_year
+            , subq_6.listing__ds__extract_quarter
+            , subq_6.listing__ds__extract_month
+            , subq_6.listing__ds__extract_week
+            , subq_6.listing__ds__extract_day
+            , subq_6.listing__ds__extract_dayofweek
+            , subq_6.listing__ds__extract_dayofyear
             , subq_6.listing__created_at__day
             , subq_6.listing__created_at__week
             , subq_6.listing__created_at__month
             , subq_6.listing__created_at__quarter
             , subq_6.listing__created_at__year
+            , subq_6.listing__created_at__extract_year
+            , subq_6.listing__created_at__extract_quarter
+            , subq_6.listing__created_at__extract_month
+            , subq_6.listing__created_at__extract_week
+            , subq_6.listing__created_at__extract_day
+            , subq_6.listing__created_at__extract_dayofweek
+            , subq_6.listing__created_at__extract_dayofyear
             , subq_6.ds__day AS metric_time__day
             , subq_6.ds__week AS metric_time__week
             , subq_6.ds__month AS metric_time__month
@@ -300,11 +482,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -313,11 +509,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
index 14a9f0385a..dc0afd0f09 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
@@ -44,31 +44,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -118,32 +160,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -182,31 +266,73 @@ FROM (
                 , subq_5.ds__month
                 , subq_5.ds__quarter
                 , subq_5.ds__year
+                , subq_5.ds__extract_year
+                , subq_5.ds__extract_quarter
+                , subq_5.ds__extract_month
+                , subq_5.ds__extract_week
+                , subq_5.ds__extract_day
+                , subq_5.ds__extract_dayofweek
+                , subq_5.ds__extract_dayofyear
                 , subq_5.ds_partitioned__day
                 , subq_5.ds_partitioned__week
                 , subq_5.ds_partitioned__month
                 , subq_5.ds_partitioned__quarter
                 , subq_5.ds_partitioned__year
+                , subq_5.ds_partitioned__extract_year
+                , subq_5.ds_partitioned__extract_quarter
+                , subq_5.ds_partitioned__extract_month
+                , subq_5.ds_partitioned__extract_week
+                , subq_5.ds_partitioned__extract_day
+                , subq_5.ds_partitioned__extract_dayofweek
+                , subq_5.ds_partitioned__extract_dayofyear
                 , subq_5.paid_at__day
                 , subq_5.paid_at__week
                 , subq_5.paid_at__month
                 , subq_5.paid_at__quarter
                 , subq_5.paid_at__year
+                , subq_5.paid_at__extract_year
+                , subq_5.paid_at__extract_quarter
+                , subq_5.paid_at__extract_month
+                , subq_5.paid_at__extract_week
+                , subq_5.paid_at__extract_day
+                , subq_5.paid_at__extract_dayofweek
+                , subq_5.paid_at__extract_dayofyear
                 , subq_5.booking__ds__day
                 , subq_5.booking__ds__week
                 , subq_5.booking__ds__month
                 , subq_5.booking__ds__quarter
                 , subq_5.booking__ds__year
+                , subq_5.booking__ds__extract_year
+                , subq_5.booking__ds__extract_quarter
+                , subq_5.booking__ds__extract_month
+                , subq_5.booking__ds__extract_week
+                , subq_5.booking__ds__extract_day
+                , subq_5.booking__ds__extract_dayofweek
+                , subq_5.booking__ds__extract_dayofyear
                 , subq_5.booking__ds_partitioned__day
                 , subq_5.booking__ds_partitioned__week
                 , subq_5.booking__ds_partitioned__month
                 , subq_5.booking__ds_partitioned__quarter
                 , subq_5.booking__ds_partitioned__year
+                , subq_5.booking__ds_partitioned__extract_year
+                , subq_5.booking__ds_partitioned__extract_quarter
+                , subq_5.booking__ds_partitioned__extract_month
+                , subq_5.booking__ds_partitioned__extract_week
+                , subq_5.booking__ds_partitioned__extract_day
+                , subq_5.booking__ds_partitioned__extract_dayofweek
+                , subq_5.booking__ds_partitioned__extract_dayofyear
                 , subq_5.booking__paid_at__day
                 , subq_5.booking__paid_at__week
                 , subq_5.booking__paid_at__month
                 , subq_5.booking__paid_at__quarter
                 , subq_5.booking__paid_at__year
+                , subq_5.booking__paid_at__extract_year
+                , subq_5.booking__paid_at__extract_quarter
+                , subq_5.booking__paid_at__extract_month
+                , subq_5.booking__paid_at__extract_week
+                , subq_5.booking__paid_at__extract_day
+                , subq_5.booking__paid_at__extract_dayofweek
+                , subq_5.booking__paid_at__extract_dayofyear
                 , subq_5.ds__day AS metric_time__day
                 , subq_5.ds__week AS metric_time__week
                 , subq_5.ds__month AS metric_time__month
@@ -256,32 +382,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -332,31 +500,73 @@ FROM (
             , subq_12.ds__month
             , subq_12.ds__quarter
             , subq_12.ds__year
+            , subq_12.ds__extract_year
+            , subq_12.ds__extract_quarter
+            , subq_12.ds__extract_month
+            , subq_12.ds__extract_week
+            , subq_12.ds__extract_day
+            , subq_12.ds__extract_dayofweek
+            , subq_12.ds__extract_dayofyear
             , subq_12.ds_partitioned__day
             , subq_12.ds_partitioned__week
             , subq_12.ds_partitioned__month
             , subq_12.ds_partitioned__quarter
             , subq_12.ds_partitioned__year
+            , subq_12.ds_partitioned__extract_year
+            , subq_12.ds_partitioned__extract_quarter
+            , subq_12.ds_partitioned__extract_month
+            , subq_12.ds_partitioned__extract_week
+            , subq_12.ds_partitioned__extract_day
+            , subq_12.ds_partitioned__extract_dayofweek
+            , subq_12.ds_partitioned__extract_dayofyear
             , subq_12.paid_at__day
             , subq_12.paid_at__week
             , subq_12.paid_at__month
             , subq_12.paid_at__quarter
             , subq_12.paid_at__year
+            , subq_12.paid_at__extract_year
+            , subq_12.paid_at__extract_quarter
+            , subq_12.paid_at__extract_month
+            , subq_12.paid_at__extract_week
+            , subq_12.paid_at__extract_day
+            , subq_12.paid_at__extract_dayofweek
+            , subq_12.paid_at__extract_dayofyear
             , subq_12.booking__ds__day
             , subq_12.booking__ds__week
             , subq_12.booking__ds__month
             , subq_12.booking__ds__quarter
             , subq_12.booking__ds__year
+            , subq_12.booking__ds__extract_year
+            , subq_12.booking__ds__extract_quarter
+            , subq_12.booking__ds__extract_month
+            , subq_12.booking__ds__extract_week
+            , subq_12.booking__ds__extract_day
+            , subq_12.booking__ds__extract_dayofweek
+            , subq_12.booking__ds__extract_dayofyear
             , subq_12.booking__ds_partitioned__day
             , subq_12.booking__ds_partitioned__week
             , subq_12.booking__ds_partitioned__month
             , subq_12.booking__ds_partitioned__quarter
             , subq_12.booking__ds_partitioned__year
+            , subq_12.booking__ds_partitioned__extract_year
+            , subq_12.booking__ds_partitioned__extract_quarter
+            , subq_12.booking__ds_partitioned__extract_month
+            , subq_12.booking__ds_partitioned__extract_week
+            , subq_12.booking__ds_partitioned__extract_day
+            , subq_12.booking__ds_partitioned__extract_dayofweek
+            , subq_12.booking__ds_partitioned__extract_dayofyear
             , subq_12.booking__paid_at__day
             , subq_12.booking__paid_at__week
             , subq_12.booking__paid_at__month
             , subq_12.booking__paid_at__quarter
             , subq_12.booking__paid_at__year
+            , subq_12.booking__paid_at__extract_year
+            , subq_12.booking__paid_at__extract_quarter
+            , subq_12.booking__paid_at__extract_month
+            , subq_12.booking__paid_at__extract_week
+            , subq_12.booking__paid_at__extract_day
+            , subq_12.booking__paid_at__extract_dayofweek
+            , subq_12.booking__paid_at__extract_dayofyear
             , subq_12.ds__day AS metric_time__day
             , subq_12.ds__week AS metric_time__week
             , subq_12.ds__month AS metric_time__month
@@ -406,32 +616,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -480,31 +732,73 @@ FROM (
             , subq_17.ds__month
             , subq_17.ds__quarter
             , subq_17.ds__year
+            , subq_17.ds__extract_year
+            , subq_17.ds__extract_quarter
+            , subq_17.ds__extract_month
+            , subq_17.ds__extract_week
+            , subq_17.ds__extract_day
+            , subq_17.ds__extract_dayofweek
+            , subq_17.ds__extract_dayofyear
             , subq_17.ds_partitioned__day
             , subq_17.ds_partitioned__week
             , subq_17.ds_partitioned__month
             , subq_17.ds_partitioned__quarter
             , subq_17.ds_partitioned__year
+            , subq_17.ds_partitioned__extract_year
+            , subq_17.ds_partitioned__extract_quarter
+            , subq_17.ds_partitioned__extract_month
+            , subq_17.ds_partitioned__extract_week
+            , subq_17.ds_partitioned__extract_day
+            , subq_17.ds_partitioned__extract_dayofweek
+            , subq_17.ds_partitioned__extract_dayofyear
             , subq_17.paid_at__day
             , subq_17.paid_at__week
             , subq_17.paid_at__month
             , subq_17.paid_at__quarter
             , subq_17.paid_at__year
+            , subq_17.paid_at__extract_year
+            , subq_17.paid_at__extract_quarter
+            , subq_17.paid_at__extract_month
+            , subq_17.paid_at__extract_week
+            , subq_17.paid_at__extract_day
+            , subq_17.paid_at__extract_dayofweek
+            , subq_17.paid_at__extract_dayofyear
             , subq_17.booking__ds__day
             , subq_17.booking__ds__week
             , subq_17.booking__ds__month
             , subq_17.booking__ds__quarter
             , subq_17.booking__ds__year
+            , subq_17.booking__ds__extract_year
+            , subq_17.booking__ds__extract_quarter
+            , subq_17.booking__ds__extract_month
+            , subq_17.booking__ds__extract_week
+            , subq_17.booking__ds__extract_day
+            , subq_17.booking__ds__extract_dayofweek
+            , subq_17.booking__ds__extract_dayofyear
             , subq_17.booking__ds_partitioned__day
             , subq_17.booking__ds_partitioned__week
             , subq_17.booking__ds_partitioned__month
             , subq_17.booking__ds_partitioned__quarter
             , subq_17.booking__ds_partitioned__year
+            , subq_17.booking__ds_partitioned__extract_year
+            , subq_17.booking__ds_partitioned__extract_quarter
+            , subq_17.booking__ds_partitioned__extract_month
+            , subq_17.booking__ds_partitioned__extract_week
+            , subq_17.booking__ds_partitioned__extract_day
+            , subq_17.booking__ds_partitioned__extract_dayofweek
+            , subq_17.booking__ds_partitioned__extract_dayofyear
             , subq_17.booking__paid_at__day
             , subq_17.booking__paid_at__week
             , subq_17.booking__paid_at__month
             , subq_17.booking__paid_at__quarter
             , subq_17.booking__paid_at__year
+            , subq_17.booking__paid_at__extract_year
+            , subq_17.booking__paid_at__extract_quarter
+            , subq_17.booking__paid_at__extract_month
+            , subq_17.booking__paid_at__extract_week
+            , subq_17.booking__paid_at__extract_day
+            , subq_17.booking__paid_at__extract_dayofweek
+            , subq_17.booking__paid_at__extract_dayofyear
             , subq_17.ds__day AS metric_time__day
             , subq_17.ds__week AS metric_time__week
             , subq_17.ds__month AS metric_time__month
@@ -554,32 +848,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql
index be96decab5..63116a5458 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql
@@ -45,32 +45,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
index a5288e7009..a53f3a075b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
@@ -36,21 +36,49 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.verification__ds__day
             , subq_0.verification__ds__week
             , subq_0.verification__ds__month
             , subq_0.verification__ds__quarter
             , subq_0.verification__ds__year
+            , subq_0.verification__ds__extract_year
+            , subq_0.verification__ds__extract_quarter
+            , subq_0.verification__ds__extract_month
+            , subq_0.verification__ds__extract_week
+            , subq_0.verification__ds__extract_day
+            , subq_0.verification__ds__extract_dayofweek
+            , subq_0.verification__ds__extract_dayofyear
             , subq_0.verification__ds_partitioned__day
             , subq_0.verification__ds_partitioned__week
             , subq_0.verification__ds_partitioned__month
             , subq_0.verification__ds_partitioned__quarter
             , subq_0.verification__ds_partitioned__year
+            , subq_0.verification__ds_partitioned__extract_year
+            , subq_0.verification__ds_partitioned__extract_quarter
+            , subq_0.verification__ds_partitioned__extract_month
+            , subq_0.verification__ds_partitioned__extract_week
+            , subq_0.verification__ds_partitioned__extract_day
+            , subq_0.verification__ds_partitioned__extract_dayofweek
+            , subq_0.verification__ds_partitioned__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -71,22 +99,50 @@ FROM (
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -110,32 +166,74 @@ FROM (
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS ds__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_dayofyear
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS created_at__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofyear
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds) AS user__ds__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS user__ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS user__ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS user__ds__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofyear
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS user__created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS user__created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS user__created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS user__created_at__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofyear
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofyear
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql
index c65a58a300..d88d2d32f3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -54,12 +82,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
index 603dac8609..094486f462 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
index adfa1c3f03..a8a26c9899 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -55,12 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index 48a1b43de5..c400372dd4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 08a913aa57..30ab4c1851 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -55,12 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index ed796b148d..ef337f422c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql
index 782ccc2826..16b897731d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql
@@ -31,32 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -83,11 +125,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -96,11 +152,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql
index 0f449eb59e..7dd5c3b39d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql
@@ -20,32 +20,74 @@ SELECT
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql
index ee19129508..e240956212 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql
@@ -20,32 +20,74 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql
index 214766cb17..073c7964da 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -165,31 +249,73 @@ FULL OUTER JOIN (
           , subq_5.ds__month
           , subq_5.ds__quarter
           , subq_5.ds__year
+          , subq_5.ds__extract_year
+          , subq_5.ds__extract_quarter
+          , subq_5.ds__extract_month
+          , subq_5.ds__extract_week
+          , subq_5.ds__extract_day
+          , subq_5.ds__extract_dayofweek
+          , subq_5.ds__extract_dayofyear
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
           , subq_5.ds_partitioned__quarter
           , subq_5.ds_partitioned__year
+          , subq_5.ds_partitioned__extract_year
+          , subq_5.ds_partitioned__extract_quarter
+          , subq_5.ds_partitioned__extract_month
+          , subq_5.ds_partitioned__extract_week
+          , subq_5.ds_partitioned__extract_day
+          , subq_5.ds_partitioned__extract_dayofweek
+          , subq_5.ds_partitioned__extract_dayofyear
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
           , subq_5.paid_at__quarter
           , subq_5.paid_at__year
+          , subq_5.paid_at__extract_year
+          , subq_5.paid_at__extract_quarter
+          , subq_5.paid_at__extract_month
+          , subq_5.paid_at__extract_week
+          , subq_5.paid_at__extract_day
+          , subq_5.paid_at__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
           , subq_5.booking__ds__quarter
           , subq_5.booking__ds__year
+          , subq_5.booking__ds__extract_year
+          , subq_5.booking__ds__extract_quarter
+          , subq_5.booking__ds__extract_month
+          , subq_5.booking__ds__extract_week
+          , subq_5.booking__ds__extract_day
+          , subq_5.booking__ds__extract_dayofweek
+          , subq_5.booking__ds__extract_dayofyear
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
           , subq_5.booking__ds_partitioned__quarter
           , subq_5.booking__ds_partitioned__year
+          , subq_5.booking__ds_partitioned__extract_year
+          , subq_5.booking__ds_partitioned__extract_quarter
+          , subq_5.booking__ds_partitioned__extract_month
+          , subq_5.booking__ds_partitioned__extract_week
+          , subq_5.booking__ds_partitioned__extract_day
+          , subq_5.booking__ds_partitioned__extract_dayofweek
+          , subq_5.booking__ds_partitioned__extract_dayofyear
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
           , subq_5.booking__paid_at__quarter
           , subq_5.booking__paid_at__year
+          , subq_5.booking__paid_at__extract_year
+          , subq_5.booking__paid_at__extract_quarter
+          , subq_5.booking__paid_at__extract_month
+          , subq_5.booking__paid_at__extract_week
+          , subq_5.booking__paid_at__extract_day
+          , subq_5.booking__paid_at__extract_dayofweek
+          , subq_5.booking__paid_at__extract_dayofyear
           , subq_5.ds__day AS metric_time__day
           , subq_5.ds__week AS metric_time__week
           , subq_5.ds__month AS metric_time__month
@@ -239,32 +365,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql
index 63637a9433..c80b16baf0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql
@@ -44,32 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -96,11 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -109,11 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index f9ef4e1727..5f9a321abd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -51,31 +51,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -125,32 +167,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -175,21 +259,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -218,11 +330,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -231,11 +357,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -296,21 +436,49 @@ FROM (
                 , subq_10.ds__month
                 , subq_10.ds__quarter
                 , subq_10.ds__year
+                , subq_10.ds__extract_year
+                , subq_10.ds__extract_quarter
+                , subq_10.ds__extract_month
+                , subq_10.ds__extract_week
+                , subq_10.ds__extract_day
+                , subq_10.ds__extract_dayofweek
+                , subq_10.ds__extract_dayofyear
                 , subq_10.ds_partitioned__day
                 , subq_10.ds_partitioned__week
                 , subq_10.ds_partitioned__month
                 , subq_10.ds_partitioned__quarter
                 , subq_10.ds_partitioned__year
+                , subq_10.ds_partitioned__extract_year
+                , subq_10.ds_partitioned__extract_quarter
+                , subq_10.ds_partitioned__extract_month
+                , subq_10.ds_partitioned__extract_week
+                , subq_10.ds_partitioned__extract_day
+                , subq_10.ds_partitioned__extract_dayofweek
+                , subq_10.ds_partitioned__extract_dayofyear
                 , subq_10.view__ds__day
                 , subq_10.view__ds__week
                 , subq_10.view__ds__month
                 , subq_10.view__ds__quarter
                 , subq_10.view__ds__year
+                , subq_10.view__ds__extract_year
+                , subq_10.view__ds__extract_quarter
+                , subq_10.view__ds__extract_month
+                , subq_10.view__ds__extract_week
+                , subq_10.view__ds__extract_day
+                , subq_10.view__ds__extract_dayofweek
+                , subq_10.view__ds__extract_dayofyear
                 , subq_10.view__ds_partitioned__day
                 , subq_10.view__ds_partitioned__week
                 , subq_10.view__ds_partitioned__month
                 , subq_10.view__ds_partitioned__quarter
                 , subq_10.view__ds_partitioned__year
+                , subq_10.view__ds_partitioned__extract_year
+                , subq_10.view__ds_partitioned__extract_quarter
+                , subq_10.view__ds_partitioned__extract_month
+                , subq_10.view__ds_partitioned__extract_week
+                , subq_10.view__ds_partitioned__extract_day
+                , subq_10.view__ds_partitioned__extract_dayofweek
+                , subq_10.view__ds_partitioned__extract_dayofyear
                 , subq_10.ds__day AS metric_time__day
                 , subq_10.ds__week AS metric_time__week
                 , subq_10.ds__month AS metric_time__month
@@ -330,21 +498,49 @@ FROM (
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS ds__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_dayofyear
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC('week', views_source_src_10009.ds) AS view__ds__week
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS view__ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS view__ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS view__ds__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS view__ds__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS view__ds__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS view__ds__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS view__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_dayofyear
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofyear
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -367,21 +563,49 @@ FROM (
                 , subq_13.ds__month
                 , subq_13.ds__quarter
                 , subq_13.ds__year
+                , subq_13.ds__extract_year
+                , subq_13.ds__extract_quarter
+                , subq_13.ds__extract_month
+                , subq_13.ds__extract_week
+                , subq_13.ds__extract_day
+                , subq_13.ds__extract_dayofweek
+                , subq_13.ds__extract_dayofyear
                 , subq_13.created_at__day
                 , subq_13.created_at__week
                 , subq_13.created_at__month
                 , subq_13.created_at__quarter
                 , subq_13.created_at__year
+                , subq_13.created_at__extract_year
+                , subq_13.created_at__extract_quarter
+                , subq_13.created_at__extract_month
+                , subq_13.created_at__extract_week
+                , subq_13.created_at__extract_day
+                , subq_13.created_at__extract_dayofweek
+                , subq_13.created_at__extract_dayofyear
                 , subq_13.listing__ds__day
                 , subq_13.listing__ds__week
                 , subq_13.listing__ds__month
                 , subq_13.listing__ds__quarter
                 , subq_13.listing__ds__year
+                , subq_13.listing__ds__extract_year
+                , subq_13.listing__ds__extract_quarter
+                , subq_13.listing__ds__extract_month
+                , subq_13.listing__ds__extract_week
+                , subq_13.listing__ds__extract_day
+                , subq_13.listing__ds__extract_dayofweek
+                , subq_13.listing__ds__extract_dayofyear
                 , subq_13.listing__created_at__day
                 , subq_13.listing__created_at__week
                 , subq_13.listing__created_at__month
                 , subq_13.listing__created_at__quarter
                 , subq_13.listing__created_at__year
+                , subq_13.listing__created_at__extract_year
+                , subq_13.listing__created_at__extract_quarter
+                , subq_13.listing__created_at__extract_month
+                , subq_13.listing__created_at__extract_week
+                , subq_13.listing__created_at__extract_day
+                , subq_13.listing__created_at__extract_dayofweek
+                , subq_13.listing__created_at__extract_dayofyear
                 , subq_13.ds__day AS metric_time__day
                 , subq_13.ds__week AS metric_time__week
                 , subq_13.ds__month AS metric_time__month
@@ -410,11 +634,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -423,11 +661,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index e424fa31af..b2d5615477 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -47,32 +47,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -99,11 +141,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -112,11 +168,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql
index 48583b238a..b6f01861d7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql
@@ -44,32 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -96,11 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -109,11 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql
index 4ca35f2544..d480357663 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql
@@ -38,32 +38,74 @@ FROM (
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
index b515ad2da5..f52c8d6acf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
index 5eb893b84a..4e79154b70 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
index 2393630095..f44071348d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
@@ -18,11 +18,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -40,11 +54,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
index 9ced88e0cc..4c321e73b0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index dd00d2b15e..4821d797fe 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_1.ds__month
         , subq_1.ds__quarter
         , subq_1.ds__year
+        , subq_1.ds__extract_year
+        , subq_1.ds__extract_quarter
+        , subq_1.ds__extract_month
+        , subq_1.ds__extract_week
+        , subq_1.ds__extract_day
+        , subq_1.ds__extract_dayofweek
+        , subq_1.ds__extract_dayofyear
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
         , subq_1.company__ds__quarter
         , subq_1.company__ds__year
+        , subq_1.company__ds__extract_year
+        , subq_1.company__ds__extract_quarter
+        , subq_1.company__ds__extract_month
+        , subq_1.company__ds__extract_week
+        , subq_1.company__ds__extract_day
+        , subq_1.company__ds__extract_dayofweek
+        , subq_1.company__ds__extract_dayofyear
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -42,11 +56,25 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
           , subq_0.company__ds__quarter
           , subq_0.company__ds__year
+          , subq_0.company__ds__extract_year
+          , subq_0.company__ds__extract_quarter
+          , subq_0.company__ds__extract_month
+          , subq_0.company__ds__extract_week
+          , subq_0.company__ds__extract_day
+          , subq_0.company__ds__extract_dayofweek
+          , subq_0.company__ds__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
index 658dcf3357..2a39c9282f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_1.ds__month
         , subq_1.ds__quarter
         , subq_1.ds__year
+        , subq_1.ds__extract_year
+        , subq_1.ds__extract_quarter
+        , subq_1.ds__extract_month
+        , subq_1.ds__extract_week
+        , subq_1.ds__extract_day
+        , subq_1.ds__extract_dayofweek
+        , subq_1.ds__extract_dayofyear
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
         , subq_1.company__ds__quarter
         , subq_1.company__ds__year
+        , subq_1.company__ds__extract_year
+        , subq_1.company__ds__extract_quarter
+        , subq_1.company__ds__extract_month
+        , subq_1.company__ds__extract_week
+        , subq_1.company__ds__extract_day
+        , subq_1.company__ds__extract_dayofweek
+        , subq_1.company__ds__extract_dayofyear
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -42,11 +56,25 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
           , subq_0.company__ds__quarter
           , subq_0.company__ds__year
+          , subq_0.company__ds__extract_year
+          , subq_0.company__ds__extract_quarter
+          , subq_0.company__ds__extract_month
+          , subq_0.company__ds__extract_week
+          , subq_0.company__ds__extract_day
+          , subq_0.company__ds__extract_dayofweek
+          , subq_0.company__ds__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql
index 9bafb5e1f6..82ded0a878 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -170,31 +254,73 @@ FROM (
             , subq_5.ds__month
             , subq_5.ds__quarter
             , subq_5.ds__year
+            , subq_5.ds__extract_year
+            , subq_5.ds__extract_quarter
+            , subq_5.ds__extract_month
+            , subq_5.ds__extract_week
+            , subq_5.ds__extract_day
+            , subq_5.ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear
             , subq_5.ds_partitioned__day
             , subq_5.ds_partitioned__week
             , subq_5.ds_partitioned__month
             , subq_5.ds_partitioned__quarter
             , subq_5.ds_partitioned__year
+            , subq_5.ds_partitioned__extract_year
+            , subq_5.ds_partitioned__extract_quarter
+            , subq_5.ds_partitioned__extract_month
+            , subq_5.ds_partitioned__extract_week
+            , subq_5.ds_partitioned__extract_day
+            , subq_5.ds_partitioned__extract_dayofweek
+            , subq_5.ds_partitioned__extract_dayofyear
             , subq_5.paid_at__day
             , subq_5.paid_at__week
             , subq_5.paid_at__month
             , subq_5.paid_at__quarter
             , subq_5.paid_at__year
+            , subq_5.paid_at__extract_year
+            , subq_5.paid_at__extract_quarter
+            , subq_5.paid_at__extract_month
+            , subq_5.paid_at__extract_week
+            , subq_5.paid_at__extract_day
+            , subq_5.paid_at__extract_dayofweek
+            , subq_5.paid_at__extract_dayofyear
             , subq_5.booking__ds__day
             , subq_5.booking__ds__week
             , subq_5.booking__ds__month
             , subq_5.booking__ds__quarter
             , subq_5.booking__ds__year
+            , subq_5.booking__ds__extract_year
+            , subq_5.booking__ds__extract_quarter
+            , subq_5.booking__ds__extract_month
+            , subq_5.booking__ds__extract_week
+            , subq_5.booking__ds__extract_day
+            , subq_5.booking__ds__extract_dayofweek
+            , subq_5.booking__ds__extract_dayofyear
             , subq_5.booking__ds_partitioned__day
             , subq_5.booking__ds_partitioned__week
             , subq_5.booking__ds_partitioned__month
             , subq_5.booking__ds_partitioned__quarter
             , subq_5.booking__ds_partitioned__year
+            , subq_5.booking__ds_partitioned__extract_year
+            , subq_5.booking__ds_partitioned__extract_quarter
+            , subq_5.booking__ds_partitioned__extract_month
+            , subq_5.booking__ds_partitioned__extract_week
+            , subq_5.booking__ds_partitioned__extract_day
+            , subq_5.booking__ds_partitioned__extract_dayofweek
+            , subq_5.booking__ds_partitioned__extract_dayofyear
             , subq_5.booking__paid_at__day
             , subq_5.booking__paid_at__week
             , subq_5.booking__paid_at__month
             , subq_5.booking__paid_at__quarter
             , subq_5.booking__paid_at__year
+            , subq_5.booking__paid_at__extract_year
+            , subq_5.booking__paid_at__extract_quarter
+            , subq_5.booking__paid_at__extract_month
+            , subq_5.booking__paid_at__extract_week
+            , subq_5.booking__paid_at__extract_day
+            , subq_5.booking__paid_at__extract_dayofweek
+            , subq_5.booking__paid_at__extract_dayofyear
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -244,32 +370,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
index edbbe545fd..f21c6e33a7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index c97b8fd930..34b929887f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
index 99b1685e16..dc71eeec86 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 7b95fddac1..de37ca714a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 954c695598..eb915512e3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -33,31 +33,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -93,31 +135,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -167,32 +251,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -235,31 +361,73 @@ FROM (
             , subq_9.ds__month AS ds__month
             , subq_9.ds__quarter AS ds__quarter
             , subq_9.ds__year AS ds__year
+            , subq_9.ds__extract_year AS ds__extract_year
+            , subq_9.ds__extract_quarter AS ds__extract_quarter
+            , subq_9.ds__extract_month AS ds__extract_month
+            , subq_9.ds__extract_week AS ds__extract_week
+            , subq_9.ds__extract_day AS ds__extract_day
+            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
             , subq_9.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_9.ds_partitioned__year AS ds_partitioned__year
+            , subq_9.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_9.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
             , subq_9.paid_at__quarter AS paid_at__quarter
             , subq_9.paid_at__year AS paid_at__year
+            , subq_9.paid_at__extract_year AS paid_at__extract_year
+            , subq_9.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_9.paid_at__extract_month AS paid_at__extract_month
+            , subq_9.paid_at__extract_week AS paid_at__extract_week
+            , subq_9.paid_at__extract_day AS paid_at__extract_day
+            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
             , subq_9.booking__ds__quarter AS booking__ds__quarter
             , subq_9.booking__ds__year AS booking__ds__year
+            , subq_9.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_9.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_9.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_9.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_9.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_9.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_9.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_9.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_9.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
             , subq_9.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_9.booking__paid_at__year AS booking__paid_at__year
+            , subq_9.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_9.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -295,31 +463,73 @@ FROM (
               , subq_8.ds__month
               , subq_8.ds__quarter
               , subq_8.ds__year
+              , subq_8.ds__extract_year
+              , subq_8.ds__extract_quarter
+              , subq_8.ds__extract_month
+              , subq_8.ds__extract_week
+              , subq_8.ds__extract_day
+              , subq_8.ds__extract_dayofweek
+              , subq_8.ds__extract_dayofyear
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
               , subq_8.ds_partitioned__quarter
               , subq_8.ds_partitioned__year
+              , subq_8.ds_partitioned__extract_year
+              , subq_8.ds_partitioned__extract_quarter
+              , subq_8.ds_partitioned__extract_month
+              , subq_8.ds_partitioned__extract_week
+              , subq_8.ds_partitioned__extract_day
+              , subq_8.ds_partitioned__extract_dayofweek
+              , subq_8.ds_partitioned__extract_dayofyear
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
               , subq_8.paid_at__quarter
               , subq_8.paid_at__year
+              , subq_8.paid_at__extract_year
+              , subq_8.paid_at__extract_quarter
+              , subq_8.paid_at__extract_month
+              , subq_8.paid_at__extract_week
+              , subq_8.paid_at__extract_day
+              , subq_8.paid_at__extract_dayofweek
+              , subq_8.paid_at__extract_dayofyear
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
               , subq_8.booking__ds__quarter
               , subq_8.booking__ds__year
+              , subq_8.booking__ds__extract_year
+              , subq_8.booking__ds__extract_quarter
+              , subq_8.booking__ds__extract_month
+              , subq_8.booking__ds__extract_week
+              , subq_8.booking__ds__extract_day
+              , subq_8.booking__ds__extract_dayofweek
+              , subq_8.booking__ds__extract_dayofyear
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
               , subq_8.booking__ds_partitioned__quarter
               , subq_8.booking__ds_partitioned__year
+              , subq_8.booking__ds_partitioned__extract_year
+              , subq_8.booking__ds_partitioned__extract_quarter
+              , subq_8.booking__ds_partitioned__extract_month
+              , subq_8.booking__ds_partitioned__extract_week
+              , subq_8.booking__ds_partitioned__extract_day
+              , subq_8.booking__ds_partitioned__extract_dayofweek
+              , subq_8.booking__ds_partitioned__extract_dayofyear
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
               , subq_8.booking__paid_at__quarter
               , subq_8.booking__paid_at__year
+              , subq_8.booking__paid_at__extract_year
+              , subq_8.booking__paid_at__extract_quarter
+              , subq_8.booking__paid_at__extract_month
+              , subq_8.booking__paid_at__extract_week
+              , subq_8.booking__paid_at__extract_day
+              , subq_8.booking__paid_at__extract_dayofweek
+              , subq_8.booking__paid_at__extract_dayofyear
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -369,32 +579,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 40acec4cf6..bd5554a5b6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -33,31 +33,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -93,31 +135,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -167,32 +251,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -236,31 +362,73 @@ FROM (
             , subq_9.ds__month AS ds__month
             , subq_9.ds__quarter AS ds__quarter
             , subq_9.ds__year AS ds__year
+            , subq_9.ds__extract_year AS ds__extract_year
+            , subq_9.ds__extract_quarter AS ds__extract_quarter
+            , subq_9.ds__extract_month AS ds__extract_month
+            , subq_9.ds__extract_week AS ds__extract_week
+            , subq_9.ds__extract_day AS ds__extract_day
+            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
             , subq_9.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_9.ds_partitioned__year AS ds_partitioned__year
+            , subq_9.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_9.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
             , subq_9.paid_at__quarter AS paid_at__quarter
             , subq_9.paid_at__year AS paid_at__year
+            , subq_9.paid_at__extract_year AS paid_at__extract_year
+            , subq_9.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_9.paid_at__extract_month AS paid_at__extract_month
+            , subq_9.paid_at__extract_week AS paid_at__extract_week
+            , subq_9.paid_at__extract_day AS paid_at__extract_day
+            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
             , subq_9.booking__ds__quarter AS booking__ds__quarter
             , subq_9.booking__ds__year AS booking__ds__year
+            , subq_9.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_9.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_9.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_9.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_9.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_9.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_9.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_9.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_9.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
             , subq_9.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_9.booking__paid_at__year AS booking__paid_at__year
+            , subq_9.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_9.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -296,31 +464,73 @@ FROM (
               , subq_8.ds__month
               , subq_8.ds__quarter
               , subq_8.ds__year
+              , subq_8.ds__extract_year
+              , subq_8.ds__extract_quarter
+              , subq_8.ds__extract_month
+              , subq_8.ds__extract_week
+              , subq_8.ds__extract_day
+              , subq_8.ds__extract_dayofweek
+              , subq_8.ds__extract_dayofyear
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
               , subq_8.ds_partitioned__quarter
               , subq_8.ds_partitioned__year
+              , subq_8.ds_partitioned__extract_year
+              , subq_8.ds_partitioned__extract_quarter
+              , subq_8.ds_partitioned__extract_month
+              , subq_8.ds_partitioned__extract_week
+              , subq_8.ds_partitioned__extract_day
+              , subq_8.ds_partitioned__extract_dayofweek
+              , subq_8.ds_partitioned__extract_dayofyear
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
               , subq_8.paid_at__quarter
               , subq_8.paid_at__year
+              , subq_8.paid_at__extract_year
+              , subq_8.paid_at__extract_quarter
+              , subq_8.paid_at__extract_month
+              , subq_8.paid_at__extract_week
+              , subq_8.paid_at__extract_day
+              , subq_8.paid_at__extract_dayofweek
+              , subq_8.paid_at__extract_dayofyear
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
               , subq_8.booking__ds__quarter
               , subq_8.booking__ds__year
+              , subq_8.booking__ds__extract_year
+              , subq_8.booking__ds__extract_quarter
+              , subq_8.booking__ds__extract_month
+              , subq_8.booking__ds__extract_week
+              , subq_8.booking__ds__extract_day
+              , subq_8.booking__ds__extract_dayofweek
+              , subq_8.booking__ds__extract_dayofyear
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
               , subq_8.booking__ds_partitioned__quarter
               , subq_8.booking__ds_partitioned__year
+              , subq_8.booking__ds_partitioned__extract_year
+              , subq_8.booking__ds_partitioned__extract_quarter
+              , subq_8.booking__ds_partitioned__extract_month
+              , subq_8.booking__ds_partitioned__extract_week
+              , subq_8.booking__ds_partitioned__extract_day
+              , subq_8.booking__ds_partitioned__extract_dayofweek
+              , subq_8.booking__ds_partitioned__extract_dayofyear
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
               , subq_8.booking__paid_at__quarter
               , subq_8.booking__paid_at__year
+              , subq_8.booking__paid_at__extract_year
+              , subq_8.booking__paid_at__extract_quarter
+              , subq_8.booking__paid_at__extract_month
+              , subq_8.booking__paid_at__extract_week
+              , subq_8.booking__paid_at__extract_day
+              , subq_8.booking__paid_at__extract_dayofweek
+              , subq_8.booking__paid_at__extract_dayofyear
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -370,32 +580,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
index b2b0889336..209f65b14c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_4.ds__month AS ds__month
           , subq_4.ds__quarter AS ds__quarter
           , subq_4.ds__year AS ds__year
+          , subq_4.ds__extract_year AS ds__extract_year
+          , subq_4.ds__extract_quarter AS ds__extract_quarter
+          , subq_4.ds__extract_month AS ds__extract_month
+          , subq_4.ds__extract_week AS ds__extract_week
+          , subq_4.ds__extract_day AS ds__extract_day
+          , subq_4.ds__extract_dayofweek AS ds__extract_dayofweek
+          , subq_4.ds__extract_dayofyear AS ds__extract_dayofyear
           , subq_4.ds_partitioned__day AS ds_partitioned__day
           , subq_4.ds_partitioned__week AS ds_partitioned__week
           , subq_4.ds_partitioned__month AS ds_partitioned__month
           , subq_4.ds_partitioned__quarter AS ds_partitioned__quarter
           , subq_4.ds_partitioned__year AS ds_partitioned__year
+          , subq_4.ds_partitioned__extract_year AS ds_partitioned__extract_year
+          , subq_4.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+          , subq_4.ds_partitioned__extract_month AS ds_partitioned__extract_month
+          , subq_4.ds_partitioned__extract_week AS ds_partitioned__extract_week
+          , subq_4.ds_partitioned__extract_day AS ds_partitioned__extract_day
+          , subq_4.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+          , subq_4.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
           , subq_4.paid_at__day AS paid_at__day
           , subq_4.paid_at__week AS paid_at__week
           , subq_4.paid_at__month AS paid_at__month
           , subq_4.paid_at__quarter AS paid_at__quarter
           , subq_4.paid_at__year AS paid_at__year
+          , subq_4.paid_at__extract_year AS paid_at__extract_year
+          , subq_4.paid_at__extract_quarter AS paid_at__extract_quarter
+          , subq_4.paid_at__extract_month AS paid_at__extract_month
+          , subq_4.paid_at__extract_week AS paid_at__extract_week
+          , subq_4.paid_at__extract_day AS paid_at__extract_day
+          , subq_4.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+          , subq_4.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
           , subq_4.booking__ds__day AS booking__ds__day
           , subq_4.booking__ds__week AS booking__ds__week
           , subq_4.booking__ds__month AS booking__ds__month
           , subq_4.booking__ds__quarter AS booking__ds__quarter
           , subq_4.booking__ds__year AS booking__ds__year
+          , subq_4.booking__ds__extract_year AS booking__ds__extract_year
+          , subq_4.booking__ds__extract_quarter AS booking__ds__extract_quarter
+          , subq_4.booking__ds__extract_month AS booking__ds__extract_month
+          , subq_4.booking__ds__extract_week AS booking__ds__extract_week
+          , subq_4.booking__ds__extract_day AS booking__ds__extract_day
+          , subq_4.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+          , subq_4.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
           , subq_4.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_4.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_4.booking__ds_partitioned__month AS booking__ds_partitioned__month
           , subq_4.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
           , subq_4.booking__ds_partitioned__year AS booking__ds_partitioned__year
+          , subq_4.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+          , subq_4.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+          , subq_4.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+          , subq_4.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+          , subq_4.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+          , subq_4.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+          , subq_4.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
           , subq_4.booking__paid_at__day AS booking__paid_at__day
           , subq_4.booking__paid_at__week AS booking__paid_at__week
           , subq_4.booking__paid_at__month AS booking__paid_at__month
           , subq_4.booking__paid_at__quarter AS booking__paid_at__quarter
           , subq_4.booking__paid_at__year AS booking__paid_at__year
+          , subq_4.booking__paid_at__extract_year AS booking__paid_at__extract_year
+          , subq_4.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+          , subq_4.booking__paid_at__extract_month AS booking__paid_at__extract_month
+          , subq_4.booking__paid_at__extract_week AS booking__paid_at__extract_week
+          , subq_4.booking__paid_at__extract_day AS booking__paid_at__extract_day
+          , subq_4.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+          , subq_4.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
           , subq_4.listing AS listing
           , subq_4.guest AS guest
           , subq_4.host AS host
@@ -88,31 +130,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.metric_time__week AS metric_time__week
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
@@ -152,31 +236,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -226,32 +352,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 73717860f9..6b3ac53490 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_1.ds__month AS ds__month
           , subq_1.ds__quarter AS ds__quarter
           , subq_1.ds__year AS ds__year
+          , subq_1.ds__extract_year AS ds__extract_year
+          , subq_1.ds__extract_quarter AS ds__extract_quarter
+          , subq_1.ds__extract_month AS ds__extract_month
+          , subq_1.ds__extract_week AS ds__extract_week
+          , subq_1.ds__extract_day AS ds__extract_day
+          , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+          , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
           , subq_1.ds_partitioned__day AS ds_partitioned__day
           , subq_1.ds_partitioned__week AS ds_partitioned__week
           , subq_1.ds_partitioned__month AS ds_partitioned__month
           , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
           , subq_1.ds_partitioned__year AS ds_partitioned__year
+          , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+          , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+          , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+          , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+          , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+          , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+          , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
           , subq_1.paid_at__day AS paid_at__day
           , subq_1.paid_at__week AS paid_at__week
           , subq_1.paid_at__month AS paid_at__month
           , subq_1.paid_at__quarter AS paid_at__quarter
           , subq_1.paid_at__year AS paid_at__year
+          , subq_1.paid_at__extract_year AS paid_at__extract_year
+          , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+          , subq_1.paid_at__extract_month AS paid_at__extract_month
+          , subq_1.paid_at__extract_week AS paid_at__extract_week
+          , subq_1.paid_at__extract_day AS paid_at__extract_day
+          , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+          , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
           , subq_1.booking__ds__day AS booking__ds__day
           , subq_1.booking__ds__week AS booking__ds__week
           , subq_1.booking__ds__month AS booking__ds__month
           , subq_1.booking__ds__quarter AS booking__ds__quarter
           , subq_1.booking__ds__year AS booking__ds__year
+          , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+          , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+          , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+          , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+          , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+          , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+          , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
           , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
           , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
           , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+          , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+          , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+          , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+          , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+          , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+          , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+          , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
           , subq_1.booking__paid_at__day AS booking__paid_at__day
           , subq_1.booking__paid_at__week AS booking__paid_at__week
           , subq_1.booking__paid_at__month AS booking__paid_at__month
           , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
           , subq_1.booking__paid_at__year AS booking__paid_at__year
+          , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+          , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+          , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+          , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+          , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+          , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+          , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
           , subq_1.listing AS listing
           , subq_1.guest AS guest
           , subq_1.host AS host
@@ -87,31 +129,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -161,32 +245,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql
index 870b2c80ea..3adff18e62 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql
@@ -42,31 +42,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -116,32 +158,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -166,21 +250,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -209,11 +321,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -222,11 +348,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql
index ddba65921c..00efad0383 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql
@@ -25,32 +25,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql
index 7ce1a71c7f..7e0fdff19e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql
@@ -31,32 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 81e6d39ada..eb70f04221 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -48,31 +48,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -122,32 +164,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -172,21 +256,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -215,11 +327,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -228,11 +354,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
index 4caa3d07f0..fa5e69d429 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
@@ -30,7 +30,7 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__day AS listing__window_start__day
+            , subq_4.window_start__extract_week AS listing__window_start__extract_week
             , subq_4.window_end__day AS listing__window_end__day
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
@@ -50,31 +50,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -110,32 +152,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -152,7 +236,7 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__day
+              subq_3.window_start__extract_week
               , subq_3.window_end__day
               , subq_3.listing
               , subq_3.capacity
@@ -164,11 +248,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -177,11 +275,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
@@ -196,7 +308,7 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__day
+                subq_2.metric_time__day >= subq_4.window_start__extract_week
               ) AND (
                 (
                   subq_2.metric_time__day < subq_4.window_end__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
index 86a2010b35..fcdd8a3083 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,7 +32,7 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= listings_src_10017.active_from
+        subq_12.metric_time__day >= EXTRACT(WEEK FROM listings_src_10017.active_from)
       ) AND (
         (
           subq_12.metric_time__day < listings_src_10017.active_to
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 6ed1bd4e99..6ef8853985 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
index a26b98d66d..8e64ced98e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
index 027f20ea5b..16e8afe8d0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql
index 913fed793c..b00d690648 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql
@@ -26,31 +26,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
index 86b30c4553..583b4a4bf0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
@@ -21,21 +21,49 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.created_at__day
         , subq_0.created_at__week
         , subq_0.created_at__month
         , subq_0.created_at__quarter
         , subq_0.created_at__year
+        , subq_0.created_at__extract_year
+        , subq_0.created_at__extract_quarter
+        , subq_0.created_at__extract_month
+        , subq_0.created_at__extract_week
+        , subq_0.created_at__extract_day
+        , subq_0.created_at__extract_dayofweek
+        , subq_0.created_at__extract_dayofyear
         , subq_0.listing__ds__day
         , subq_0.listing__ds__week
         , subq_0.listing__ds__month
         , subq_0.listing__ds__quarter
         , subq_0.listing__ds__year
+        , subq_0.listing__ds__extract_year
+        , subq_0.listing__ds__extract_quarter
+        , subq_0.listing__ds__extract_month
+        , subq_0.listing__ds__extract_week
+        , subq_0.listing__ds__extract_day
+        , subq_0.listing__ds__extract_dayofweek
+        , subq_0.listing__ds__extract_dayofyear
         , subq_0.listing__created_at__day
         , subq_0.listing__created_at__week
         , subq_0.listing__created_at__month
         , subq_0.listing__created_at__quarter
         , subq_0.listing__created_at__year
+        , subq_0.listing__created_at__extract_year
+        , subq_0.listing__created_at__extract_quarter
+        , subq_0.listing__created_at__extract_month
+        , subq_0.listing__created_at__extract_week
+        , subq_0.listing__created_at__extract_day
+        , subq_0.listing__created_at__extract_dayofweek
+        , subq_0.listing__created_at__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -77,11 +119,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql
index 316737d00a..b05da97264 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql
@@ -35,32 +35,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql
index 73e6a70d92..437dc887b4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql
@@ -60,31 +60,73 @@ FROM (
                     , subq_0.ds__month
                     , subq_0.ds__quarter
                     , subq_0.ds__year
+                    , subq_0.ds__extract_year
+                    , subq_0.ds__extract_quarter
+                    , subq_0.ds__extract_month
+                    , subq_0.ds__extract_week
+                    , subq_0.ds__extract_day
+                    , subq_0.ds__extract_dayofweek
+                    , subq_0.ds__extract_dayofyear
                     , subq_0.ds_partitioned__day
                     , subq_0.ds_partitioned__week
                     , subq_0.ds_partitioned__month
                     , subq_0.ds_partitioned__quarter
                     , subq_0.ds_partitioned__year
+                    , subq_0.ds_partitioned__extract_year
+                    , subq_0.ds_partitioned__extract_quarter
+                    , subq_0.ds_partitioned__extract_month
+                    , subq_0.ds_partitioned__extract_week
+                    , subq_0.ds_partitioned__extract_day
+                    , subq_0.ds_partitioned__extract_dayofweek
+                    , subq_0.ds_partitioned__extract_dayofyear
                     , subq_0.paid_at__day
                     , subq_0.paid_at__week
                     , subq_0.paid_at__month
                     , subq_0.paid_at__quarter
                     , subq_0.paid_at__year
+                    , subq_0.paid_at__extract_year
+                    , subq_0.paid_at__extract_quarter
+                    , subq_0.paid_at__extract_month
+                    , subq_0.paid_at__extract_week
+                    , subq_0.paid_at__extract_day
+                    , subq_0.paid_at__extract_dayofweek
+                    , subq_0.paid_at__extract_dayofyear
                     , subq_0.booking__ds__day
                     , subq_0.booking__ds__week
                     , subq_0.booking__ds__month
                     , subq_0.booking__ds__quarter
                     , subq_0.booking__ds__year
+                    , subq_0.booking__ds__extract_year
+                    , subq_0.booking__ds__extract_quarter
+                    , subq_0.booking__ds__extract_month
+                    , subq_0.booking__ds__extract_week
+                    , subq_0.booking__ds__extract_day
+                    , subq_0.booking__ds__extract_dayofweek
+                    , subq_0.booking__ds__extract_dayofyear
                     , subq_0.booking__ds_partitioned__day
                     , subq_0.booking__ds_partitioned__week
                     , subq_0.booking__ds_partitioned__month
                     , subq_0.booking__ds_partitioned__quarter
                     , subq_0.booking__ds_partitioned__year
+                    , subq_0.booking__ds_partitioned__extract_year
+                    , subq_0.booking__ds_partitioned__extract_quarter
+                    , subq_0.booking__ds_partitioned__extract_month
+                    , subq_0.booking__ds_partitioned__extract_week
+                    , subq_0.booking__ds_partitioned__extract_day
+                    , subq_0.booking__ds_partitioned__extract_dayofweek
+                    , subq_0.booking__ds_partitioned__extract_dayofyear
                     , subq_0.booking__paid_at__day
                     , subq_0.booking__paid_at__week
                     , subq_0.booking__paid_at__month
                     , subq_0.booking__paid_at__quarter
                     , subq_0.booking__paid_at__year
+                    , subq_0.booking__paid_at__extract_year
+                    , subq_0.booking__paid_at__extract_quarter
+                    , subq_0.booking__paid_at__extract_month
+                    , subq_0.booking__paid_at__extract_week
+                    , subq_0.booking__paid_at__extract_day
+                    , subq_0.booking__paid_at__extract_dayofweek
+                    , subq_0.booking__paid_at__extract_dayofyear
                     , subq_0.ds__day AS metric_time__day
                     , subq_0.ds__week AS metric_time__week
                     , subq_0.ds__month AS metric_time__month
@@ -134,32 +176,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -184,21 +268,49 @@ FROM (
                     , subq_3.ds__month
                     , subq_3.ds__quarter
                     , subq_3.ds__year
+                    , subq_3.ds__extract_year
+                    , subq_3.ds__extract_quarter
+                    , subq_3.ds__extract_month
+                    , subq_3.ds__extract_week
+                    , subq_3.ds__extract_day
+                    , subq_3.ds__extract_dayofweek
+                    , subq_3.ds__extract_dayofyear
                     , subq_3.created_at__day
                     , subq_3.created_at__week
                     , subq_3.created_at__month
                     , subq_3.created_at__quarter
                     , subq_3.created_at__year
+                    , subq_3.created_at__extract_year
+                    , subq_3.created_at__extract_quarter
+                    , subq_3.created_at__extract_month
+                    , subq_3.created_at__extract_week
+                    , subq_3.created_at__extract_day
+                    , subq_3.created_at__extract_dayofweek
+                    , subq_3.created_at__extract_dayofyear
                     , subq_3.listing__ds__day
                     , subq_3.listing__ds__week
                     , subq_3.listing__ds__month
                     , subq_3.listing__ds__quarter
                     , subq_3.listing__ds__year
+                    , subq_3.listing__ds__extract_year
+                    , subq_3.listing__ds__extract_quarter
+                    , subq_3.listing__ds__extract_month
+                    , subq_3.listing__ds__extract_week
+                    , subq_3.listing__ds__extract_day
+                    , subq_3.listing__ds__extract_dayofweek
+                    , subq_3.listing__ds__extract_dayofyear
                     , subq_3.listing__created_at__day
                     , subq_3.listing__created_at__week
                     , subq_3.listing__created_at__month
                     , subq_3.listing__created_at__quarter
                     , subq_3.listing__created_at__year
+                    , subq_3.listing__created_at__extract_year
+                    , subq_3.listing__created_at__extract_quarter
+                    , subq_3.listing__created_at__extract_month
+                    , subq_3.listing__created_at__extract_week
+                    , subq_3.listing__created_at__extract_day
+                    , subq_3.listing__created_at__extract_dayofweek
+                    , subq_3.listing__created_at__extract_dayofyear
                     , subq_3.ds__day AS metric_time__day
                     , subq_3.ds__week AS metric_time__week
                     , subq_3.ds__month AS metric_time__month
@@ -227,11 +339,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -240,11 +366,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -317,31 +457,73 @@ FROM (
                     , subq_12.ds__month
                     , subq_12.ds__quarter
                     , subq_12.ds__year
+                    , subq_12.ds__extract_year
+                    , subq_12.ds__extract_quarter
+                    , subq_12.ds__extract_month
+                    , subq_12.ds__extract_week
+                    , subq_12.ds__extract_day
+                    , subq_12.ds__extract_dayofweek
+                    , subq_12.ds__extract_dayofyear
                     , subq_12.ds_partitioned__day
                     , subq_12.ds_partitioned__week
                     , subq_12.ds_partitioned__month
                     , subq_12.ds_partitioned__quarter
                     , subq_12.ds_partitioned__year
+                    , subq_12.ds_partitioned__extract_year
+                    , subq_12.ds_partitioned__extract_quarter
+                    , subq_12.ds_partitioned__extract_month
+                    , subq_12.ds_partitioned__extract_week
+                    , subq_12.ds_partitioned__extract_day
+                    , subq_12.ds_partitioned__extract_dayofweek
+                    , subq_12.ds_partitioned__extract_dayofyear
                     , subq_12.paid_at__day
                     , subq_12.paid_at__week
                     , subq_12.paid_at__month
                     , subq_12.paid_at__quarter
                     , subq_12.paid_at__year
+                    , subq_12.paid_at__extract_year
+                    , subq_12.paid_at__extract_quarter
+                    , subq_12.paid_at__extract_month
+                    , subq_12.paid_at__extract_week
+                    , subq_12.paid_at__extract_day
+                    , subq_12.paid_at__extract_dayofweek
+                    , subq_12.paid_at__extract_dayofyear
                     , subq_12.booking__ds__day
                     , subq_12.booking__ds__week
                     , subq_12.booking__ds__month
                     , subq_12.booking__ds__quarter
                     , subq_12.booking__ds__year
+                    , subq_12.booking__ds__extract_year
+                    , subq_12.booking__ds__extract_quarter
+                    , subq_12.booking__ds__extract_month
+                    , subq_12.booking__ds__extract_week
+                    , subq_12.booking__ds__extract_day
+                    , subq_12.booking__ds__extract_dayofweek
+                    , subq_12.booking__ds__extract_dayofyear
                     , subq_12.booking__ds_partitioned__day
                     , subq_12.booking__ds_partitioned__week
                     , subq_12.booking__ds_partitioned__month
                     , subq_12.booking__ds_partitioned__quarter
                     , subq_12.booking__ds_partitioned__year
+                    , subq_12.booking__ds_partitioned__extract_year
+                    , subq_12.booking__ds_partitioned__extract_quarter
+                    , subq_12.booking__ds_partitioned__extract_month
+                    , subq_12.booking__ds_partitioned__extract_week
+                    , subq_12.booking__ds_partitioned__extract_day
+                    , subq_12.booking__ds_partitioned__extract_dayofweek
+                    , subq_12.booking__ds_partitioned__extract_dayofyear
                     , subq_12.booking__paid_at__day
                     , subq_12.booking__paid_at__week
                     , subq_12.booking__paid_at__month
                     , subq_12.booking__paid_at__quarter
                     , subq_12.booking__paid_at__year
+                    , subq_12.booking__paid_at__extract_year
+                    , subq_12.booking__paid_at__extract_quarter
+                    , subq_12.booking__paid_at__extract_month
+                    , subq_12.booking__paid_at__extract_week
+                    , subq_12.booking__paid_at__extract_day
+                    , subq_12.booking__paid_at__extract_dayofweek
+                    , subq_12.booking__paid_at__extract_dayofyear
                     , subq_12.ds__day AS metric_time__day
                     , subq_12.ds__week AS metric_time__week
                     , subq_12.ds__month AS metric_time__month
@@ -391,32 +573,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -441,21 +665,49 @@ FROM (
                     , subq_15.ds__month
                     , subq_15.ds__quarter
                     , subq_15.ds__year
+                    , subq_15.ds__extract_year
+                    , subq_15.ds__extract_quarter
+                    , subq_15.ds__extract_month
+                    , subq_15.ds__extract_week
+                    , subq_15.ds__extract_day
+                    , subq_15.ds__extract_dayofweek
+                    , subq_15.ds__extract_dayofyear
                     , subq_15.created_at__day
                     , subq_15.created_at__week
                     , subq_15.created_at__month
                     , subq_15.created_at__quarter
                     , subq_15.created_at__year
+                    , subq_15.created_at__extract_year
+                    , subq_15.created_at__extract_quarter
+                    , subq_15.created_at__extract_month
+                    , subq_15.created_at__extract_week
+                    , subq_15.created_at__extract_day
+                    , subq_15.created_at__extract_dayofweek
+                    , subq_15.created_at__extract_dayofyear
                     , subq_15.listing__ds__day
                     , subq_15.listing__ds__week
                     , subq_15.listing__ds__month
                     , subq_15.listing__ds__quarter
                     , subq_15.listing__ds__year
+                    , subq_15.listing__ds__extract_year
+                    , subq_15.listing__ds__extract_quarter
+                    , subq_15.listing__ds__extract_month
+                    , subq_15.listing__ds__extract_week
+                    , subq_15.listing__ds__extract_day
+                    , subq_15.listing__ds__extract_dayofweek
+                    , subq_15.listing__ds__extract_dayofyear
                     , subq_15.listing__created_at__day
                     , subq_15.listing__created_at__week
                     , subq_15.listing__created_at__month
                     , subq_15.listing__created_at__quarter
                     , subq_15.listing__created_at__year
+                    , subq_15.listing__created_at__extract_year
+                    , subq_15.listing__created_at__extract_quarter
+                    , subq_15.listing__created_at__extract_month
+                    , subq_15.listing__created_at__extract_week
+                    , subq_15.listing__created_at__extract_day
+                    , subq_15.listing__created_at__extract_dayofweek
+                    , subq_15.listing__created_at__extract_dayofyear
                     , subq_15.ds__day AS metric_time__day
                     , subq_15.ds__week AS metric_time__week
                     , subq_15.ds__month AS metric_time__month
@@ -484,11 +736,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -497,11 +763,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -557,31 +837,73 @@ FROM (
             , subq_24.ds__month
             , subq_24.ds__quarter
             , subq_24.ds__year
+            , subq_24.ds__extract_year
+            , subq_24.ds__extract_quarter
+            , subq_24.ds__extract_month
+            , subq_24.ds__extract_week
+            , subq_24.ds__extract_day
+            , subq_24.ds__extract_dayofweek
+            , subq_24.ds__extract_dayofyear
             , subq_24.ds_partitioned__day
             , subq_24.ds_partitioned__week
             , subq_24.ds_partitioned__month
             , subq_24.ds_partitioned__quarter
             , subq_24.ds_partitioned__year
+            , subq_24.ds_partitioned__extract_year
+            , subq_24.ds_partitioned__extract_quarter
+            , subq_24.ds_partitioned__extract_month
+            , subq_24.ds_partitioned__extract_week
+            , subq_24.ds_partitioned__extract_day
+            , subq_24.ds_partitioned__extract_dayofweek
+            , subq_24.ds_partitioned__extract_dayofyear
             , subq_24.paid_at__day
             , subq_24.paid_at__week
             , subq_24.paid_at__month
             , subq_24.paid_at__quarter
             , subq_24.paid_at__year
+            , subq_24.paid_at__extract_year
+            , subq_24.paid_at__extract_quarter
+            , subq_24.paid_at__extract_month
+            , subq_24.paid_at__extract_week
+            , subq_24.paid_at__extract_day
+            , subq_24.paid_at__extract_dayofweek
+            , subq_24.paid_at__extract_dayofyear
             , subq_24.booking__ds__day
             , subq_24.booking__ds__week
             , subq_24.booking__ds__month
             , subq_24.booking__ds__quarter
             , subq_24.booking__ds__year
+            , subq_24.booking__ds__extract_year
+            , subq_24.booking__ds__extract_quarter
+            , subq_24.booking__ds__extract_month
+            , subq_24.booking__ds__extract_week
+            , subq_24.booking__ds__extract_day
+            , subq_24.booking__ds__extract_dayofweek
+            , subq_24.booking__ds__extract_dayofyear
             , subq_24.booking__ds_partitioned__day
             , subq_24.booking__ds_partitioned__week
             , subq_24.booking__ds_partitioned__month
             , subq_24.booking__ds_partitioned__quarter
             , subq_24.booking__ds_partitioned__year
+            , subq_24.booking__ds_partitioned__extract_year
+            , subq_24.booking__ds_partitioned__extract_quarter
+            , subq_24.booking__ds_partitioned__extract_month
+            , subq_24.booking__ds_partitioned__extract_week
+            , subq_24.booking__ds_partitioned__extract_day
+            , subq_24.booking__ds_partitioned__extract_dayofweek
+            , subq_24.booking__ds_partitioned__extract_dayofyear
             , subq_24.booking__paid_at__day
             , subq_24.booking__paid_at__week
             , subq_24.booking__paid_at__month
             , subq_24.booking__paid_at__quarter
             , subq_24.booking__paid_at__year
+            , subq_24.booking__paid_at__extract_year
+            , subq_24.booking__paid_at__extract_quarter
+            , subq_24.booking__paid_at__extract_month
+            , subq_24.booking__paid_at__extract_week
+            , subq_24.booking__paid_at__extract_day
+            , subq_24.booking__paid_at__extract_dayofweek
+            , subq_24.booking__paid_at__extract_dayofyear
             , subq_24.ds__day AS metric_time__day
             , subq_24.ds__week AS metric_time__week
             , subq_24.ds__month AS metric_time__month
@@ -631,32 +953,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
index f951333a58..9626242169 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
@@ -45,31 +45,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -119,32 +161,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -186,31 +270,73 @@ FROM (
             , subq_7.ds__month
             , subq_7.ds__quarter
             , subq_7.ds__year
+            , subq_7.ds__extract_year
+            , subq_7.ds__extract_quarter
+            , subq_7.ds__extract_month
+            , subq_7.ds__extract_week
+            , subq_7.ds__extract_day
+            , subq_7.ds__extract_dayofweek
+            , subq_7.ds__extract_dayofyear
             , subq_7.ds_partitioned__day
             , subq_7.ds_partitioned__week
             , subq_7.ds_partitioned__month
             , subq_7.ds_partitioned__quarter
             , subq_7.ds_partitioned__year
+            , subq_7.ds_partitioned__extract_year
+            , subq_7.ds_partitioned__extract_quarter
+            , subq_7.ds_partitioned__extract_month
+            , subq_7.ds_partitioned__extract_week
+            , subq_7.ds_partitioned__extract_day
+            , subq_7.ds_partitioned__extract_dayofweek
+            , subq_7.ds_partitioned__extract_dayofyear
             , subq_7.paid_at__day
             , subq_7.paid_at__week
             , subq_7.paid_at__month
             , subq_7.paid_at__quarter
             , subq_7.paid_at__year
+            , subq_7.paid_at__extract_year
+            , subq_7.paid_at__extract_quarter
+            , subq_7.paid_at__extract_month
+            , subq_7.paid_at__extract_week
+            , subq_7.paid_at__extract_day
+            , subq_7.paid_at__extract_dayofweek
+            , subq_7.paid_at__extract_dayofyear
             , subq_7.booking__ds__day
             , subq_7.booking__ds__week
             , subq_7.booking__ds__month
             , subq_7.booking__ds__quarter
             , subq_7.booking__ds__year
+            , subq_7.booking__ds__extract_year
+            , subq_7.booking__ds__extract_quarter
+            , subq_7.booking__ds__extract_month
+            , subq_7.booking__ds__extract_week
+            , subq_7.booking__ds__extract_day
+            , subq_7.booking__ds__extract_dayofweek
+            , subq_7.booking__ds__extract_dayofyear
             , subq_7.booking__ds_partitioned__day
             , subq_7.booking__ds_partitioned__week
             , subq_7.booking__ds_partitioned__month
             , subq_7.booking__ds_partitioned__quarter
             , subq_7.booking__ds_partitioned__year
+            , subq_7.booking__ds_partitioned__extract_year
+            , subq_7.booking__ds_partitioned__extract_quarter
+            , subq_7.booking__ds_partitioned__extract_month
+            , subq_7.booking__ds_partitioned__extract_week
+            , subq_7.booking__ds_partitioned__extract_day
+            , subq_7.booking__ds_partitioned__extract_dayofweek
+            , subq_7.booking__ds_partitioned__extract_dayofyear
             , subq_7.booking__paid_at__day
             , subq_7.booking__paid_at__week
             , subq_7.booking__paid_at__month
             , subq_7.booking__paid_at__quarter
             , subq_7.booking__paid_at__year
+            , subq_7.booking__paid_at__extract_year
+            , subq_7.booking__paid_at__extract_quarter
+            , subq_7.booking__paid_at__extract_month
+            , subq_7.booking__paid_at__extract_week
+            , subq_7.booking__paid_at__extract_day
+            , subq_7.booking__paid_at__extract_dayofweek
+            , subq_7.booking__paid_at__extract_dayofyear
             , subq_7.ds__day AS metric_time__day
             , subq_7.ds__week AS metric_time__week
             , subq_7.ds__month AS metric_time__month
@@ -260,32 +386,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 13d80a91d0..a495423238 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -39,31 +39,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -113,32 +155,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index e05efe9cf1..c868e3cfd9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -27,31 +27,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -160,21 +244,49 @@ FROM (
             , subq_5.ds__month
             , subq_5.ds__quarter
             , subq_5.ds__year
+            , subq_5.ds__extract_year
+            , subq_5.ds__extract_quarter
+            , subq_5.ds__extract_month
+            , subq_5.ds__extract_week
+            , subq_5.ds__extract_day
+            , subq_5.ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear
             , subq_5.created_at__day
             , subq_5.created_at__week
             , subq_5.created_at__month
             , subq_5.created_at__quarter
             , subq_5.created_at__year
+            , subq_5.created_at__extract_year
+            , subq_5.created_at__extract_quarter
+            , subq_5.created_at__extract_month
+            , subq_5.created_at__extract_week
+            , subq_5.created_at__extract_day
+            , subq_5.created_at__extract_dayofweek
+            , subq_5.created_at__extract_dayofyear
             , subq_5.listing__ds__day
             , subq_5.listing__ds__week
             , subq_5.listing__ds__month
             , subq_5.listing__ds__quarter
             , subq_5.listing__ds__year
+            , subq_5.listing__ds__extract_year
+            , subq_5.listing__ds__extract_quarter
+            , subq_5.listing__ds__extract_month
+            , subq_5.listing__ds__extract_week
+            , subq_5.listing__ds__extract_day
+            , subq_5.listing__ds__extract_dayofweek
+            , subq_5.listing__ds__extract_dayofyear
             , subq_5.listing__created_at__day
             , subq_5.listing__created_at__week
             , subq_5.listing__created_at__month
             , subq_5.listing__created_at__quarter
             , subq_5.listing__created_at__year
+            , subq_5.listing__created_at__extract_year
+            , subq_5.listing__created_at__extract_quarter
+            , subq_5.listing__created_at__extract_month
+            , subq_5.listing__created_at__extract_week
+            , subq_5.listing__created_at__extract_day
+            , subq_5.listing__created_at__extract_dayofweek
+            , subq_5.listing__created_at__extract_dayofyear
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -203,11 +315,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -216,11 +342,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
index 88cc0b431d..760a9d333e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,7 +20,7 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__day AS listing__window_start__day
+        , subq_7.window_start__extract_week AS listing__window_start__extract_week
         , subq_7.window_end__day AS listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
@@ -40,31 +40,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -142,7 +226,7 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__day
+          subq_6.window_start__extract_week
           , subq_6.window_end__day
           , subq_6.listing
           , subq_6.user__home_state_latest
@@ -154,26 +238,61 @@ FROM (
             , subq_3.window_start__month AS window_start__month
             , subq_3.window_start__quarter AS window_start__quarter
             , subq_3.window_start__year AS window_start__year
+            , subq_3.window_start__extract_year AS window_start__extract_year
+            , subq_3.window_start__extract_quarter AS window_start__extract_quarter
+            , subq_3.window_start__extract_month AS window_start__extract_month
+            , subq_3.window_start__extract_week AS window_start__extract_week
+            , subq_3.window_start__extract_day AS window_start__extract_day
+            , subq_3.window_start__extract_dayofweek AS window_start__extract_dayofweek
+            , subq_3.window_start__extract_dayofyear AS window_start__extract_dayofyear
             , subq_3.window_end__day AS window_end__day
             , subq_3.window_end__week AS window_end__week
             , subq_3.window_end__month AS window_end__month
             , subq_3.window_end__quarter AS window_end__quarter
             , subq_3.window_end__year AS window_end__year
+            , subq_3.window_end__extract_year AS window_end__extract_year
+            , subq_3.window_end__extract_quarter AS window_end__extract_quarter
+            , subq_3.window_end__extract_month AS window_end__extract_month
+            , subq_3.window_end__extract_week AS window_end__extract_week
+            , subq_3.window_end__extract_day AS window_end__extract_day
+            , subq_3.window_end__extract_dayofweek AS window_end__extract_dayofweek
+            , subq_3.window_end__extract_dayofyear AS window_end__extract_dayofyear
             , subq_3.listing__window_start__day AS listing__window_start__day
             , subq_3.listing__window_start__week AS listing__window_start__week
             , subq_3.listing__window_start__month AS listing__window_start__month
             , subq_3.listing__window_start__quarter AS listing__window_start__quarter
             , subq_3.listing__window_start__year AS listing__window_start__year
+            , subq_3.listing__window_start__extract_year AS listing__window_start__extract_year
+            , subq_3.listing__window_start__extract_quarter AS listing__window_start__extract_quarter
+            , subq_3.listing__window_start__extract_month AS listing__window_start__extract_month
+            , subq_3.listing__window_start__extract_week AS listing__window_start__extract_week
+            , subq_3.listing__window_start__extract_day AS listing__window_start__extract_day
+            , subq_3.listing__window_start__extract_dayofweek AS listing__window_start__extract_dayofweek
+            , subq_3.listing__window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
             , subq_3.listing__window_end__day AS listing__window_end__day
             , subq_3.listing__window_end__week AS listing__window_end__week
             , subq_3.listing__window_end__month AS listing__window_end__month
             , subq_3.listing__window_end__quarter AS listing__window_end__quarter
             , subq_3.listing__window_end__year AS listing__window_end__year
+            , subq_3.listing__window_end__extract_year AS listing__window_end__extract_year
+            , subq_3.listing__window_end__extract_quarter AS listing__window_end__extract_quarter
+            , subq_3.listing__window_end__extract_month AS listing__window_end__extract_month
+            , subq_3.listing__window_end__extract_week AS listing__window_end__extract_week
+            , subq_3.listing__window_end__extract_day AS listing__window_end__extract_day
+            , subq_3.listing__window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
+            , subq_3.listing__window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
             , subq_5.ds__day AS user__ds__day
             , subq_5.ds__week AS user__ds__week
             , subq_5.ds__month AS user__ds__month
             , subq_5.ds__quarter AS user__ds__quarter
             , subq_5.ds__year AS user__ds__year
+            , subq_5.ds__extract_year AS user__ds__extract_year
+            , subq_5.ds__extract_quarter AS user__ds__extract_quarter
+            , subq_5.ds__extract_month AS user__ds__extract_month
+            , subq_5.ds__extract_week AS user__ds__extract_week
+            , subq_5.ds__extract_day AS user__ds__extract_day
+            , subq_5.ds__extract_dayofweek AS user__ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS user__ds__extract_dayofyear
             , subq_3.listing AS listing
             , subq_3.user AS user
             , subq_3.listing__user AS listing__user
@@ -192,11 +311,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -205,11 +338,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -227,11 +374,25 @@ FROM (
             --    'ds__month',
             --    'ds__quarter',
             --    'ds__year',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
             --    'user__ds__day',
             --    'user__ds__week',
             --    'user__ds__month',
             --    'user__ds__quarter',
             --    'user__ds__year',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
             --    'user']
             SELECT
               subq_4.ds__day
@@ -239,11 +400,25 @@ FROM (
               , subq_4.ds__month
               , subq_4.ds__quarter
               , subq_4.ds__year
+              , subq_4.ds__extract_year
+              , subq_4.ds__extract_quarter
+              , subq_4.ds__extract_month
+              , subq_4.ds__extract_week
+              , subq_4.ds__extract_day
+              , subq_4.ds__extract_dayofweek
+              , subq_4.ds__extract_dayofyear
               , subq_4.user__ds__day
               , subq_4.user__ds__week
               , subq_4.user__ds__month
               , subq_4.user__ds__quarter
               , subq_4.user__ds__year
+              , subq_4.user__ds__extract_year
+              , subq_4.user__ds__extract_quarter
+              , subq_4.user__ds__extract_month
+              , subq_4.user__ds__extract_week
+              , subq_4.user__ds__extract_day
+              , subq_4.user__ds__extract_dayofweek
+              , subq_4.user__ds__extract_dayofyear
               , subq_4.user
               , subq_4.home_state_latest
               , subq_4.user__home_state_latest
@@ -255,12 +430,26 @@ FROM (
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS ds__year
+                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_dayofyear
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC('week', users_latest_src_10021.ds) AS user__ds__week
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS user__ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS user__ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS user__ds__year
+                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS user__ds__extract_year
+                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
+                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS user__ds__extract_month
+                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
+                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS user__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_dayofyear
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
@@ -275,7 +464,7 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__day
+            subq_2.metric_time__day >= subq_7.window_start__extract_week
           ) AND (
             (
               subq_2.metric_time__day < subq_7.window_end__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index feb5ed0fdc..579c5ff3a6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,7 +23,7 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    listings_src_10017.active_from AS window_start__day
+    EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
     , listings_src_10017.active_to AS window_end__day
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
@@ -38,7 +38,7 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__day
+      subq_13.metric_time__day >= subq_18.window_start__extract_week
     ) AND (
       (
         subq_13.metric_time__day < subq_18.window_end__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
index 94054a124c..138a7d9525 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.lux_listing__window_start__day AS listing__lux_listing__window_start__day
-        , subq_7.lux_listing__window_end__day AS listing__lux_listing__window_end__day
+        , subq_7.lux_listing__window_start__extract_dayofweek AS listing__lux_listing__window_start__extract_dayofweek
+        , subq_7.lux_listing__window_end__extract_month AS listing__lux_listing__window_end__extract_month
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
         , subq_2.bookings AS bookings
@@ -40,31 +40,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -145,8 +229,8 @@ FROM (
         --    'lux_listing__window_end__day',
         --    'listing']
         SELECT
-          subq_6.lux_listing__window_start__day
-          , subq_6.lux_listing__window_end__day
+          subq_6.lux_listing__window_start__extract_dayofweek
+          , subq_6.lux_listing__window_end__extract_month
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
         FROM (
@@ -157,11 +241,25 @@ FROM (
             , subq_5.window_start__month AS lux_listing__window_start__month
             , subq_5.window_start__quarter AS lux_listing__window_start__quarter
             , subq_5.window_start__year AS lux_listing__window_start__year
+            , subq_5.window_start__extract_year AS lux_listing__window_start__extract_year
+            , subq_5.window_start__extract_quarter AS lux_listing__window_start__extract_quarter
+            , subq_5.window_start__extract_month AS lux_listing__window_start__extract_month
+            , subq_5.window_start__extract_week AS lux_listing__window_start__extract_week
+            , subq_5.window_start__extract_day AS lux_listing__window_start__extract_day
+            , subq_5.window_start__extract_dayofweek AS lux_listing__window_start__extract_dayofweek
+            , subq_5.window_start__extract_dayofyear AS lux_listing__window_start__extract_dayofyear
             , subq_5.window_end__day AS lux_listing__window_end__day
             , subq_5.window_end__week AS lux_listing__window_end__week
             , subq_5.window_end__month AS lux_listing__window_end__month
             , subq_5.window_end__quarter AS lux_listing__window_end__quarter
             , subq_5.window_end__year AS lux_listing__window_end__year
+            , subq_5.window_end__extract_year AS lux_listing__window_end__extract_year
+            , subq_5.window_end__extract_quarter AS lux_listing__window_end__extract_quarter
+            , subq_5.window_end__extract_month AS lux_listing__window_end__extract_month
+            , subq_5.window_end__extract_week AS lux_listing__window_end__extract_week
+            , subq_5.window_end__extract_day AS lux_listing__window_end__extract_day
+            , subq_5.window_end__extract_dayofweek AS lux_listing__window_end__extract_dayofweek
+            , subq_5.window_end__extract_dayofyear AS lux_listing__window_end__extract_dayofyear
             , subq_3.listing AS listing
             , subq_3.lux_listing AS lux_listing
             , subq_3.listing__lux_listing AS listing__lux_listing
@@ -183,21 +281,49 @@ FROM (
             --    'window_start__month',
             --    'window_start__quarter',
             --    'window_start__year',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
             --    'window_end__day',
             --    'window_end__week',
             --    'window_end__month',
             --    'window_end__quarter',
             --    'window_end__year',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
             --    'lux_listing__window_start__day',
             --    'lux_listing__window_start__week',
             --    'lux_listing__window_start__month',
             --    'lux_listing__window_start__quarter',
             --    'lux_listing__window_start__year',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
             --    'lux_listing__window_end__day',
             --    'lux_listing__window_end__week',
             --    'lux_listing__window_end__month',
             --    'lux_listing__window_end__quarter',
             --    'lux_listing__window_end__year',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
             --    'lux_listing']
             SELECT
               subq_4.window_start__day
@@ -205,21 +331,49 @@ FROM (
               , subq_4.window_start__month
               , subq_4.window_start__quarter
               , subq_4.window_start__year
+              , subq_4.window_start__extract_year
+              , subq_4.window_start__extract_quarter
+              , subq_4.window_start__extract_month
+              , subq_4.window_start__extract_week
+              , subq_4.window_start__extract_day
+              , subq_4.window_start__extract_dayofweek
+              , subq_4.window_start__extract_dayofyear
               , subq_4.window_end__day
               , subq_4.window_end__week
               , subq_4.window_end__month
               , subq_4.window_end__quarter
               , subq_4.window_end__year
+              , subq_4.window_end__extract_year
+              , subq_4.window_end__extract_quarter
+              , subq_4.window_end__extract_month
+              , subq_4.window_end__extract_week
+              , subq_4.window_end__extract_day
+              , subq_4.window_end__extract_dayofweek
+              , subq_4.window_end__extract_dayofyear
               , subq_4.lux_listing__window_start__day
               , subq_4.lux_listing__window_start__week
               , subq_4.lux_listing__window_start__month
               , subq_4.lux_listing__window_start__quarter
               , subq_4.lux_listing__window_start__year
+              , subq_4.lux_listing__window_start__extract_year
+              , subq_4.lux_listing__window_start__extract_quarter
+              , subq_4.lux_listing__window_start__extract_month
+              , subq_4.lux_listing__window_start__extract_week
+              , subq_4.lux_listing__window_start__extract_day
+              , subq_4.lux_listing__window_start__extract_dayofweek
+              , subq_4.lux_listing__window_start__extract_dayofyear
               , subq_4.lux_listing__window_end__day
               , subq_4.lux_listing__window_end__week
               , subq_4.lux_listing__window_end__month
               , subq_4.lux_listing__window_end__quarter
               , subq_4.lux_listing__window_end__year
+              , subq_4.lux_listing__window_end__extract_year
+              , subq_4.lux_listing__window_end__extract_quarter
+              , subq_4.lux_listing__window_end__extract_month
+              , subq_4.lux_listing__window_end__extract_week
+              , subq_4.lux_listing__window_end__extract_day
+              , subq_4.lux_listing__window_end__extract_dayofweek
+              , subq_4.lux_listing__window_end__extract_dayofyear
               , subq_4.lux_listing
               , subq_4.is_confirmed_lux
               , subq_4.lux_listing__is_confirmed_lux
@@ -231,22 +385,50 @@ FROM (
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS window_start__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofyear
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS window_end__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofyear
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_from) AS lux_listing__window_start__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS lux_listing__window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS lux_listing__window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS lux_listing__window_start__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS lux_listing__window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS lux_listing__window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS lux_listing__window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS lux_listing__window_end__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofyear
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
@@ -261,12 +443,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.lux_listing__window_start__day
+            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_dayofweek
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.lux_listing__window_end__day
+              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_month
             ) OR (
-              subq_7.lux_listing__window_end__day IS NULL
+              subq_7.lux_listing__window_end__extract_month IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index f1b419a284..aca1260a66 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -26,8 +26,8 @@ LEFT OUTER JOIN (
   --    'lux_listing__window_end__day',
   --    'listing']
   SELECT
-    lux_listings_src_10019.valid_from AS lux_listing__window_start__day
-    , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
+    EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
+    , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
   FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_10018
@@ -41,12 +41,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.lux_listing__window_start__day
+      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_dayofweek
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.lux_listing__window_end__day
+        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_month
       ) OR (
-        subq_18.lux_listing__window_end__day IS NULL
+        subq_18.lux_listing__window_end__extract_month IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql
index ae8b7838b7..cb9670f074 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql
@@ -33,32 +33,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -85,11 +127,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -98,11 +154,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -131,11 +201,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -144,11 +228,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
index d35179ebf0..fbddd59f54 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
@@ -36,21 +36,49 @@ FROM (
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.ds__day
             , subq_0.ds__week
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.account_id__ds_partitioned__day
             , subq_0.account_id__ds_partitioned__week
             , subq_0.account_id__ds_partitioned__month
             , subq_0.account_id__ds_partitioned__quarter
             , subq_0.account_id__ds_partitioned__year
+            , subq_0.account_id__ds_partitioned__extract_year
+            , subq_0.account_id__ds_partitioned__extract_quarter
+            , subq_0.account_id__ds_partitioned__extract_month
+            , subq_0.account_id__ds_partitioned__extract_week
+            , subq_0.account_id__ds_partitioned__extract_day
+            , subq_0.account_id__ds_partitioned__extract_dayofweek
+            , subq_0.account_id__ds_partitioned__extract_dayofyear
             , subq_0.account_id__ds__day
             , subq_0.account_id__ds__week
             , subq_0.account_id__ds__month
             , subq_0.account_id__ds__quarter
             , subq_0.account_id__ds__year
+            , subq_0.account_id__ds__extract_year
+            , subq_0.account_id__ds__extract_quarter
+            , subq_0.account_id__ds__extract_month
+            , subq_0.account_id__ds__extract_week
+            , subq_0.account_id__ds__extract_day
+            , subq_0.account_id__ds__extract_dayofweek
+            , subq_0.account_id__ds__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -69,22 +97,50 @@ FROM (
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS ds__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_dayofyear
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS account_id__ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS account_id__ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS account_id__ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS account_id__ds__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofyear
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -106,16 +162,37 @@ FROM (
             , subq_3.ds_partitioned__month AS ds_partitioned__month
             , subq_3.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_3.ds_partitioned__year AS ds_partitioned__year
+            , subq_3.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_3.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_3.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_3.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_3.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_3.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_3.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_3.account_id__ds_partitioned__day AS account_id__ds_partitioned__day
             , subq_3.account_id__ds_partitioned__week AS account_id__ds_partitioned__week
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
             , subq_3.account_id__ds_partitioned__quarter AS account_id__ds_partitioned__quarter
             , subq_3.account_id__ds_partitioned__year AS account_id__ds_partitioned__year
+            , subq_3.account_id__ds_partitioned__extract_year AS account_id__ds_partitioned__extract_year
+            , subq_3.account_id__ds_partitioned__extract_quarter AS account_id__ds_partitioned__extract_quarter
+            , subq_3.account_id__ds_partitioned__extract_month AS account_id__ds_partitioned__extract_month
+            , subq_3.account_id__ds_partitioned__extract_week AS account_id__ds_partitioned__extract_week
+            , subq_3.account_id__ds_partitioned__extract_day AS account_id__ds_partitioned__extract_day
+            , subq_3.account_id__ds_partitioned__extract_dayofweek AS account_id__ds_partitioned__extract_dayofweek
+            , subq_3.account_id__ds_partitioned__extract_dayofyear AS account_id__ds_partitioned__extract_dayofyear
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
             , subq_5.ds_partitioned__quarter AS customer_id__ds_partitioned__quarter
             , subq_5.ds_partitioned__year AS customer_id__ds_partitioned__year
+            , subq_5.ds_partitioned__extract_year AS customer_id__ds_partitioned__extract_year
+            , subq_5.ds_partitioned__extract_quarter AS customer_id__ds_partitioned__extract_quarter
+            , subq_5.ds_partitioned__extract_month AS customer_id__ds_partitioned__extract_month
+            , subq_5.ds_partitioned__extract_week AS customer_id__ds_partitioned__extract_week
+            , subq_5.ds_partitioned__extract_day AS customer_id__ds_partitioned__extract_day
+            , subq_5.ds_partitioned__extract_dayofweek AS customer_id__ds_partitioned__extract_dayofweek
+            , subq_5.ds_partitioned__extract_dayofyear AS customer_id__ds_partitioned__extract_dayofyear
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
@@ -132,12 +209,26 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
+              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -154,11 +245,25 @@ FROM (
             --    'ds_partitioned__month',
             --    'ds_partitioned__quarter',
             --    'ds_partitioned__year',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
             --    'customer_id__ds_partitioned__day',
             --    'customer_id__ds_partitioned__week',
             --    'customer_id__ds_partitioned__month',
             --    'customer_id__ds_partitioned__quarter',
             --    'customer_id__ds_partitioned__year',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
             --    'customer_id']
             SELECT
               subq_4.ds_partitioned__day
@@ -166,11 +271,25 @@ FROM (
               , subq_4.ds_partitioned__month
               , subq_4.ds_partitioned__quarter
               , subq_4.ds_partitioned__year
+              , subq_4.ds_partitioned__extract_year
+              , subq_4.ds_partitioned__extract_quarter
+              , subq_4.ds_partitioned__extract_month
+              , subq_4.ds_partitioned__extract_week
+              , subq_4.ds_partitioned__extract_day
+              , subq_4.ds_partitioned__extract_dayofweek
+              , subq_4.ds_partitioned__extract_dayofyear
               , subq_4.customer_id__ds_partitioned__day
               , subq_4.customer_id__ds_partitioned__week
               , subq_4.customer_id__ds_partitioned__month
               , subq_4.customer_id__ds_partitioned__quarter
               , subq_4.customer_id__ds_partitioned__year
+              , subq_4.customer_id__ds_partitioned__extract_year
+              , subq_4.customer_id__ds_partitioned__extract_quarter
+              , subq_4.customer_id__ds_partitioned__extract_month
+              , subq_4.customer_id__ds_partitioned__extract_week
+              , subq_4.customer_id__ds_partitioned__extract_day
+              , subq_4.customer_id__ds_partitioned__extract_dayofweek
+              , subq_4.customer_id__ds_partitioned__extract_dayofyear
               , subq_4.customer_id
               , subq_4.customer_name
               , subq_4.customer_atomic_weight
@@ -186,6 +305,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -193,6 +319,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__year
+                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofyear
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
index 5c9089deaf..eb31a4fb3a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
@@ -23,31 +23,73 @@ FROM (
           , subq_1.ds__month
           , subq_1.ds__quarter
           , subq_1.ds__year
+          , subq_1.ds__extract_year
+          , subq_1.ds__extract_quarter
+          , subq_1.ds__extract_month
+          , subq_1.ds__extract_week
+          , subq_1.ds__extract_day
+          , subq_1.ds__extract_dayofweek
+          , subq_1.ds__extract_dayofyear
           , subq_1.ds_partitioned__day
           , subq_1.ds_partitioned__week
           , subq_1.ds_partitioned__month
           , subq_1.ds_partitioned__quarter
           , subq_1.ds_partitioned__year
+          , subq_1.ds_partitioned__extract_year
+          , subq_1.ds_partitioned__extract_quarter
+          , subq_1.ds_partitioned__extract_month
+          , subq_1.ds_partitioned__extract_week
+          , subq_1.ds_partitioned__extract_day
+          , subq_1.ds_partitioned__extract_dayofweek
+          , subq_1.ds_partitioned__extract_dayofyear
           , subq_1.paid_at__day
           , subq_1.paid_at__week
           , subq_1.paid_at__month
           , subq_1.paid_at__quarter
           , subq_1.paid_at__year
+          , subq_1.paid_at__extract_year
+          , subq_1.paid_at__extract_quarter
+          , subq_1.paid_at__extract_month
+          , subq_1.paid_at__extract_week
+          , subq_1.paid_at__extract_day
+          , subq_1.paid_at__extract_dayofweek
+          , subq_1.paid_at__extract_dayofyear
           , subq_1.booking__ds__day
           , subq_1.booking__ds__week
           , subq_1.booking__ds__month
           , subq_1.booking__ds__quarter
           , subq_1.booking__ds__year
+          , subq_1.booking__ds__extract_year
+          , subq_1.booking__ds__extract_quarter
+          , subq_1.booking__ds__extract_month
+          , subq_1.booking__ds__extract_week
+          , subq_1.booking__ds__extract_day
+          , subq_1.booking__ds__extract_dayofweek
+          , subq_1.booking__ds__extract_dayofyear
           , subq_1.booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month
           , subq_1.booking__ds_partitioned__quarter
           , subq_1.booking__ds_partitioned__year
+          , subq_1.booking__ds_partitioned__extract_year
+          , subq_1.booking__ds_partitioned__extract_quarter
+          , subq_1.booking__ds_partitioned__extract_month
+          , subq_1.booking__ds_partitioned__extract_week
+          , subq_1.booking__ds_partitioned__extract_day
+          , subq_1.booking__ds_partitioned__extract_dayofweek
+          , subq_1.booking__ds_partitioned__extract_dayofyear
           , subq_1.booking__paid_at__day
           , subq_1.booking__paid_at__week
           , subq_1.booking__paid_at__month
           , subq_1.booking__paid_at__quarter
           , subq_1.booking__paid_at__year
+          , subq_1.booking__paid_at__extract_year
+          , subq_1.booking__paid_at__extract_quarter
+          , subq_1.booking__paid_at__extract_month
+          , subq_1.booking__paid_at__extract_week
+          , subq_1.booking__paid_at__extract_day
+          , subq_1.booking__paid_at__extract_dayofweek
+          , subq_1.booking__paid_at__extract_dayofyear
           , subq_1.metric_time__day
           , subq_1.metric_time__week
           , subq_1.metric_time__month
@@ -82,31 +124,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -156,32 +240,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -217,21 +343,49 @@ CROSS JOIN (
           , subq_7.ds__month
           , subq_7.ds__quarter
           , subq_7.ds__year
+          , subq_7.ds__extract_year
+          , subq_7.ds__extract_quarter
+          , subq_7.ds__extract_month
+          , subq_7.ds__extract_week
+          , subq_7.ds__extract_day
+          , subq_7.ds__extract_dayofweek
+          , subq_7.ds__extract_dayofyear
           , subq_7.created_at__day
           , subq_7.created_at__week
           , subq_7.created_at__month
           , subq_7.created_at__quarter
           , subq_7.created_at__year
+          , subq_7.created_at__extract_year
+          , subq_7.created_at__extract_quarter
+          , subq_7.created_at__extract_month
+          , subq_7.created_at__extract_week
+          , subq_7.created_at__extract_day
+          , subq_7.created_at__extract_dayofweek
+          , subq_7.created_at__extract_dayofyear
           , subq_7.listing__ds__day
           , subq_7.listing__ds__week
           , subq_7.listing__ds__month
           , subq_7.listing__ds__quarter
           , subq_7.listing__ds__year
+          , subq_7.listing__ds__extract_year
+          , subq_7.listing__ds__extract_quarter
+          , subq_7.listing__ds__extract_month
+          , subq_7.listing__ds__extract_week
+          , subq_7.listing__ds__extract_day
+          , subq_7.listing__ds__extract_dayofweek
+          , subq_7.listing__ds__extract_dayofyear
           , subq_7.listing__created_at__day
           , subq_7.listing__created_at__week
           , subq_7.listing__created_at__month
           , subq_7.listing__created_at__quarter
           , subq_7.listing__created_at__year
+          , subq_7.listing__created_at__extract_year
+          , subq_7.listing__created_at__extract_quarter
+          , subq_7.listing__created_at__extract_month
+          , subq_7.listing__created_at__extract_week
+          , subq_7.listing__created_at__extract_day
+          , subq_7.listing__created_at__extract_dayofweek
+          , subq_7.listing__created_at__extract_dayofyear
           , subq_7.metric_time__day
           , subq_7.metric_time__week
           , subq_7.metric_time__month
@@ -257,21 +411,49 @@ CROSS JOIN (
             , subq_6.ds__month
             , subq_6.ds__quarter
             , subq_6.ds__year
+            , subq_6.ds__extract_year
+            , subq_6.ds__extract_quarter
+            , subq_6.ds__extract_month
+            , subq_6.ds__extract_week
+            , subq_6.ds__extract_day
+            , subq_6.ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear
             , subq_6.created_at__day
             , subq_6.created_at__week
             , subq_6.created_at__month
             , subq_6.created_at__quarter
             , subq_6.created_at__year
+            , subq_6.created_at__extract_year
+            , subq_6.created_at__extract_quarter
+            , subq_6.created_at__extract_month
+            , subq_6.created_at__extract_week
+            , subq_6.created_at__extract_day
+            , subq_6.created_at__extract_dayofweek
+            , subq_6.created_at__extract_dayofyear
             , subq_6.listing__ds__day
             , subq_6.listing__ds__week
             , subq_6.listing__ds__month
             , subq_6.listing__ds__quarter
             , subq_6.listing__ds__year
+            , subq_6.listing__ds__extract_year
+            , subq_6.listing__ds__extract_quarter
+            , subq_6.listing__ds__extract_month
+            , subq_6.listing__ds__extract_week
+            , subq_6.listing__ds__extract_day
+            , subq_6.listing__ds__extract_dayofweek
+            , subq_6.listing__ds__extract_dayofyear
             , subq_6.listing__created_at__day
             , subq_6.listing__created_at__week
             , subq_6.listing__created_at__month
             , subq_6.listing__created_at__quarter
             , subq_6.listing__created_at__year
+            , subq_6.listing__created_at__extract_year
+            , subq_6.listing__created_at__extract_quarter
+            , subq_6.listing__created_at__extract_month
+            , subq_6.listing__created_at__extract_week
+            , subq_6.listing__created_at__extract_day
+            , subq_6.listing__created_at__extract_dayofweek
+            , subq_6.listing__created_at__extract_dayofyear
             , subq_6.ds__day AS metric_time__day
             , subq_6.ds__week AS metric_time__week
             , subq_6.ds__month AS metric_time__month
@@ -300,11 +482,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -313,11 +509,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql
index 14a9f0385a..dc0afd0f09 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql
@@ -44,31 +44,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -118,32 +160,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -182,31 +266,73 @@ FROM (
                 , subq_5.ds__month
                 , subq_5.ds__quarter
                 , subq_5.ds__year
+                , subq_5.ds__extract_year
+                , subq_5.ds__extract_quarter
+                , subq_5.ds__extract_month
+                , subq_5.ds__extract_week
+                , subq_5.ds__extract_day
+                , subq_5.ds__extract_dayofweek
+                , subq_5.ds__extract_dayofyear
                 , subq_5.ds_partitioned__day
                 , subq_5.ds_partitioned__week
                 , subq_5.ds_partitioned__month
                 , subq_5.ds_partitioned__quarter
                 , subq_5.ds_partitioned__year
+                , subq_5.ds_partitioned__extract_year
+                , subq_5.ds_partitioned__extract_quarter
+                , subq_5.ds_partitioned__extract_month
+                , subq_5.ds_partitioned__extract_week
+                , subq_5.ds_partitioned__extract_day
+                , subq_5.ds_partitioned__extract_dayofweek
+                , subq_5.ds_partitioned__extract_dayofyear
                 , subq_5.paid_at__day
                 , subq_5.paid_at__week
                 , subq_5.paid_at__month
                 , subq_5.paid_at__quarter
                 , subq_5.paid_at__year
+                , subq_5.paid_at__extract_year
+                , subq_5.paid_at__extract_quarter
+                , subq_5.paid_at__extract_month
+                , subq_5.paid_at__extract_week
+                , subq_5.paid_at__extract_day
+                , subq_5.paid_at__extract_dayofweek
+                , subq_5.paid_at__extract_dayofyear
                 , subq_5.booking__ds__day
                 , subq_5.booking__ds__week
                 , subq_5.booking__ds__month
                 , subq_5.booking__ds__quarter
                 , subq_5.booking__ds__year
+                , subq_5.booking__ds__extract_year
+                , subq_5.booking__ds__extract_quarter
+                , subq_5.booking__ds__extract_month
+                , subq_5.booking__ds__extract_week
+                , subq_5.booking__ds__extract_day
+                , subq_5.booking__ds__extract_dayofweek
+                , subq_5.booking__ds__extract_dayofyear
                 , subq_5.booking__ds_partitioned__day
                 , subq_5.booking__ds_partitioned__week
                 , subq_5.booking__ds_partitioned__month
                 , subq_5.booking__ds_partitioned__quarter
                 , subq_5.booking__ds_partitioned__year
+                , subq_5.booking__ds_partitioned__extract_year
+                , subq_5.booking__ds_partitioned__extract_quarter
+                , subq_5.booking__ds_partitioned__extract_month
+                , subq_5.booking__ds_partitioned__extract_week
+                , subq_5.booking__ds_partitioned__extract_day
+                , subq_5.booking__ds_partitioned__extract_dayofweek
+                , subq_5.booking__ds_partitioned__extract_dayofyear
                 , subq_5.booking__paid_at__day
                 , subq_5.booking__paid_at__week
                 , subq_5.booking__paid_at__month
                 , subq_5.booking__paid_at__quarter
                 , subq_5.booking__paid_at__year
+                , subq_5.booking__paid_at__extract_year
+                , subq_5.booking__paid_at__extract_quarter
+                , subq_5.booking__paid_at__extract_month
+                , subq_5.booking__paid_at__extract_week
+                , subq_5.booking__paid_at__extract_day
+                , subq_5.booking__paid_at__extract_dayofweek
+                , subq_5.booking__paid_at__extract_dayofyear
                 , subq_5.ds__day AS metric_time__day
                 , subq_5.ds__week AS metric_time__week
                 , subq_5.ds__month AS metric_time__month
@@ -256,32 +382,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -332,31 +500,73 @@ FROM (
             , subq_12.ds__month
             , subq_12.ds__quarter
             , subq_12.ds__year
+            , subq_12.ds__extract_year
+            , subq_12.ds__extract_quarter
+            , subq_12.ds__extract_month
+            , subq_12.ds__extract_week
+            , subq_12.ds__extract_day
+            , subq_12.ds__extract_dayofweek
+            , subq_12.ds__extract_dayofyear
             , subq_12.ds_partitioned__day
             , subq_12.ds_partitioned__week
             , subq_12.ds_partitioned__month
             , subq_12.ds_partitioned__quarter
             , subq_12.ds_partitioned__year
+            , subq_12.ds_partitioned__extract_year
+            , subq_12.ds_partitioned__extract_quarter
+            , subq_12.ds_partitioned__extract_month
+            , subq_12.ds_partitioned__extract_week
+            , subq_12.ds_partitioned__extract_day
+            , subq_12.ds_partitioned__extract_dayofweek
+            , subq_12.ds_partitioned__extract_dayofyear
             , subq_12.paid_at__day
             , subq_12.paid_at__week
             , subq_12.paid_at__month
             , subq_12.paid_at__quarter
             , subq_12.paid_at__year
+            , subq_12.paid_at__extract_year
+            , subq_12.paid_at__extract_quarter
+            , subq_12.paid_at__extract_month
+            , subq_12.paid_at__extract_week
+            , subq_12.paid_at__extract_day
+            , subq_12.paid_at__extract_dayofweek
+            , subq_12.paid_at__extract_dayofyear
             , subq_12.booking__ds__day
             , subq_12.booking__ds__week
             , subq_12.booking__ds__month
             , subq_12.booking__ds__quarter
             , subq_12.booking__ds__year
+            , subq_12.booking__ds__extract_year
+            , subq_12.booking__ds__extract_quarter
+            , subq_12.booking__ds__extract_month
+            , subq_12.booking__ds__extract_week
+            , subq_12.booking__ds__extract_day
+            , subq_12.booking__ds__extract_dayofweek
+            , subq_12.booking__ds__extract_dayofyear
             , subq_12.booking__ds_partitioned__day
             , subq_12.booking__ds_partitioned__week
             , subq_12.booking__ds_partitioned__month
             , subq_12.booking__ds_partitioned__quarter
             , subq_12.booking__ds_partitioned__year
+            , subq_12.booking__ds_partitioned__extract_year
+            , subq_12.booking__ds_partitioned__extract_quarter
+            , subq_12.booking__ds_partitioned__extract_month
+            , subq_12.booking__ds_partitioned__extract_week
+            , subq_12.booking__ds_partitioned__extract_day
+            , subq_12.booking__ds_partitioned__extract_dayofweek
+            , subq_12.booking__ds_partitioned__extract_dayofyear
             , subq_12.booking__paid_at__day
             , subq_12.booking__paid_at__week
             , subq_12.booking__paid_at__month
             , subq_12.booking__paid_at__quarter
             , subq_12.booking__paid_at__year
+            , subq_12.booking__paid_at__extract_year
+            , subq_12.booking__paid_at__extract_quarter
+            , subq_12.booking__paid_at__extract_month
+            , subq_12.booking__paid_at__extract_week
+            , subq_12.booking__paid_at__extract_day
+            , subq_12.booking__paid_at__extract_dayofweek
+            , subq_12.booking__paid_at__extract_dayofyear
             , subq_12.ds__day AS metric_time__day
             , subq_12.ds__week AS metric_time__week
             , subq_12.ds__month AS metric_time__month
@@ -406,32 +616,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -480,31 +732,73 @@ FROM (
             , subq_17.ds__month
             , subq_17.ds__quarter
             , subq_17.ds__year
+            , subq_17.ds__extract_year
+            , subq_17.ds__extract_quarter
+            , subq_17.ds__extract_month
+            , subq_17.ds__extract_week
+            , subq_17.ds__extract_day
+            , subq_17.ds__extract_dayofweek
+            , subq_17.ds__extract_dayofyear
             , subq_17.ds_partitioned__day
             , subq_17.ds_partitioned__week
             , subq_17.ds_partitioned__month
             , subq_17.ds_partitioned__quarter
             , subq_17.ds_partitioned__year
+            , subq_17.ds_partitioned__extract_year
+            , subq_17.ds_partitioned__extract_quarter
+            , subq_17.ds_partitioned__extract_month
+            , subq_17.ds_partitioned__extract_week
+            , subq_17.ds_partitioned__extract_day
+            , subq_17.ds_partitioned__extract_dayofweek
+            , subq_17.ds_partitioned__extract_dayofyear
             , subq_17.paid_at__day
             , subq_17.paid_at__week
             , subq_17.paid_at__month
             , subq_17.paid_at__quarter
             , subq_17.paid_at__year
+            , subq_17.paid_at__extract_year
+            , subq_17.paid_at__extract_quarter
+            , subq_17.paid_at__extract_month
+            , subq_17.paid_at__extract_week
+            , subq_17.paid_at__extract_day
+            , subq_17.paid_at__extract_dayofweek
+            , subq_17.paid_at__extract_dayofyear
             , subq_17.booking__ds__day
             , subq_17.booking__ds__week
             , subq_17.booking__ds__month
             , subq_17.booking__ds__quarter
             , subq_17.booking__ds__year
+            , subq_17.booking__ds__extract_year
+            , subq_17.booking__ds__extract_quarter
+            , subq_17.booking__ds__extract_month
+            , subq_17.booking__ds__extract_week
+            , subq_17.booking__ds__extract_day
+            , subq_17.booking__ds__extract_dayofweek
+            , subq_17.booking__ds__extract_dayofyear
             , subq_17.booking__ds_partitioned__day
             , subq_17.booking__ds_partitioned__week
             , subq_17.booking__ds_partitioned__month
             , subq_17.booking__ds_partitioned__quarter
             , subq_17.booking__ds_partitioned__year
+            , subq_17.booking__ds_partitioned__extract_year
+            , subq_17.booking__ds_partitioned__extract_quarter
+            , subq_17.booking__ds_partitioned__extract_month
+            , subq_17.booking__ds_partitioned__extract_week
+            , subq_17.booking__ds_partitioned__extract_day
+            , subq_17.booking__ds_partitioned__extract_dayofweek
+            , subq_17.booking__ds_partitioned__extract_dayofyear
             , subq_17.booking__paid_at__day
             , subq_17.booking__paid_at__week
             , subq_17.booking__paid_at__month
             , subq_17.booking__paid_at__quarter
             , subq_17.booking__paid_at__year
+            , subq_17.booking__paid_at__extract_year
+            , subq_17.booking__paid_at__extract_quarter
+            , subq_17.booking__paid_at__extract_month
+            , subq_17.booking__paid_at__extract_week
+            , subq_17.booking__paid_at__extract_day
+            , subq_17.booking__paid_at__extract_dayofweek
+            , subq_17.booking__paid_at__extract_dayofyear
             , subq_17.ds__day AS metric_time__day
             , subq_17.ds__week AS metric_time__week
             , subq_17.ds__month AS metric_time__month
@@ -554,32 +848,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql
index be96decab5..63116a5458 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql
@@ -45,32 +45,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql
index a5288e7009..a53f3a075b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql
@@ -36,21 +36,49 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.verification__ds__day
             , subq_0.verification__ds__week
             , subq_0.verification__ds__month
             , subq_0.verification__ds__quarter
             , subq_0.verification__ds__year
+            , subq_0.verification__ds__extract_year
+            , subq_0.verification__ds__extract_quarter
+            , subq_0.verification__ds__extract_month
+            , subq_0.verification__ds__extract_week
+            , subq_0.verification__ds__extract_day
+            , subq_0.verification__ds__extract_dayofweek
+            , subq_0.verification__ds__extract_dayofyear
             , subq_0.verification__ds_partitioned__day
             , subq_0.verification__ds_partitioned__week
             , subq_0.verification__ds_partitioned__month
             , subq_0.verification__ds_partitioned__quarter
             , subq_0.verification__ds_partitioned__year
+            , subq_0.verification__ds_partitioned__extract_year
+            , subq_0.verification__ds_partitioned__extract_quarter
+            , subq_0.verification__ds_partitioned__extract_month
+            , subq_0.verification__ds_partitioned__extract_week
+            , subq_0.verification__ds_partitioned__extract_day
+            , subq_0.verification__ds_partitioned__extract_dayofweek
+            , subq_0.verification__ds_partitioned__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -71,22 +99,50 @@ FROM (
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -110,32 +166,74 @@ FROM (
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS ds__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_dayofyear
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS created_at__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofyear
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds) AS user__ds__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS user__ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS user__ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS user__ds__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofyear
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS user__created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS user__created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS user__created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS user__created_at__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofyear
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofyear
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql
index c65a58a300..d88d2d32f3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -54,12 +82,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql
index 603dac8609..094486f462 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql
index adfa1c3f03..a8a26c9899 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -55,12 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index 48a1b43de5..c400372dd4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 08a913aa57..30ab4c1851 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -55,12 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index ed796b148d..ef337f422c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql
index 782ccc2826..16b897731d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql
@@ -31,32 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -83,11 +125,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -96,11 +152,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql
index 0f449eb59e..7dd5c3b39d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql
@@ -20,32 +20,74 @@ SELECT
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql
index ee19129508..e240956212 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql
@@ -20,32 +20,74 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql
index 214766cb17..073c7964da 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -165,31 +249,73 @@ FULL OUTER JOIN (
           , subq_5.ds__month
           , subq_5.ds__quarter
           , subq_5.ds__year
+          , subq_5.ds__extract_year
+          , subq_5.ds__extract_quarter
+          , subq_5.ds__extract_month
+          , subq_5.ds__extract_week
+          , subq_5.ds__extract_day
+          , subq_5.ds__extract_dayofweek
+          , subq_5.ds__extract_dayofyear
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
           , subq_5.ds_partitioned__quarter
           , subq_5.ds_partitioned__year
+          , subq_5.ds_partitioned__extract_year
+          , subq_5.ds_partitioned__extract_quarter
+          , subq_5.ds_partitioned__extract_month
+          , subq_5.ds_partitioned__extract_week
+          , subq_5.ds_partitioned__extract_day
+          , subq_5.ds_partitioned__extract_dayofweek
+          , subq_5.ds_partitioned__extract_dayofyear
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
           , subq_5.paid_at__quarter
           , subq_5.paid_at__year
+          , subq_5.paid_at__extract_year
+          , subq_5.paid_at__extract_quarter
+          , subq_5.paid_at__extract_month
+          , subq_5.paid_at__extract_week
+          , subq_5.paid_at__extract_day
+          , subq_5.paid_at__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
           , subq_5.booking__ds__quarter
           , subq_5.booking__ds__year
+          , subq_5.booking__ds__extract_year
+          , subq_5.booking__ds__extract_quarter
+          , subq_5.booking__ds__extract_month
+          , subq_5.booking__ds__extract_week
+          , subq_5.booking__ds__extract_day
+          , subq_5.booking__ds__extract_dayofweek
+          , subq_5.booking__ds__extract_dayofyear
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
           , subq_5.booking__ds_partitioned__quarter
           , subq_5.booking__ds_partitioned__year
+          , subq_5.booking__ds_partitioned__extract_year
+          , subq_5.booking__ds_partitioned__extract_quarter
+          , subq_5.booking__ds_partitioned__extract_month
+          , subq_5.booking__ds_partitioned__extract_week
+          , subq_5.booking__ds_partitioned__extract_day
+          , subq_5.booking__ds_partitioned__extract_dayofweek
+          , subq_5.booking__ds_partitioned__extract_dayofyear
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
           , subq_5.booking__paid_at__quarter
           , subq_5.booking__paid_at__year
+          , subq_5.booking__paid_at__extract_year
+          , subq_5.booking__paid_at__extract_quarter
+          , subq_5.booking__paid_at__extract_month
+          , subq_5.booking__paid_at__extract_week
+          , subq_5.booking__paid_at__extract_day
+          , subq_5.booking__paid_at__extract_dayofweek
+          , subq_5.booking__paid_at__extract_dayofyear
           , subq_5.ds__day AS metric_time__day
           , subq_5.ds__week AS metric_time__week
           , subq_5.ds__month AS metric_time__month
@@ -239,32 +365,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql
index 63637a9433..c80b16baf0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql
@@ -44,32 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -96,11 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -109,11 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index f9ef4e1727..5f9a321abd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -51,31 +51,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -125,32 +167,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -175,21 +259,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -218,11 +330,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -231,11 +357,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -296,21 +436,49 @@ FROM (
                 , subq_10.ds__month
                 , subq_10.ds__quarter
                 , subq_10.ds__year
+                , subq_10.ds__extract_year
+                , subq_10.ds__extract_quarter
+                , subq_10.ds__extract_month
+                , subq_10.ds__extract_week
+                , subq_10.ds__extract_day
+                , subq_10.ds__extract_dayofweek
+                , subq_10.ds__extract_dayofyear
                 , subq_10.ds_partitioned__day
                 , subq_10.ds_partitioned__week
                 , subq_10.ds_partitioned__month
                 , subq_10.ds_partitioned__quarter
                 , subq_10.ds_partitioned__year
+                , subq_10.ds_partitioned__extract_year
+                , subq_10.ds_partitioned__extract_quarter
+                , subq_10.ds_partitioned__extract_month
+                , subq_10.ds_partitioned__extract_week
+                , subq_10.ds_partitioned__extract_day
+                , subq_10.ds_partitioned__extract_dayofweek
+                , subq_10.ds_partitioned__extract_dayofyear
                 , subq_10.view__ds__day
                 , subq_10.view__ds__week
                 , subq_10.view__ds__month
                 , subq_10.view__ds__quarter
                 , subq_10.view__ds__year
+                , subq_10.view__ds__extract_year
+                , subq_10.view__ds__extract_quarter
+                , subq_10.view__ds__extract_month
+                , subq_10.view__ds__extract_week
+                , subq_10.view__ds__extract_day
+                , subq_10.view__ds__extract_dayofweek
+                , subq_10.view__ds__extract_dayofyear
                 , subq_10.view__ds_partitioned__day
                 , subq_10.view__ds_partitioned__week
                 , subq_10.view__ds_partitioned__month
                 , subq_10.view__ds_partitioned__quarter
                 , subq_10.view__ds_partitioned__year
+                , subq_10.view__ds_partitioned__extract_year
+                , subq_10.view__ds_partitioned__extract_quarter
+                , subq_10.view__ds_partitioned__extract_month
+                , subq_10.view__ds_partitioned__extract_week
+                , subq_10.view__ds_partitioned__extract_day
+                , subq_10.view__ds_partitioned__extract_dayofweek
+                , subq_10.view__ds_partitioned__extract_dayofyear
                 , subq_10.ds__day AS metric_time__day
                 , subq_10.ds__week AS metric_time__week
                 , subq_10.ds__month AS metric_time__month
@@ -330,21 +498,49 @@ FROM (
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS ds__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_dayofyear
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC('week', views_source_src_10009.ds) AS view__ds__week
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS view__ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS view__ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS view__ds__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS view__ds__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS view__ds__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS view__ds__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS view__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_dayofyear
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofyear
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -367,21 +563,49 @@ FROM (
                 , subq_13.ds__month
                 , subq_13.ds__quarter
                 , subq_13.ds__year
+                , subq_13.ds__extract_year
+                , subq_13.ds__extract_quarter
+                , subq_13.ds__extract_month
+                , subq_13.ds__extract_week
+                , subq_13.ds__extract_day
+                , subq_13.ds__extract_dayofweek
+                , subq_13.ds__extract_dayofyear
                 , subq_13.created_at__day
                 , subq_13.created_at__week
                 , subq_13.created_at__month
                 , subq_13.created_at__quarter
                 , subq_13.created_at__year
+                , subq_13.created_at__extract_year
+                , subq_13.created_at__extract_quarter
+                , subq_13.created_at__extract_month
+                , subq_13.created_at__extract_week
+                , subq_13.created_at__extract_day
+                , subq_13.created_at__extract_dayofweek
+                , subq_13.created_at__extract_dayofyear
                 , subq_13.listing__ds__day
                 , subq_13.listing__ds__week
                 , subq_13.listing__ds__month
                 , subq_13.listing__ds__quarter
                 , subq_13.listing__ds__year
+                , subq_13.listing__ds__extract_year
+                , subq_13.listing__ds__extract_quarter
+                , subq_13.listing__ds__extract_month
+                , subq_13.listing__ds__extract_week
+                , subq_13.listing__ds__extract_day
+                , subq_13.listing__ds__extract_dayofweek
+                , subq_13.listing__ds__extract_dayofyear
                 , subq_13.listing__created_at__day
                 , subq_13.listing__created_at__week
                 , subq_13.listing__created_at__month
                 , subq_13.listing__created_at__quarter
                 , subq_13.listing__created_at__year
+                , subq_13.listing__created_at__extract_year
+                , subq_13.listing__created_at__extract_quarter
+                , subq_13.listing__created_at__extract_month
+                , subq_13.listing__created_at__extract_week
+                , subq_13.listing__created_at__extract_day
+                , subq_13.listing__created_at__extract_dayofweek
+                , subq_13.listing__created_at__extract_dayofyear
                 , subq_13.ds__day AS metric_time__day
                 , subq_13.ds__week AS metric_time__week
                 , subq_13.ds__month AS metric_time__month
@@ -410,11 +634,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -423,11 +661,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index e424fa31af..b2d5615477 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -47,32 +47,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -99,11 +141,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -112,11 +168,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql
index 48583b238a..b6f01861d7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql
@@ -44,32 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -96,11 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -109,11 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql
index 4ca35f2544..d480357663 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql
@@ -38,32 +38,74 @@ FROM (
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
index b515ad2da5..f52c8d6acf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
index 5eb893b84a..4e79154b70 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
index 2393630095..f44071348d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
@@ -18,11 +18,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -40,11 +54,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
index 9ced88e0cc..4c321e73b0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index dd00d2b15e..4821d797fe 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_1.ds__month
         , subq_1.ds__quarter
         , subq_1.ds__year
+        , subq_1.ds__extract_year
+        , subq_1.ds__extract_quarter
+        , subq_1.ds__extract_month
+        , subq_1.ds__extract_week
+        , subq_1.ds__extract_day
+        , subq_1.ds__extract_dayofweek
+        , subq_1.ds__extract_dayofyear
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
         , subq_1.company__ds__quarter
         , subq_1.company__ds__year
+        , subq_1.company__ds__extract_year
+        , subq_1.company__ds__extract_quarter
+        , subq_1.company__ds__extract_month
+        , subq_1.company__ds__extract_week
+        , subq_1.company__ds__extract_day
+        , subq_1.company__ds__extract_dayofweek
+        , subq_1.company__ds__extract_dayofyear
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -42,11 +56,25 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
           , subq_0.company__ds__quarter
           , subq_0.company__ds__year
+          , subq_0.company__ds__extract_year
+          , subq_0.company__ds__extract_quarter
+          , subq_0.company__ds__extract_month
+          , subq_0.company__ds__extract_week
+          , subq_0.company__ds__extract_day
+          , subq_0.company__ds__extract_dayofweek
+          , subq_0.company__ds__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
index 658dcf3357..2a39c9282f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_1.ds__month
         , subq_1.ds__quarter
         , subq_1.ds__year
+        , subq_1.ds__extract_year
+        , subq_1.ds__extract_quarter
+        , subq_1.ds__extract_month
+        , subq_1.ds__extract_week
+        , subq_1.ds__extract_day
+        , subq_1.ds__extract_dayofweek
+        , subq_1.ds__extract_dayofyear
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
         , subq_1.company__ds__quarter
         , subq_1.company__ds__year
+        , subq_1.company__ds__extract_year
+        , subq_1.company__ds__extract_quarter
+        , subq_1.company__ds__extract_month
+        , subq_1.company__ds__extract_week
+        , subq_1.company__ds__extract_day
+        , subq_1.company__ds__extract_dayofweek
+        , subq_1.company__ds__extract_dayofyear
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -42,11 +56,25 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
           , subq_0.company__ds__quarter
           , subq_0.company__ds__year
+          , subq_0.company__ds__extract_year
+          , subq_0.company__ds__extract_quarter
+          , subq_0.company__ds__extract_month
+          , subq_0.company__ds__extract_week
+          , subq_0.company__ds__extract_day
+          , subq_0.company__ds__extract_dayofweek
+          , subq_0.company__ds__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql
index 9bafb5e1f6..82ded0a878 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -170,31 +254,73 @@ FROM (
             , subq_5.ds__month
             , subq_5.ds__quarter
             , subq_5.ds__year
+            , subq_5.ds__extract_year
+            , subq_5.ds__extract_quarter
+            , subq_5.ds__extract_month
+            , subq_5.ds__extract_week
+            , subq_5.ds__extract_day
+            , subq_5.ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear
             , subq_5.ds_partitioned__day
             , subq_5.ds_partitioned__week
             , subq_5.ds_partitioned__month
             , subq_5.ds_partitioned__quarter
             , subq_5.ds_partitioned__year
+            , subq_5.ds_partitioned__extract_year
+            , subq_5.ds_partitioned__extract_quarter
+            , subq_5.ds_partitioned__extract_month
+            , subq_5.ds_partitioned__extract_week
+            , subq_5.ds_partitioned__extract_day
+            , subq_5.ds_partitioned__extract_dayofweek
+            , subq_5.ds_partitioned__extract_dayofyear
             , subq_5.paid_at__day
             , subq_5.paid_at__week
             , subq_5.paid_at__month
             , subq_5.paid_at__quarter
             , subq_5.paid_at__year
+            , subq_5.paid_at__extract_year
+            , subq_5.paid_at__extract_quarter
+            , subq_5.paid_at__extract_month
+            , subq_5.paid_at__extract_week
+            , subq_5.paid_at__extract_day
+            , subq_5.paid_at__extract_dayofweek
+            , subq_5.paid_at__extract_dayofyear
             , subq_5.booking__ds__day
             , subq_5.booking__ds__week
             , subq_5.booking__ds__month
             , subq_5.booking__ds__quarter
             , subq_5.booking__ds__year
+            , subq_5.booking__ds__extract_year
+            , subq_5.booking__ds__extract_quarter
+            , subq_5.booking__ds__extract_month
+            , subq_5.booking__ds__extract_week
+            , subq_5.booking__ds__extract_day
+            , subq_5.booking__ds__extract_dayofweek
+            , subq_5.booking__ds__extract_dayofyear
             , subq_5.booking__ds_partitioned__day
             , subq_5.booking__ds_partitioned__week
             , subq_5.booking__ds_partitioned__month
             , subq_5.booking__ds_partitioned__quarter
             , subq_5.booking__ds_partitioned__year
+            , subq_5.booking__ds_partitioned__extract_year
+            , subq_5.booking__ds_partitioned__extract_quarter
+            , subq_5.booking__ds_partitioned__extract_month
+            , subq_5.booking__ds_partitioned__extract_week
+            , subq_5.booking__ds_partitioned__extract_day
+            , subq_5.booking__ds_partitioned__extract_dayofweek
+            , subq_5.booking__ds_partitioned__extract_dayofyear
             , subq_5.booking__paid_at__day
             , subq_5.booking__paid_at__week
             , subq_5.booking__paid_at__month
             , subq_5.booking__paid_at__quarter
             , subq_5.booking__paid_at__year
+            , subq_5.booking__paid_at__extract_year
+            , subq_5.booking__paid_at__extract_quarter
+            , subq_5.booking__paid_at__extract_month
+            , subq_5.booking__paid_at__extract_week
+            , subq_5.booking__paid_at__extract_day
+            , subq_5.booking__paid_at__extract_dayofweek
+            , subq_5.booking__paid_at__extract_dayofyear
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -244,32 +370,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
index edbbe545fd..f21c6e33a7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index c97b8fd930..34b929887f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
index 03b1c29282..44073119ae 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 6a32edb464..66bd68c2c6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index d52164ec94..9ab70d9a6a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -33,31 +33,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -93,31 +135,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -167,32 +251,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -235,31 +361,73 @@ FROM (
             , subq_9.ds__month AS ds__month
             , subq_9.ds__quarter AS ds__quarter
             , subq_9.ds__year AS ds__year
+            , subq_9.ds__extract_year AS ds__extract_year
+            , subq_9.ds__extract_quarter AS ds__extract_quarter
+            , subq_9.ds__extract_month AS ds__extract_month
+            , subq_9.ds__extract_week AS ds__extract_week
+            , subq_9.ds__extract_day AS ds__extract_day
+            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
             , subq_9.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_9.ds_partitioned__year AS ds_partitioned__year
+            , subq_9.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_9.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
             , subq_9.paid_at__quarter AS paid_at__quarter
             , subq_9.paid_at__year AS paid_at__year
+            , subq_9.paid_at__extract_year AS paid_at__extract_year
+            , subq_9.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_9.paid_at__extract_month AS paid_at__extract_month
+            , subq_9.paid_at__extract_week AS paid_at__extract_week
+            , subq_9.paid_at__extract_day AS paid_at__extract_day
+            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
             , subq_9.booking__ds__quarter AS booking__ds__quarter
             , subq_9.booking__ds__year AS booking__ds__year
+            , subq_9.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_9.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_9.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_9.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_9.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_9.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_9.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_9.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_9.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
             , subq_9.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_9.booking__paid_at__year AS booking__paid_at__year
+            , subq_9.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_9.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -295,31 +463,73 @@ FROM (
               , subq_8.ds__month
               , subq_8.ds__quarter
               , subq_8.ds__year
+              , subq_8.ds__extract_year
+              , subq_8.ds__extract_quarter
+              , subq_8.ds__extract_month
+              , subq_8.ds__extract_week
+              , subq_8.ds__extract_day
+              , subq_8.ds__extract_dayofweek
+              , subq_8.ds__extract_dayofyear
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
               , subq_8.ds_partitioned__quarter
               , subq_8.ds_partitioned__year
+              , subq_8.ds_partitioned__extract_year
+              , subq_8.ds_partitioned__extract_quarter
+              , subq_8.ds_partitioned__extract_month
+              , subq_8.ds_partitioned__extract_week
+              , subq_8.ds_partitioned__extract_day
+              , subq_8.ds_partitioned__extract_dayofweek
+              , subq_8.ds_partitioned__extract_dayofyear
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
               , subq_8.paid_at__quarter
               , subq_8.paid_at__year
+              , subq_8.paid_at__extract_year
+              , subq_8.paid_at__extract_quarter
+              , subq_8.paid_at__extract_month
+              , subq_8.paid_at__extract_week
+              , subq_8.paid_at__extract_day
+              , subq_8.paid_at__extract_dayofweek
+              , subq_8.paid_at__extract_dayofyear
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
               , subq_8.booking__ds__quarter
               , subq_8.booking__ds__year
+              , subq_8.booking__ds__extract_year
+              , subq_8.booking__ds__extract_quarter
+              , subq_8.booking__ds__extract_month
+              , subq_8.booking__ds__extract_week
+              , subq_8.booking__ds__extract_day
+              , subq_8.booking__ds__extract_dayofweek
+              , subq_8.booking__ds__extract_dayofyear
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
               , subq_8.booking__ds_partitioned__quarter
               , subq_8.booking__ds_partitioned__year
+              , subq_8.booking__ds_partitioned__extract_year
+              , subq_8.booking__ds_partitioned__extract_quarter
+              , subq_8.booking__ds_partitioned__extract_month
+              , subq_8.booking__ds_partitioned__extract_week
+              , subq_8.booking__ds_partitioned__extract_day
+              , subq_8.booking__ds_partitioned__extract_dayofweek
+              , subq_8.booking__ds_partitioned__extract_dayofyear
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
               , subq_8.booking__paid_at__quarter
               , subq_8.booking__paid_at__year
+              , subq_8.booking__paid_at__extract_year
+              , subq_8.booking__paid_at__extract_quarter
+              , subq_8.booking__paid_at__extract_month
+              , subq_8.booking__paid_at__extract_week
+              , subq_8.booking__paid_at__extract_day
+              , subq_8.booking__paid_at__extract_dayofweek
+              , subq_8.booking__paid_at__extract_dayofyear
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -369,32 +579,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 1a2a3259ba..34b0e577f7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -33,31 +33,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -93,31 +135,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -167,32 +251,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -236,31 +362,73 @@ FROM (
             , subq_9.ds__month AS ds__month
             , subq_9.ds__quarter AS ds__quarter
             , subq_9.ds__year AS ds__year
+            , subq_9.ds__extract_year AS ds__extract_year
+            , subq_9.ds__extract_quarter AS ds__extract_quarter
+            , subq_9.ds__extract_month AS ds__extract_month
+            , subq_9.ds__extract_week AS ds__extract_week
+            , subq_9.ds__extract_day AS ds__extract_day
+            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
             , subq_9.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_9.ds_partitioned__year AS ds_partitioned__year
+            , subq_9.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_9.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
             , subq_9.paid_at__quarter AS paid_at__quarter
             , subq_9.paid_at__year AS paid_at__year
+            , subq_9.paid_at__extract_year AS paid_at__extract_year
+            , subq_9.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_9.paid_at__extract_month AS paid_at__extract_month
+            , subq_9.paid_at__extract_week AS paid_at__extract_week
+            , subq_9.paid_at__extract_day AS paid_at__extract_day
+            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
             , subq_9.booking__ds__quarter AS booking__ds__quarter
             , subq_9.booking__ds__year AS booking__ds__year
+            , subq_9.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_9.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_9.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_9.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_9.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_9.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_9.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_9.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_9.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
             , subq_9.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_9.booking__paid_at__year AS booking__paid_at__year
+            , subq_9.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_9.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -296,31 +464,73 @@ FROM (
               , subq_8.ds__month
               , subq_8.ds__quarter
               , subq_8.ds__year
+              , subq_8.ds__extract_year
+              , subq_8.ds__extract_quarter
+              , subq_8.ds__extract_month
+              , subq_8.ds__extract_week
+              , subq_8.ds__extract_day
+              , subq_8.ds__extract_dayofweek
+              , subq_8.ds__extract_dayofyear
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
               , subq_8.ds_partitioned__quarter
               , subq_8.ds_partitioned__year
+              , subq_8.ds_partitioned__extract_year
+              , subq_8.ds_partitioned__extract_quarter
+              , subq_8.ds_partitioned__extract_month
+              , subq_8.ds_partitioned__extract_week
+              , subq_8.ds_partitioned__extract_day
+              , subq_8.ds_partitioned__extract_dayofweek
+              , subq_8.ds_partitioned__extract_dayofyear
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
               , subq_8.paid_at__quarter
               , subq_8.paid_at__year
+              , subq_8.paid_at__extract_year
+              , subq_8.paid_at__extract_quarter
+              , subq_8.paid_at__extract_month
+              , subq_8.paid_at__extract_week
+              , subq_8.paid_at__extract_day
+              , subq_8.paid_at__extract_dayofweek
+              , subq_8.paid_at__extract_dayofyear
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
               , subq_8.booking__ds__quarter
               , subq_8.booking__ds__year
+              , subq_8.booking__ds__extract_year
+              , subq_8.booking__ds__extract_quarter
+              , subq_8.booking__ds__extract_month
+              , subq_8.booking__ds__extract_week
+              , subq_8.booking__ds__extract_day
+              , subq_8.booking__ds__extract_dayofweek
+              , subq_8.booking__ds__extract_dayofyear
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
               , subq_8.booking__ds_partitioned__quarter
               , subq_8.booking__ds_partitioned__year
+              , subq_8.booking__ds_partitioned__extract_year
+              , subq_8.booking__ds_partitioned__extract_quarter
+              , subq_8.booking__ds_partitioned__extract_month
+              , subq_8.booking__ds_partitioned__extract_week
+              , subq_8.booking__ds_partitioned__extract_day
+              , subq_8.booking__ds_partitioned__extract_dayofweek
+              , subq_8.booking__ds_partitioned__extract_dayofyear
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
               , subq_8.booking__paid_at__quarter
               , subq_8.booking__paid_at__year
+              , subq_8.booking__paid_at__extract_year
+              , subq_8.booking__paid_at__extract_quarter
+              , subq_8.booking__paid_at__extract_month
+              , subq_8.booking__paid_at__extract_week
+              , subq_8.booking__paid_at__extract_day
+              , subq_8.booking__paid_at__extract_dayofweek
+              , subq_8.booking__paid_at__extract_dayofyear
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -370,32 +580,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
index edd3eef59c..390f041085 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_4.ds__month AS ds__month
           , subq_4.ds__quarter AS ds__quarter
           , subq_4.ds__year AS ds__year
+          , subq_4.ds__extract_year AS ds__extract_year
+          , subq_4.ds__extract_quarter AS ds__extract_quarter
+          , subq_4.ds__extract_month AS ds__extract_month
+          , subq_4.ds__extract_week AS ds__extract_week
+          , subq_4.ds__extract_day AS ds__extract_day
+          , subq_4.ds__extract_dayofweek AS ds__extract_dayofweek
+          , subq_4.ds__extract_dayofyear AS ds__extract_dayofyear
           , subq_4.ds_partitioned__day AS ds_partitioned__day
           , subq_4.ds_partitioned__week AS ds_partitioned__week
           , subq_4.ds_partitioned__month AS ds_partitioned__month
           , subq_4.ds_partitioned__quarter AS ds_partitioned__quarter
           , subq_4.ds_partitioned__year AS ds_partitioned__year
+          , subq_4.ds_partitioned__extract_year AS ds_partitioned__extract_year
+          , subq_4.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+          , subq_4.ds_partitioned__extract_month AS ds_partitioned__extract_month
+          , subq_4.ds_partitioned__extract_week AS ds_partitioned__extract_week
+          , subq_4.ds_partitioned__extract_day AS ds_partitioned__extract_day
+          , subq_4.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+          , subq_4.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
           , subq_4.paid_at__day AS paid_at__day
           , subq_4.paid_at__week AS paid_at__week
           , subq_4.paid_at__month AS paid_at__month
           , subq_4.paid_at__quarter AS paid_at__quarter
           , subq_4.paid_at__year AS paid_at__year
+          , subq_4.paid_at__extract_year AS paid_at__extract_year
+          , subq_4.paid_at__extract_quarter AS paid_at__extract_quarter
+          , subq_4.paid_at__extract_month AS paid_at__extract_month
+          , subq_4.paid_at__extract_week AS paid_at__extract_week
+          , subq_4.paid_at__extract_day AS paid_at__extract_day
+          , subq_4.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+          , subq_4.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
           , subq_4.booking__ds__day AS booking__ds__day
           , subq_4.booking__ds__week AS booking__ds__week
           , subq_4.booking__ds__month AS booking__ds__month
           , subq_4.booking__ds__quarter AS booking__ds__quarter
           , subq_4.booking__ds__year AS booking__ds__year
+          , subq_4.booking__ds__extract_year AS booking__ds__extract_year
+          , subq_4.booking__ds__extract_quarter AS booking__ds__extract_quarter
+          , subq_4.booking__ds__extract_month AS booking__ds__extract_month
+          , subq_4.booking__ds__extract_week AS booking__ds__extract_week
+          , subq_4.booking__ds__extract_day AS booking__ds__extract_day
+          , subq_4.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+          , subq_4.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
           , subq_4.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_4.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_4.booking__ds_partitioned__month AS booking__ds_partitioned__month
           , subq_4.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
           , subq_4.booking__ds_partitioned__year AS booking__ds_partitioned__year
+          , subq_4.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+          , subq_4.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+          , subq_4.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+          , subq_4.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+          , subq_4.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+          , subq_4.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+          , subq_4.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
           , subq_4.booking__paid_at__day AS booking__paid_at__day
           , subq_4.booking__paid_at__week AS booking__paid_at__week
           , subq_4.booking__paid_at__month AS booking__paid_at__month
           , subq_4.booking__paid_at__quarter AS booking__paid_at__quarter
           , subq_4.booking__paid_at__year AS booking__paid_at__year
+          , subq_4.booking__paid_at__extract_year AS booking__paid_at__extract_year
+          , subq_4.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+          , subq_4.booking__paid_at__extract_month AS booking__paid_at__extract_month
+          , subq_4.booking__paid_at__extract_week AS booking__paid_at__extract_week
+          , subq_4.booking__paid_at__extract_day AS booking__paid_at__extract_day
+          , subq_4.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+          , subq_4.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
           , subq_4.listing AS listing
           , subq_4.guest AS guest
           , subq_4.host AS host
@@ -88,31 +130,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.metric_time__week AS metric_time__week
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
@@ -152,31 +236,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -226,32 +352,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 26c360ab9e..3c8d87a17b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_1.ds__month AS ds__month
           , subq_1.ds__quarter AS ds__quarter
           , subq_1.ds__year AS ds__year
+          , subq_1.ds__extract_year AS ds__extract_year
+          , subq_1.ds__extract_quarter AS ds__extract_quarter
+          , subq_1.ds__extract_month AS ds__extract_month
+          , subq_1.ds__extract_week AS ds__extract_week
+          , subq_1.ds__extract_day AS ds__extract_day
+          , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+          , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
           , subq_1.ds_partitioned__day AS ds_partitioned__day
           , subq_1.ds_partitioned__week AS ds_partitioned__week
           , subq_1.ds_partitioned__month AS ds_partitioned__month
           , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
           , subq_1.ds_partitioned__year AS ds_partitioned__year
+          , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+          , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+          , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+          , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+          , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+          , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+          , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
           , subq_1.paid_at__day AS paid_at__day
           , subq_1.paid_at__week AS paid_at__week
           , subq_1.paid_at__month AS paid_at__month
           , subq_1.paid_at__quarter AS paid_at__quarter
           , subq_1.paid_at__year AS paid_at__year
+          , subq_1.paid_at__extract_year AS paid_at__extract_year
+          , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+          , subq_1.paid_at__extract_month AS paid_at__extract_month
+          , subq_1.paid_at__extract_week AS paid_at__extract_week
+          , subq_1.paid_at__extract_day AS paid_at__extract_day
+          , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+          , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
           , subq_1.booking__ds__day AS booking__ds__day
           , subq_1.booking__ds__week AS booking__ds__week
           , subq_1.booking__ds__month AS booking__ds__month
           , subq_1.booking__ds__quarter AS booking__ds__quarter
           , subq_1.booking__ds__year AS booking__ds__year
+          , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+          , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+          , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+          , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+          , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+          , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+          , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
           , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
           , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
           , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+          , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+          , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+          , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+          , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+          , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+          , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+          , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
           , subq_1.booking__paid_at__day AS booking__paid_at__day
           , subq_1.booking__paid_at__week AS booking__paid_at__week
           , subq_1.booking__paid_at__month AS booking__paid_at__month
           , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
           , subq_1.booking__paid_at__year AS booking__paid_at__year
+          , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+          , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+          , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+          , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+          , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+          , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+          , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
           , subq_1.listing AS listing
           , subq_1.guest AS guest
           , subq_1.host AS host
@@ -87,31 +129,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -161,32 +245,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql
index 870b2c80ea..3adff18e62 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql
@@ -42,31 +42,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -116,32 +158,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -166,21 +250,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -209,11 +321,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -222,11 +348,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql
index ddba65921c..00efad0383 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql
@@ -25,32 +25,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql
index 7ce1a71c7f..7e0fdff19e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql
@@ -31,32 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 81e6d39ada..eb70f04221 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -48,31 +48,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -122,32 +164,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -172,21 +256,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -215,11 +327,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -228,11 +354,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
index 4caa3d07f0..246522e063 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
@@ -30,8 +30,8 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__day AS listing__window_start__day
-            , subq_4.window_end__day AS listing__window_end__day
+            , subq_4.window_start__extract_month AS listing__window_start__extract_month
+            , subq_4.window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -50,31 +50,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -110,32 +152,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -152,8 +236,8 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__day
-              , subq_3.window_end__day
+              subq_3.window_start__extract_month
+              , subq_3.window_end__extract_dayofweek
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -164,11 +248,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -177,11 +275,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
@@ -196,12 +308,12 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__day
+                subq_2.metric_time__day >= subq_4.window_start__extract_month
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__day
+                  subq_2.metric_time__day < subq_4.window_end__extract_dayofweek
                 ) OR (
-                  subq_4.window_end__day IS NULL
+                  subq_4.window_end__extract_dayofweek IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
index 86a2010b35..710e67b149 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,12 +32,12 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= listings_src_10017.active_from
+        subq_12.metric_time__day >= EXTRACT(MONTH FROM listings_src_10017.active_from)
       ) AND (
         (
-          subq_12.metric_time__day < listings_src_10017.active_to
+          subq_12.metric_time__day < EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to)
         ) OR (
-          listings_src_10017.active_to IS NULL
+          EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 6ed1bd4e99..6ef8853985 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 22702f0c48..29fb5d972e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
index 027f20ea5b..16e8afe8d0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql
index 913fed793c..b00d690648 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql
@@ -26,31 +26,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
index 86b30c4553..583b4a4bf0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
@@ -21,21 +21,49 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.created_at__day
         , subq_0.created_at__week
         , subq_0.created_at__month
         , subq_0.created_at__quarter
         , subq_0.created_at__year
+        , subq_0.created_at__extract_year
+        , subq_0.created_at__extract_quarter
+        , subq_0.created_at__extract_month
+        , subq_0.created_at__extract_week
+        , subq_0.created_at__extract_day
+        , subq_0.created_at__extract_dayofweek
+        , subq_0.created_at__extract_dayofyear
         , subq_0.listing__ds__day
         , subq_0.listing__ds__week
         , subq_0.listing__ds__month
         , subq_0.listing__ds__quarter
         , subq_0.listing__ds__year
+        , subq_0.listing__ds__extract_year
+        , subq_0.listing__ds__extract_quarter
+        , subq_0.listing__ds__extract_month
+        , subq_0.listing__ds__extract_week
+        , subq_0.listing__ds__extract_day
+        , subq_0.listing__ds__extract_dayofweek
+        , subq_0.listing__ds__extract_dayofyear
         , subq_0.listing__created_at__day
         , subq_0.listing__created_at__week
         , subq_0.listing__created_at__month
         , subq_0.listing__created_at__quarter
         , subq_0.listing__created_at__year
+        , subq_0.listing__created_at__extract_year
+        , subq_0.listing__created_at__extract_quarter
+        , subq_0.listing__created_at__extract_month
+        , subq_0.listing__created_at__extract_week
+        , subq_0.listing__created_at__extract_day
+        , subq_0.listing__created_at__extract_dayofweek
+        , subq_0.listing__created_at__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -77,11 +119,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql
index 316737d00a..b05da97264 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql
@@ -35,32 +35,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql
index 73e6a70d92..437dc887b4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql
@@ -60,31 +60,73 @@ FROM (
                     , subq_0.ds__month
                     , subq_0.ds__quarter
                     , subq_0.ds__year
+                    , subq_0.ds__extract_year
+                    , subq_0.ds__extract_quarter
+                    , subq_0.ds__extract_month
+                    , subq_0.ds__extract_week
+                    , subq_0.ds__extract_day
+                    , subq_0.ds__extract_dayofweek
+                    , subq_0.ds__extract_dayofyear
                     , subq_0.ds_partitioned__day
                     , subq_0.ds_partitioned__week
                     , subq_0.ds_partitioned__month
                     , subq_0.ds_partitioned__quarter
                     , subq_0.ds_partitioned__year
+                    , subq_0.ds_partitioned__extract_year
+                    , subq_0.ds_partitioned__extract_quarter
+                    , subq_0.ds_partitioned__extract_month
+                    , subq_0.ds_partitioned__extract_week
+                    , subq_0.ds_partitioned__extract_day
+                    , subq_0.ds_partitioned__extract_dayofweek
+                    , subq_0.ds_partitioned__extract_dayofyear
                     , subq_0.paid_at__day
                     , subq_0.paid_at__week
                     , subq_0.paid_at__month
                     , subq_0.paid_at__quarter
                     , subq_0.paid_at__year
+                    , subq_0.paid_at__extract_year
+                    , subq_0.paid_at__extract_quarter
+                    , subq_0.paid_at__extract_month
+                    , subq_0.paid_at__extract_week
+                    , subq_0.paid_at__extract_day
+                    , subq_0.paid_at__extract_dayofweek
+                    , subq_0.paid_at__extract_dayofyear
                     , subq_0.booking__ds__day
                     , subq_0.booking__ds__week
                     , subq_0.booking__ds__month
                     , subq_0.booking__ds__quarter
                     , subq_0.booking__ds__year
+                    , subq_0.booking__ds__extract_year
+                    , subq_0.booking__ds__extract_quarter
+                    , subq_0.booking__ds__extract_month
+                    , subq_0.booking__ds__extract_week
+                    , subq_0.booking__ds__extract_day
+                    , subq_0.booking__ds__extract_dayofweek
+                    , subq_0.booking__ds__extract_dayofyear
                     , subq_0.booking__ds_partitioned__day
                     , subq_0.booking__ds_partitioned__week
                     , subq_0.booking__ds_partitioned__month
                     , subq_0.booking__ds_partitioned__quarter
                     , subq_0.booking__ds_partitioned__year
+                    , subq_0.booking__ds_partitioned__extract_year
+                    , subq_0.booking__ds_partitioned__extract_quarter
+                    , subq_0.booking__ds_partitioned__extract_month
+                    , subq_0.booking__ds_partitioned__extract_week
+                    , subq_0.booking__ds_partitioned__extract_day
+                    , subq_0.booking__ds_partitioned__extract_dayofweek
+                    , subq_0.booking__ds_partitioned__extract_dayofyear
                     , subq_0.booking__paid_at__day
                     , subq_0.booking__paid_at__week
                     , subq_0.booking__paid_at__month
                     , subq_0.booking__paid_at__quarter
                     , subq_0.booking__paid_at__year
+                    , subq_0.booking__paid_at__extract_year
+                    , subq_0.booking__paid_at__extract_quarter
+                    , subq_0.booking__paid_at__extract_month
+                    , subq_0.booking__paid_at__extract_week
+                    , subq_0.booking__paid_at__extract_day
+                    , subq_0.booking__paid_at__extract_dayofweek
+                    , subq_0.booking__paid_at__extract_dayofyear
                     , subq_0.ds__day AS metric_time__day
                     , subq_0.ds__week AS metric_time__week
                     , subq_0.ds__month AS metric_time__month
@@ -134,32 +176,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -184,21 +268,49 @@ FROM (
                     , subq_3.ds__month
                     , subq_3.ds__quarter
                     , subq_3.ds__year
+                    , subq_3.ds__extract_year
+                    , subq_3.ds__extract_quarter
+                    , subq_3.ds__extract_month
+                    , subq_3.ds__extract_week
+                    , subq_3.ds__extract_day
+                    , subq_3.ds__extract_dayofweek
+                    , subq_3.ds__extract_dayofyear
                     , subq_3.created_at__day
                     , subq_3.created_at__week
                     , subq_3.created_at__month
                     , subq_3.created_at__quarter
                     , subq_3.created_at__year
+                    , subq_3.created_at__extract_year
+                    , subq_3.created_at__extract_quarter
+                    , subq_3.created_at__extract_month
+                    , subq_3.created_at__extract_week
+                    , subq_3.created_at__extract_day
+                    , subq_3.created_at__extract_dayofweek
+                    , subq_3.created_at__extract_dayofyear
                     , subq_3.listing__ds__day
                     , subq_3.listing__ds__week
                     , subq_3.listing__ds__month
                     , subq_3.listing__ds__quarter
                     , subq_3.listing__ds__year
+                    , subq_3.listing__ds__extract_year
+                    , subq_3.listing__ds__extract_quarter
+                    , subq_3.listing__ds__extract_month
+                    , subq_3.listing__ds__extract_week
+                    , subq_3.listing__ds__extract_day
+                    , subq_3.listing__ds__extract_dayofweek
+                    , subq_3.listing__ds__extract_dayofyear
                     , subq_3.listing__created_at__day
                     , subq_3.listing__created_at__week
                     , subq_3.listing__created_at__month
                     , subq_3.listing__created_at__quarter
                     , subq_3.listing__created_at__year
+                    , subq_3.listing__created_at__extract_year
+                    , subq_3.listing__created_at__extract_quarter
+                    , subq_3.listing__created_at__extract_month
+                    , subq_3.listing__created_at__extract_week
+                    , subq_3.listing__created_at__extract_day
+                    , subq_3.listing__created_at__extract_dayofweek
+                    , subq_3.listing__created_at__extract_dayofyear
                     , subq_3.ds__day AS metric_time__day
                     , subq_3.ds__week AS metric_time__week
                     , subq_3.ds__month AS metric_time__month
@@ -227,11 +339,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -240,11 +366,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -317,31 +457,73 @@ FROM (
                     , subq_12.ds__month
                     , subq_12.ds__quarter
                     , subq_12.ds__year
+                    , subq_12.ds__extract_year
+                    , subq_12.ds__extract_quarter
+                    , subq_12.ds__extract_month
+                    , subq_12.ds__extract_week
+                    , subq_12.ds__extract_day
+                    , subq_12.ds__extract_dayofweek
+                    , subq_12.ds__extract_dayofyear
                     , subq_12.ds_partitioned__day
                     , subq_12.ds_partitioned__week
                     , subq_12.ds_partitioned__month
                     , subq_12.ds_partitioned__quarter
                     , subq_12.ds_partitioned__year
+                    , subq_12.ds_partitioned__extract_year
+                    , subq_12.ds_partitioned__extract_quarter
+                    , subq_12.ds_partitioned__extract_month
+                    , subq_12.ds_partitioned__extract_week
+                    , subq_12.ds_partitioned__extract_day
+                    , subq_12.ds_partitioned__extract_dayofweek
+                    , subq_12.ds_partitioned__extract_dayofyear
                     , subq_12.paid_at__day
                     , subq_12.paid_at__week
                     , subq_12.paid_at__month
                     , subq_12.paid_at__quarter
                     , subq_12.paid_at__year
+                    , subq_12.paid_at__extract_year
+                    , subq_12.paid_at__extract_quarter
+                    , subq_12.paid_at__extract_month
+                    , subq_12.paid_at__extract_week
+                    , subq_12.paid_at__extract_day
+                    , subq_12.paid_at__extract_dayofweek
+                    , subq_12.paid_at__extract_dayofyear
                     , subq_12.booking__ds__day
                     , subq_12.booking__ds__week
                     , subq_12.booking__ds__month
                     , subq_12.booking__ds__quarter
                     , subq_12.booking__ds__year
+                    , subq_12.booking__ds__extract_year
+                    , subq_12.booking__ds__extract_quarter
+                    , subq_12.booking__ds__extract_month
+                    , subq_12.booking__ds__extract_week
+                    , subq_12.booking__ds__extract_day
+                    , subq_12.booking__ds__extract_dayofweek
+                    , subq_12.booking__ds__extract_dayofyear
                     , subq_12.booking__ds_partitioned__day
                     , subq_12.booking__ds_partitioned__week
                     , subq_12.booking__ds_partitioned__month
                     , subq_12.booking__ds_partitioned__quarter
                     , subq_12.booking__ds_partitioned__year
+                    , subq_12.booking__ds_partitioned__extract_year
+                    , subq_12.booking__ds_partitioned__extract_quarter
+                    , subq_12.booking__ds_partitioned__extract_month
+                    , subq_12.booking__ds_partitioned__extract_week
+                    , subq_12.booking__ds_partitioned__extract_day
+                    , subq_12.booking__ds_partitioned__extract_dayofweek
+                    , subq_12.booking__ds_partitioned__extract_dayofyear
                     , subq_12.booking__paid_at__day
                     , subq_12.booking__paid_at__week
                     , subq_12.booking__paid_at__month
                     , subq_12.booking__paid_at__quarter
                     , subq_12.booking__paid_at__year
+                    , subq_12.booking__paid_at__extract_year
+                    , subq_12.booking__paid_at__extract_quarter
+                    , subq_12.booking__paid_at__extract_month
+                    , subq_12.booking__paid_at__extract_week
+                    , subq_12.booking__paid_at__extract_day
+                    , subq_12.booking__paid_at__extract_dayofweek
+                    , subq_12.booking__paid_at__extract_dayofyear
                     , subq_12.ds__day AS metric_time__day
                     , subq_12.ds__week AS metric_time__week
                     , subq_12.ds__month AS metric_time__month
@@ -391,32 +573,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -441,21 +665,49 @@ FROM (
                     , subq_15.ds__month
                     , subq_15.ds__quarter
                     , subq_15.ds__year
+                    , subq_15.ds__extract_year
+                    , subq_15.ds__extract_quarter
+                    , subq_15.ds__extract_month
+                    , subq_15.ds__extract_week
+                    , subq_15.ds__extract_day
+                    , subq_15.ds__extract_dayofweek
+                    , subq_15.ds__extract_dayofyear
                     , subq_15.created_at__day
                     , subq_15.created_at__week
                     , subq_15.created_at__month
                     , subq_15.created_at__quarter
                     , subq_15.created_at__year
+                    , subq_15.created_at__extract_year
+                    , subq_15.created_at__extract_quarter
+                    , subq_15.created_at__extract_month
+                    , subq_15.created_at__extract_week
+                    , subq_15.created_at__extract_day
+                    , subq_15.created_at__extract_dayofweek
+                    , subq_15.created_at__extract_dayofyear
                     , subq_15.listing__ds__day
                     , subq_15.listing__ds__week
                     , subq_15.listing__ds__month
                     , subq_15.listing__ds__quarter
                     , subq_15.listing__ds__year
+                    , subq_15.listing__ds__extract_year
+                    , subq_15.listing__ds__extract_quarter
+                    , subq_15.listing__ds__extract_month
+                    , subq_15.listing__ds__extract_week
+                    , subq_15.listing__ds__extract_day
+                    , subq_15.listing__ds__extract_dayofweek
+                    , subq_15.listing__ds__extract_dayofyear
                     , subq_15.listing__created_at__day
                     , subq_15.listing__created_at__week
                     , subq_15.listing__created_at__month
                     , subq_15.listing__created_at__quarter
                     , subq_15.listing__created_at__year
+                    , subq_15.listing__created_at__extract_year
+                    , subq_15.listing__created_at__extract_quarter
+                    , subq_15.listing__created_at__extract_month
+                    , subq_15.listing__created_at__extract_week
+                    , subq_15.listing__created_at__extract_day
+                    , subq_15.listing__created_at__extract_dayofweek
+                    , subq_15.listing__created_at__extract_dayofyear
                     , subq_15.ds__day AS metric_time__day
                     , subq_15.ds__week AS metric_time__week
                     , subq_15.ds__month AS metric_time__month
@@ -484,11 +736,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -497,11 +763,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -557,31 +837,73 @@ FROM (
             , subq_24.ds__month
             , subq_24.ds__quarter
             , subq_24.ds__year
+            , subq_24.ds__extract_year
+            , subq_24.ds__extract_quarter
+            , subq_24.ds__extract_month
+            , subq_24.ds__extract_week
+            , subq_24.ds__extract_day
+            , subq_24.ds__extract_dayofweek
+            , subq_24.ds__extract_dayofyear
             , subq_24.ds_partitioned__day
             , subq_24.ds_partitioned__week
             , subq_24.ds_partitioned__month
             , subq_24.ds_partitioned__quarter
             , subq_24.ds_partitioned__year
+            , subq_24.ds_partitioned__extract_year
+            , subq_24.ds_partitioned__extract_quarter
+            , subq_24.ds_partitioned__extract_month
+            , subq_24.ds_partitioned__extract_week
+            , subq_24.ds_partitioned__extract_day
+            , subq_24.ds_partitioned__extract_dayofweek
+            , subq_24.ds_partitioned__extract_dayofyear
             , subq_24.paid_at__day
             , subq_24.paid_at__week
             , subq_24.paid_at__month
             , subq_24.paid_at__quarter
             , subq_24.paid_at__year
+            , subq_24.paid_at__extract_year
+            , subq_24.paid_at__extract_quarter
+            , subq_24.paid_at__extract_month
+            , subq_24.paid_at__extract_week
+            , subq_24.paid_at__extract_day
+            , subq_24.paid_at__extract_dayofweek
+            , subq_24.paid_at__extract_dayofyear
             , subq_24.booking__ds__day
             , subq_24.booking__ds__week
             , subq_24.booking__ds__month
             , subq_24.booking__ds__quarter
             , subq_24.booking__ds__year
+            , subq_24.booking__ds__extract_year
+            , subq_24.booking__ds__extract_quarter
+            , subq_24.booking__ds__extract_month
+            , subq_24.booking__ds__extract_week
+            , subq_24.booking__ds__extract_day
+            , subq_24.booking__ds__extract_dayofweek
+            , subq_24.booking__ds__extract_dayofyear
             , subq_24.booking__ds_partitioned__day
             , subq_24.booking__ds_partitioned__week
             , subq_24.booking__ds_partitioned__month
             , subq_24.booking__ds_partitioned__quarter
             , subq_24.booking__ds_partitioned__year
+            , subq_24.booking__ds_partitioned__extract_year
+            , subq_24.booking__ds_partitioned__extract_quarter
+            , subq_24.booking__ds_partitioned__extract_month
+            , subq_24.booking__ds_partitioned__extract_week
+            , subq_24.booking__ds_partitioned__extract_day
+            , subq_24.booking__ds_partitioned__extract_dayofweek
+            , subq_24.booking__ds_partitioned__extract_dayofyear
             , subq_24.booking__paid_at__day
             , subq_24.booking__paid_at__week
             , subq_24.booking__paid_at__month
             , subq_24.booking__paid_at__quarter
             , subq_24.booking__paid_at__year
+            , subq_24.booking__paid_at__extract_year
+            , subq_24.booking__paid_at__extract_quarter
+            , subq_24.booking__paid_at__extract_month
+            , subq_24.booking__paid_at__extract_week
+            , subq_24.booking__paid_at__extract_day
+            , subq_24.booking__paid_at__extract_dayofweek
+            , subq_24.booking__paid_at__extract_dayofyear
             , subq_24.ds__day AS metric_time__day
             , subq_24.ds__week AS metric_time__week
             , subq_24.ds__month AS metric_time__month
@@ -631,32 +953,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
index f951333a58..9626242169 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
@@ -45,31 +45,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -119,32 +161,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -186,31 +270,73 @@ FROM (
             , subq_7.ds__month
             , subq_7.ds__quarter
             , subq_7.ds__year
+            , subq_7.ds__extract_year
+            , subq_7.ds__extract_quarter
+            , subq_7.ds__extract_month
+            , subq_7.ds__extract_week
+            , subq_7.ds__extract_day
+            , subq_7.ds__extract_dayofweek
+            , subq_7.ds__extract_dayofyear
             , subq_7.ds_partitioned__day
             , subq_7.ds_partitioned__week
             , subq_7.ds_partitioned__month
             , subq_7.ds_partitioned__quarter
             , subq_7.ds_partitioned__year
+            , subq_7.ds_partitioned__extract_year
+            , subq_7.ds_partitioned__extract_quarter
+            , subq_7.ds_partitioned__extract_month
+            , subq_7.ds_partitioned__extract_week
+            , subq_7.ds_partitioned__extract_day
+            , subq_7.ds_partitioned__extract_dayofweek
+            , subq_7.ds_partitioned__extract_dayofyear
             , subq_7.paid_at__day
             , subq_7.paid_at__week
             , subq_7.paid_at__month
             , subq_7.paid_at__quarter
             , subq_7.paid_at__year
+            , subq_7.paid_at__extract_year
+            , subq_7.paid_at__extract_quarter
+            , subq_7.paid_at__extract_month
+            , subq_7.paid_at__extract_week
+            , subq_7.paid_at__extract_day
+            , subq_7.paid_at__extract_dayofweek
+            , subq_7.paid_at__extract_dayofyear
             , subq_7.booking__ds__day
             , subq_7.booking__ds__week
             , subq_7.booking__ds__month
             , subq_7.booking__ds__quarter
             , subq_7.booking__ds__year
+            , subq_7.booking__ds__extract_year
+            , subq_7.booking__ds__extract_quarter
+            , subq_7.booking__ds__extract_month
+            , subq_7.booking__ds__extract_week
+            , subq_7.booking__ds__extract_day
+            , subq_7.booking__ds__extract_dayofweek
+            , subq_7.booking__ds__extract_dayofyear
             , subq_7.booking__ds_partitioned__day
             , subq_7.booking__ds_partitioned__week
             , subq_7.booking__ds_partitioned__month
             , subq_7.booking__ds_partitioned__quarter
             , subq_7.booking__ds_partitioned__year
+            , subq_7.booking__ds_partitioned__extract_year
+            , subq_7.booking__ds_partitioned__extract_quarter
+            , subq_7.booking__ds_partitioned__extract_month
+            , subq_7.booking__ds_partitioned__extract_week
+            , subq_7.booking__ds_partitioned__extract_day
+            , subq_7.booking__ds_partitioned__extract_dayofweek
+            , subq_7.booking__ds_partitioned__extract_dayofyear
             , subq_7.booking__paid_at__day
             , subq_7.booking__paid_at__week
             , subq_7.booking__paid_at__month
             , subq_7.booking__paid_at__quarter
             , subq_7.booking__paid_at__year
+            , subq_7.booking__paid_at__extract_year
+            , subq_7.booking__paid_at__extract_quarter
+            , subq_7.booking__paid_at__extract_month
+            , subq_7.booking__paid_at__extract_week
+            , subq_7.booking__paid_at__extract_day
+            , subq_7.booking__paid_at__extract_dayofweek
+            , subq_7.booking__paid_at__extract_dayofyear
             , subq_7.ds__day AS metric_time__day
             , subq_7.ds__week AS metric_time__week
             , subq_7.ds__month AS metric_time__month
@@ -260,32 +386,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 13d80a91d0..a495423238 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -39,31 +39,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -113,32 +155,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index e05efe9cf1..c868e3cfd9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -27,31 +27,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -160,21 +244,49 @@ FROM (
             , subq_5.ds__month
             , subq_5.ds__quarter
             , subq_5.ds__year
+            , subq_5.ds__extract_year
+            , subq_5.ds__extract_quarter
+            , subq_5.ds__extract_month
+            , subq_5.ds__extract_week
+            , subq_5.ds__extract_day
+            , subq_5.ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear
             , subq_5.created_at__day
             , subq_5.created_at__week
             , subq_5.created_at__month
             , subq_5.created_at__quarter
             , subq_5.created_at__year
+            , subq_5.created_at__extract_year
+            , subq_5.created_at__extract_quarter
+            , subq_5.created_at__extract_month
+            , subq_5.created_at__extract_week
+            , subq_5.created_at__extract_day
+            , subq_5.created_at__extract_dayofweek
+            , subq_5.created_at__extract_dayofyear
             , subq_5.listing__ds__day
             , subq_5.listing__ds__week
             , subq_5.listing__ds__month
             , subq_5.listing__ds__quarter
             , subq_5.listing__ds__year
+            , subq_5.listing__ds__extract_year
+            , subq_5.listing__ds__extract_quarter
+            , subq_5.listing__ds__extract_month
+            , subq_5.listing__ds__extract_week
+            , subq_5.listing__ds__extract_day
+            , subq_5.listing__ds__extract_dayofweek
+            , subq_5.listing__ds__extract_dayofyear
             , subq_5.listing__created_at__day
             , subq_5.listing__created_at__week
             , subq_5.listing__created_at__month
             , subq_5.listing__created_at__quarter
             , subq_5.listing__created_at__year
+            , subq_5.listing__created_at__extract_year
+            , subq_5.listing__created_at__extract_quarter
+            , subq_5.listing__created_at__extract_month
+            , subq_5.listing__created_at__extract_week
+            , subq_5.listing__created_at__extract_day
+            , subq_5.listing__created_at__extract_dayofweek
+            , subq_5.listing__created_at__extract_dayofyear
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -203,11 +315,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -216,11 +342,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
index 88cc0b431d..677ba894bd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__day AS listing__window_start__day
-        , subq_7.window_end__day AS listing__window_end__day
+        , subq_7.window_start__extract_month AS listing__window_start__extract_month
+        , subq_7.window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
         , subq_2.bookings AS bookings
@@ -40,31 +40,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -142,8 +226,8 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__day
-          , subq_6.window_end__day
+          subq_6.window_start__extract_month
+          , subq_6.window_end__extract_dayofweek
           , subq_6.listing
           , subq_6.user__home_state_latest
         FROM (
@@ -154,26 +238,61 @@ FROM (
             , subq_3.window_start__month AS window_start__month
             , subq_3.window_start__quarter AS window_start__quarter
             , subq_3.window_start__year AS window_start__year
+            , subq_3.window_start__extract_year AS window_start__extract_year
+            , subq_3.window_start__extract_quarter AS window_start__extract_quarter
+            , subq_3.window_start__extract_month AS window_start__extract_month
+            , subq_3.window_start__extract_week AS window_start__extract_week
+            , subq_3.window_start__extract_day AS window_start__extract_day
+            , subq_3.window_start__extract_dayofweek AS window_start__extract_dayofweek
+            , subq_3.window_start__extract_dayofyear AS window_start__extract_dayofyear
             , subq_3.window_end__day AS window_end__day
             , subq_3.window_end__week AS window_end__week
             , subq_3.window_end__month AS window_end__month
             , subq_3.window_end__quarter AS window_end__quarter
             , subq_3.window_end__year AS window_end__year
+            , subq_3.window_end__extract_year AS window_end__extract_year
+            , subq_3.window_end__extract_quarter AS window_end__extract_quarter
+            , subq_3.window_end__extract_month AS window_end__extract_month
+            , subq_3.window_end__extract_week AS window_end__extract_week
+            , subq_3.window_end__extract_day AS window_end__extract_day
+            , subq_3.window_end__extract_dayofweek AS window_end__extract_dayofweek
+            , subq_3.window_end__extract_dayofyear AS window_end__extract_dayofyear
             , subq_3.listing__window_start__day AS listing__window_start__day
             , subq_3.listing__window_start__week AS listing__window_start__week
             , subq_3.listing__window_start__month AS listing__window_start__month
             , subq_3.listing__window_start__quarter AS listing__window_start__quarter
             , subq_3.listing__window_start__year AS listing__window_start__year
+            , subq_3.listing__window_start__extract_year AS listing__window_start__extract_year
+            , subq_3.listing__window_start__extract_quarter AS listing__window_start__extract_quarter
+            , subq_3.listing__window_start__extract_month AS listing__window_start__extract_month
+            , subq_3.listing__window_start__extract_week AS listing__window_start__extract_week
+            , subq_3.listing__window_start__extract_day AS listing__window_start__extract_day
+            , subq_3.listing__window_start__extract_dayofweek AS listing__window_start__extract_dayofweek
+            , subq_3.listing__window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
             , subq_3.listing__window_end__day AS listing__window_end__day
             , subq_3.listing__window_end__week AS listing__window_end__week
             , subq_3.listing__window_end__month AS listing__window_end__month
             , subq_3.listing__window_end__quarter AS listing__window_end__quarter
             , subq_3.listing__window_end__year AS listing__window_end__year
+            , subq_3.listing__window_end__extract_year AS listing__window_end__extract_year
+            , subq_3.listing__window_end__extract_quarter AS listing__window_end__extract_quarter
+            , subq_3.listing__window_end__extract_month AS listing__window_end__extract_month
+            , subq_3.listing__window_end__extract_week AS listing__window_end__extract_week
+            , subq_3.listing__window_end__extract_day AS listing__window_end__extract_day
+            , subq_3.listing__window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
+            , subq_3.listing__window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
             , subq_5.ds__day AS user__ds__day
             , subq_5.ds__week AS user__ds__week
             , subq_5.ds__month AS user__ds__month
             , subq_5.ds__quarter AS user__ds__quarter
             , subq_5.ds__year AS user__ds__year
+            , subq_5.ds__extract_year AS user__ds__extract_year
+            , subq_5.ds__extract_quarter AS user__ds__extract_quarter
+            , subq_5.ds__extract_month AS user__ds__extract_month
+            , subq_5.ds__extract_week AS user__ds__extract_week
+            , subq_5.ds__extract_day AS user__ds__extract_day
+            , subq_5.ds__extract_dayofweek AS user__ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS user__ds__extract_dayofyear
             , subq_3.listing AS listing
             , subq_3.user AS user
             , subq_3.listing__user AS listing__user
@@ -192,11 +311,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -205,11 +338,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -227,11 +374,25 @@ FROM (
             --    'ds__month',
             --    'ds__quarter',
             --    'ds__year',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
             --    'user__ds__day',
             --    'user__ds__week',
             --    'user__ds__month',
             --    'user__ds__quarter',
             --    'user__ds__year',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
             --    'user']
             SELECT
               subq_4.ds__day
@@ -239,11 +400,25 @@ FROM (
               , subq_4.ds__month
               , subq_4.ds__quarter
               , subq_4.ds__year
+              , subq_4.ds__extract_year
+              , subq_4.ds__extract_quarter
+              , subq_4.ds__extract_month
+              , subq_4.ds__extract_week
+              , subq_4.ds__extract_day
+              , subq_4.ds__extract_dayofweek
+              , subq_4.ds__extract_dayofyear
               , subq_4.user__ds__day
               , subq_4.user__ds__week
               , subq_4.user__ds__month
               , subq_4.user__ds__quarter
               , subq_4.user__ds__year
+              , subq_4.user__ds__extract_year
+              , subq_4.user__ds__extract_quarter
+              , subq_4.user__ds__extract_month
+              , subq_4.user__ds__extract_week
+              , subq_4.user__ds__extract_day
+              , subq_4.user__ds__extract_dayofweek
+              , subq_4.user__ds__extract_dayofyear
               , subq_4.user
               , subq_4.home_state_latest
               , subq_4.user__home_state_latest
@@ -255,12 +430,26 @@ FROM (
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS ds__year
+                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_dayofyear
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC('week', users_latest_src_10021.ds) AS user__ds__week
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS user__ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS user__ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS user__ds__year
+                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS user__ds__extract_year
+                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
+                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS user__ds__extract_month
+                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
+                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS user__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_dayofyear
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
@@ -275,12 +464,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__day
+            subq_2.metric_time__day >= subq_7.window_start__extract_month
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.window_end__day
+              subq_2.metric_time__day < subq_7.window_end__extract_dayofweek
             ) OR (
-              subq_7.window_end__day IS NULL
+              subq_7.window_end__extract_dayofweek IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index feb5ed0fdc..425b62e62c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,8 +23,8 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    listings_src_10017.active_from AS window_start__day
-    , listings_src_10017.active_to AS window_end__day
+    EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+    , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
   FROM ***************************.dim_listings listings_src_10017
@@ -38,12 +38,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__day
+      subq_13.metric_time__day >= subq_18.window_start__extract_month
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.window_end__day
+        subq_13.metric_time__day < subq_18.window_end__extract_dayofweek
       ) OR (
-        subq_18.window_end__day IS NULL
+        subq_18.window_end__extract_dayofweek IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
index 94054a124c..72619bc97f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.lux_listing__window_start__day AS listing__lux_listing__window_start__day
-        , subq_7.lux_listing__window_end__day AS listing__lux_listing__window_end__day
+        , subq_7.lux_listing__window_start__extract_quarter AS listing__lux_listing__window_start__extract_quarter
+        , subq_7.lux_listing__window_end__extract_dayofweek AS listing__lux_listing__window_end__extract_dayofweek
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
         , subq_2.bookings AS bookings
@@ -40,31 +40,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -145,8 +229,8 @@ FROM (
         --    'lux_listing__window_end__day',
         --    'listing']
         SELECT
-          subq_6.lux_listing__window_start__day
-          , subq_6.lux_listing__window_end__day
+          subq_6.lux_listing__window_start__extract_quarter
+          , subq_6.lux_listing__window_end__extract_dayofweek
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
         FROM (
@@ -157,11 +241,25 @@ FROM (
             , subq_5.window_start__month AS lux_listing__window_start__month
             , subq_5.window_start__quarter AS lux_listing__window_start__quarter
             , subq_5.window_start__year AS lux_listing__window_start__year
+            , subq_5.window_start__extract_year AS lux_listing__window_start__extract_year
+            , subq_5.window_start__extract_quarter AS lux_listing__window_start__extract_quarter
+            , subq_5.window_start__extract_month AS lux_listing__window_start__extract_month
+            , subq_5.window_start__extract_week AS lux_listing__window_start__extract_week
+            , subq_5.window_start__extract_day AS lux_listing__window_start__extract_day
+            , subq_5.window_start__extract_dayofweek AS lux_listing__window_start__extract_dayofweek
+            , subq_5.window_start__extract_dayofyear AS lux_listing__window_start__extract_dayofyear
             , subq_5.window_end__day AS lux_listing__window_end__day
             , subq_5.window_end__week AS lux_listing__window_end__week
             , subq_5.window_end__month AS lux_listing__window_end__month
             , subq_5.window_end__quarter AS lux_listing__window_end__quarter
             , subq_5.window_end__year AS lux_listing__window_end__year
+            , subq_5.window_end__extract_year AS lux_listing__window_end__extract_year
+            , subq_5.window_end__extract_quarter AS lux_listing__window_end__extract_quarter
+            , subq_5.window_end__extract_month AS lux_listing__window_end__extract_month
+            , subq_5.window_end__extract_week AS lux_listing__window_end__extract_week
+            , subq_5.window_end__extract_day AS lux_listing__window_end__extract_day
+            , subq_5.window_end__extract_dayofweek AS lux_listing__window_end__extract_dayofweek
+            , subq_5.window_end__extract_dayofyear AS lux_listing__window_end__extract_dayofyear
             , subq_3.listing AS listing
             , subq_3.lux_listing AS lux_listing
             , subq_3.listing__lux_listing AS listing__lux_listing
@@ -183,21 +281,49 @@ FROM (
             --    'window_start__month',
             --    'window_start__quarter',
             --    'window_start__year',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
             --    'window_end__day',
             --    'window_end__week',
             --    'window_end__month',
             --    'window_end__quarter',
             --    'window_end__year',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
             --    'lux_listing__window_start__day',
             --    'lux_listing__window_start__week',
             --    'lux_listing__window_start__month',
             --    'lux_listing__window_start__quarter',
             --    'lux_listing__window_start__year',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
             --    'lux_listing__window_end__day',
             --    'lux_listing__window_end__week',
             --    'lux_listing__window_end__month',
             --    'lux_listing__window_end__quarter',
             --    'lux_listing__window_end__year',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
             --    'lux_listing']
             SELECT
               subq_4.window_start__day
@@ -205,21 +331,49 @@ FROM (
               , subq_4.window_start__month
               , subq_4.window_start__quarter
               , subq_4.window_start__year
+              , subq_4.window_start__extract_year
+              , subq_4.window_start__extract_quarter
+              , subq_4.window_start__extract_month
+              , subq_4.window_start__extract_week
+              , subq_4.window_start__extract_day
+              , subq_4.window_start__extract_dayofweek
+              , subq_4.window_start__extract_dayofyear
               , subq_4.window_end__day
               , subq_4.window_end__week
               , subq_4.window_end__month
               , subq_4.window_end__quarter
               , subq_4.window_end__year
+              , subq_4.window_end__extract_year
+              , subq_4.window_end__extract_quarter
+              , subq_4.window_end__extract_month
+              , subq_4.window_end__extract_week
+              , subq_4.window_end__extract_day
+              , subq_4.window_end__extract_dayofweek
+              , subq_4.window_end__extract_dayofyear
               , subq_4.lux_listing__window_start__day
               , subq_4.lux_listing__window_start__week
               , subq_4.lux_listing__window_start__month
               , subq_4.lux_listing__window_start__quarter
               , subq_4.lux_listing__window_start__year
+              , subq_4.lux_listing__window_start__extract_year
+              , subq_4.lux_listing__window_start__extract_quarter
+              , subq_4.lux_listing__window_start__extract_month
+              , subq_4.lux_listing__window_start__extract_week
+              , subq_4.lux_listing__window_start__extract_day
+              , subq_4.lux_listing__window_start__extract_dayofweek
+              , subq_4.lux_listing__window_start__extract_dayofyear
               , subq_4.lux_listing__window_end__day
               , subq_4.lux_listing__window_end__week
               , subq_4.lux_listing__window_end__month
               , subq_4.lux_listing__window_end__quarter
               , subq_4.lux_listing__window_end__year
+              , subq_4.lux_listing__window_end__extract_year
+              , subq_4.lux_listing__window_end__extract_quarter
+              , subq_4.lux_listing__window_end__extract_month
+              , subq_4.lux_listing__window_end__extract_week
+              , subq_4.lux_listing__window_end__extract_day
+              , subq_4.lux_listing__window_end__extract_dayofweek
+              , subq_4.lux_listing__window_end__extract_dayofyear
               , subq_4.lux_listing
               , subq_4.is_confirmed_lux
               , subq_4.lux_listing__is_confirmed_lux
@@ -231,22 +385,50 @@ FROM (
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS window_start__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofyear
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS window_end__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofyear
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_from) AS lux_listing__window_start__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS lux_listing__window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS lux_listing__window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS lux_listing__window_start__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS lux_listing__window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS lux_listing__window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS lux_listing__window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS lux_listing__window_end__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofyear
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
@@ -261,12 +443,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.lux_listing__window_start__day
+            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_quarter
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.lux_listing__window_end__day
+              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_dayofweek
             ) OR (
-              subq_7.lux_listing__window_end__day IS NULL
+              subq_7.lux_listing__window_end__extract_dayofweek IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index f1b419a284..d0d8ae085c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -26,8 +26,8 @@ LEFT OUTER JOIN (
   --    'lux_listing__window_end__day',
   --    'listing']
   SELECT
-    lux_listings_src_10019.valid_from AS lux_listing__window_start__day
-    , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
+    EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
+    , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
   FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_10018
@@ -41,12 +41,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.lux_listing__window_start__day
+      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_quarter
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.lux_listing__window_end__day
+        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_dayofweek
       ) OR (
-        subq_18.lux_listing__window_end__day IS NULL
+        subq_18.lux_listing__window_end__extract_dayofweek IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql
index ae8b7838b7..cb9670f074 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql
@@ -33,32 +33,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -85,11 +127,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -98,11 +154,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -131,11 +201,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -144,11 +228,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
index d35179ebf0..fbddd59f54 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
@@ -36,21 +36,49 @@ FROM (
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.ds__day
             , subq_0.ds__week
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.account_id__ds_partitioned__day
             , subq_0.account_id__ds_partitioned__week
             , subq_0.account_id__ds_partitioned__month
             , subq_0.account_id__ds_partitioned__quarter
             , subq_0.account_id__ds_partitioned__year
+            , subq_0.account_id__ds_partitioned__extract_year
+            , subq_0.account_id__ds_partitioned__extract_quarter
+            , subq_0.account_id__ds_partitioned__extract_month
+            , subq_0.account_id__ds_partitioned__extract_week
+            , subq_0.account_id__ds_partitioned__extract_day
+            , subq_0.account_id__ds_partitioned__extract_dayofweek
+            , subq_0.account_id__ds_partitioned__extract_dayofyear
             , subq_0.account_id__ds__day
             , subq_0.account_id__ds__week
             , subq_0.account_id__ds__month
             , subq_0.account_id__ds__quarter
             , subq_0.account_id__ds__year
+            , subq_0.account_id__ds__extract_year
+            , subq_0.account_id__ds__extract_quarter
+            , subq_0.account_id__ds__extract_month
+            , subq_0.account_id__ds__extract_week
+            , subq_0.account_id__ds__extract_day
+            , subq_0.account_id__ds__extract_dayofweek
+            , subq_0.account_id__ds__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -69,22 +97,50 @@ FROM (
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS ds__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_dayofyear
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS account_id__ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS account_id__ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS account_id__ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS account_id__ds__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofyear
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -106,16 +162,37 @@ FROM (
             , subq_3.ds_partitioned__month AS ds_partitioned__month
             , subq_3.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_3.ds_partitioned__year AS ds_partitioned__year
+            , subq_3.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_3.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_3.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_3.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_3.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_3.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_3.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_3.account_id__ds_partitioned__day AS account_id__ds_partitioned__day
             , subq_3.account_id__ds_partitioned__week AS account_id__ds_partitioned__week
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
             , subq_3.account_id__ds_partitioned__quarter AS account_id__ds_partitioned__quarter
             , subq_3.account_id__ds_partitioned__year AS account_id__ds_partitioned__year
+            , subq_3.account_id__ds_partitioned__extract_year AS account_id__ds_partitioned__extract_year
+            , subq_3.account_id__ds_partitioned__extract_quarter AS account_id__ds_partitioned__extract_quarter
+            , subq_3.account_id__ds_partitioned__extract_month AS account_id__ds_partitioned__extract_month
+            , subq_3.account_id__ds_partitioned__extract_week AS account_id__ds_partitioned__extract_week
+            , subq_3.account_id__ds_partitioned__extract_day AS account_id__ds_partitioned__extract_day
+            , subq_3.account_id__ds_partitioned__extract_dayofweek AS account_id__ds_partitioned__extract_dayofweek
+            , subq_3.account_id__ds_partitioned__extract_dayofyear AS account_id__ds_partitioned__extract_dayofyear
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
             , subq_5.ds_partitioned__quarter AS customer_id__ds_partitioned__quarter
             , subq_5.ds_partitioned__year AS customer_id__ds_partitioned__year
+            , subq_5.ds_partitioned__extract_year AS customer_id__ds_partitioned__extract_year
+            , subq_5.ds_partitioned__extract_quarter AS customer_id__ds_partitioned__extract_quarter
+            , subq_5.ds_partitioned__extract_month AS customer_id__ds_partitioned__extract_month
+            , subq_5.ds_partitioned__extract_week AS customer_id__ds_partitioned__extract_week
+            , subq_5.ds_partitioned__extract_day AS customer_id__ds_partitioned__extract_day
+            , subq_5.ds_partitioned__extract_dayofweek AS customer_id__ds_partitioned__extract_dayofweek
+            , subq_5.ds_partitioned__extract_dayofyear AS customer_id__ds_partitioned__extract_dayofyear
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
@@ -132,12 +209,26 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
+              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -154,11 +245,25 @@ FROM (
             --    'ds_partitioned__month',
             --    'ds_partitioned__quarter',
             --    'ds_partitioned__year',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
             --    'customer_id__ds_partitioned__day',
             --    'customer_id__ds_partitioned__week',
             --    'customer_id__ds_partitioned__month',
             --    'customer_id__ds_partitioned__quarter',
             --    'customer_id__ds_partitioned__year',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
             --    'customer_id']
             SELECT
               subq_4.ds_partitioned__day
@@ -166,11 +271,25 @@ FROM (
               , subq_4.ds_partitioned__month
               , subq_4.ds_partitioned__quarter
               , subq_4.ds_partitioned__year
+              , subq_4.ds_partitioned__extract_year
+              , subq_4.ds_partitioned__extract_quarter
+              , subq_4.ds_partitioned__extract_month
+              , subq_4.ds_partitioned__extract_week
+              , subq_4.ds_partitioned__extract_day
+              , subq_4.ds_partitioned__extract_dayofweek
+              , subq_4.ds_partitioned__extract_dayofyear
               , subq_4.customer_id__ds_partitioned__day
               , subq_4.customer_id__ds_partitioned__week
               , subq_4.customer_id__ds_partitioned__month
               , subq_4.customer_id__ds_partitioned__quarter
               , subq_4.customer_id__ds_partitioned__year
+              , subq_4.customer_id__ds_partitioned__extract_year
+              , subq_4.customer_id__ds_partitioned__extract_quarter
+              , subq_4.customer_id__ds_partitioned__extract_month
+              , subq_4.customer_id__ds_partitioned__extract_week
+              , subq_4.customer_id__ds_partitioned__extract_day
+              , subq_4.customer_id__ds_partitioned__extract_dayofweek
+              , subq_4.customer_id__ds_partitioned__extract_dayofyear
               , subq_4.customer_id
               , subq_4.customer_name
               , subq_4.customer_atomic_weight
@@ -186,6 +305,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -193,6 +319,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__year
+                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofyear
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
index 5c9089deaf..eb31a4fb3a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
@@ -23,31 +23,73 @@ FROM (
           , subq_1.ds__month
           , subq_1.ds__quarter
           , subq_1.ds__year
+          , subq_1.ds__extract_year
+          , subq_1.ds__extract_quarter
+          , subq_1.ds__extract_month
+          , subq_1.ds__extract_week
+          , subq_1.ds__extract_day
+          , subq_1.ds__extract_dayofweek
+          , subq_1.ds__extract_dayofyear
           , subq_1.ds_partitioned__day
           , subq_1.ds_partitioned__week
           , subq_1.ds_partitioned__month
           , subq_1.ds_partitioned__quarter
           , subq_1.ds_partitioned__year
+          , subq_1.ds_partitioned__extract_year
+          , subq_1.ds_partitioned__extract_quarter
+          , subq_1.ds_partitioned__extract_month
+          , subq_1.ds_partitioned__extract_week
+          , subq_1.ds_partitioned__extract_day
+          , subq_1.ds_partitioned__extract_dayofweek
+          , subq_1.ds_partitioned__extract_dayofyear
           , subq_1.paid_at__day
           , subq_1.paid_at__week
           , subq_1.paid_at__month
           , subq_1.paid_at__quarter
           , subq_1.paid_at__year
+          , subq_1.paid_at__extract_year
+          , subq_1.paid_at__extract_quarter
+          , subq_1.paid_at__extract_month
+          , subq_1.paid_at__extract_week
+          , subq_1.paid_at__extract_day
+          , subq_1.paid_at__extract_dayofweek
+          , subq_1.paid_at__extract_dayofyear
           , subq_1.booking__ds__day
           , subq_1.booking__ds__week
           , subq_1.booking__ds__month
           , subq_1.booking__ds__quarter
           , subq_1.booking__ds__year
+          , subq_1.booking__ds__extract_year
+          , subq_1.booking__ds__extract_quarter
+          , subq_1.booking__ds__extract_month
+          , subq_1.booking__ds__extract_week
+          , subq_1.booking__ds__extract_day
+          , subq_1.booking__ds__extract_dayofweek
+          , subq_1.booking__ds__extract_dayofyear
           , subq_1.booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month
           , subq_1.booking__ds_partitioned__quarter
           , subq_1.booking__ds_partitioned__year
+          , subq_1.booking__ds_partitioned__extract_year
+          , subq_1.booking__ds_partitioned__extract_quarter
+          , subq_1.booking__ds_partitioned__extract_month
+          , subq_1.booking__ds_partitioned__extract_week
+          , subq_1.booking__ds_partitioned__extract_day
+          , subq_1.booking__ds_partitioned__extract_dayofweek
+          , subq_1.booking__ds_partitioned__extract_dayofyear
           , subq_1.booking__paid_at__day
           , subq_1.booking__paid_at__week
           , subq_1.booking__paid_at__month
           , subq_1.booking__paid_at__quarter
           , subq_1.booking__paid_at__year
+          , subq_1.booking__paid_at__extract_year
+          , subq_1.booking__paid_at__extract_quarter
+          , subq_1.booking__paid_at__extract_month
+          , subq_1.booking__paid_at__extract_week
+          , subq_1.booking__paid_at__extract_day
+          , subq_1.booking__paid_at__extract_dayofweek
+          , subq_1.booking__paid_at__extract_dayofyear
           , subq_1.metric_time__day
           , subq_1.metric_time__week
           , subq_1.metric_time__month
@@ -82,31 +124,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -156,32 +240,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -217,21 +343,49 @@ CROSS JOIN (
           , subq_7.ds__month
           , subq_7.ds__quarter
           , subq_7.ds__year
+          , subq_7.ds__extract_year
+          , subq_7.ds__extract_quarter
+          , subq_7.ds__extract_month
+          , subq_7.ds__extract_week
+          , subq_7.ds__extract_day
+          , subq_7.ds__extract_dayofweek
+          , subq_7.ds__extract_dayofyear
           , subq_7.created_at__day
           , subq_7.created_at__week
           , subq_7.created_at__month
           , subq_7.created_at__quarter
           , subq_7.created_at__year
+          , subq_7.created_at__extract_year
+          , subq_7.created_at__extract_quarter
+          , subq_7.created_at__extract_month
+          , subq_7.created_at__extract_week
+          , subq_7.created_at__extract_day
+          , subq_7.created_at__extract_dayofweek
+          , subq_7.created_at__extract_dayofyear
           , subq_7.listing__ds__day
           , subq_7.listing__ds__week
           , subq_7.listing__ds__month
           , subq_7.listing__ds__quarter
           , subq_7.listing__ds__year
+          , subq_7.listing__ds__extract_year
+          , subq_7.listing__ds__extract_quarter
+          , subq_7.listing__ds__extract_month
+          , subq_7.listing__ds__extract_week
+          , subq_7.listing__ds__extract_day
+          , subq_7.listing__ds__extract_dayofweek
+          , subq_7.listing__ds__extract_dayofyear
           , subq_7.listing__created_at__day
           , subq_7.listing__created_at__week
           , subq_7.listing__created_at__month
           , subq_7.listing__created_at__quarter
           , subq_7.listing__created_at__year
+          , subq_7.listing__created_at__extract_year
+          , subq_7.listing__created_at__extract_quarter
+          , subq_7.listing__created_at__extract_month
+          , subq_7.listing__created_at__extract_week
+          , subq_7.listing__created_at__extract_day
+          , subq_7.listing__created_at__extract_dayofweek
+          , subq_7.listing__created_at__extract_dayofyear
           , subq_7.metric_time__day
           , subq_7.metric_time__week
           , subq_7.metric_time__month
@@ -257,21 +411,49 @@ CROSS JOIN (
             , subq_6.ds__month
             , subq_6.ds__quarter
             , subq_6.ds__year
+            , subq_6.ds__extract_year
+            , subq_6.ds__extract_quarter
+            , subq_6.ds__extract_month
+            , subq_6.ds__extract_week
+            , subq_6.ds__extract_day
+            , subq_6.ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear
             , subq_6.created_at__day
             , subq_6.created_at__week
             , subq_6.created_at__month
             , subq_6.created_at__quarter
             , subq_6.created_at__year
+            , subq_6.created_at__extract_year
+            , subq_6.created_at__extract_quarter
+            , subq_6.created_at__extract_month
+            , subq_6.created_at__extract_week
+            , subq_6.created_at__extract_day
+            , subq_6.created_at__extract_dayofweek
+            , subq_6.created_at__extract_dayofyear
             , subq_6.listing__ds__day
             , subq_6.listing__ds__week
             , subq_6.listing__ds__month
             , subq_6.listing__ds__quarter
             , subq_6.listing__ds__year
+            , subq_6.listing__ds__extract_year
+            , subq_6.listing__ds__extract_quarter
+            , subq_6.listing__ds__extract_month
+            , subq_6.listing__ds__extract_week
+            , subq_6.listing__ds__extract_day
+            , subq_6.listing__ds__extract_dayofweek
+            , subq_6.listing__ds__extract_dayofyear
             , subq_6.listing__created_at__day
             , subq_6.listing__created_at__week
             , subq_6.listing__created_at__month
             , subq_6.listing__created_at__quarter
             , subq_6.listing__created_at__year
+            , subq_6.listing__created_at__extract_year
+            , subq_6.listing__created_at__extract_quarter
+            , subq_6.listing__created_at__extract_month
+            , subq_6.listing__created_at__extract_week
+            , subq_6.listing__created_at__extract_day
+            , subq_6.listing__created_at__extract_dayofweek
+            , subq_6.listing__created_at__extract_dayofyear
             , subq_6.ds__day AS metric_time__day
             , subq_6.ds__week AS metric_time__week
             , subq_6.ds__month AS metric_time__month
@@ -300,11 +482,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -313,11 +509,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql
index 14a9f0385a..dc0afd0f09 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql
@@ -44,31 +44,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -118,32 +160,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -182,31 +266,73 @@ FROM (
                 , subq_5.ds__month
                 , subq_5.ds__quarter
                 , subq_5.ds__year
+                , subq_5.ds__extract_year
+                , subq_5.ds__extract_quarter
+                , subq_5.ds__extract_month
+                , subq_5.ds__extract_week
+                , subq_5.ds__extract_day
+                , subq_5.ds__extract_dayofweek
+                , subq_5.ds__extract_dayofyear
                 , subq_5.ds_partitioned__day
                 , subq_5.ds_partitioned__week
                 , subq_5.ds_partitioned__month
                 , subq_5.ds_partitioned__quarter
                 , subq_5.ds_partitioned__year
+                , subq_5.ds_partitioned__extract_year
+                , subq_5.ds_partitioned__extract_quarter
+                , subq_5.ds_partitioned__extract_month
+                , subq_5.ds_partitioned__extract_week
+                , subq_5.ds_partitioned__extract_day
+                , subq_5.ds_partitioned__extract_dayofweek
+                , subq_5.ds_partitioned__extract_dayofyear
                 , subq_5.paid_at__day
                 , subq_5.paid_at__week
                 , subq_5.paid_at__month
                 , subq_5.paid_at__quarter
                 , subq_5.paid_at__year
+                , subq_5.paid_at__extract_year
+                , subq_5.paid_at__extract_quarter
+                , subq_5.paid_at__extract_month
+                , subq_5.paid_at__extract_week
+                , subq_5.paid_at__extract_day
+                , subq_5.paid_at__extract_dayofweek
+                , subq_5.paid_at__extract_dayofyear
                 , subq_5.booking__ds__day
                 , subq_5.booking__ds__week
                 , subq_5.booking__ds__month
                 , subq_5.booking__ds__quarter
                 , subq_5.booking__ds__year
+                , subq_5.booking__ds__extract_year
+                , subq_5.booking__ds__extract_quarter
+                , subq_5.booking__ds__extract_month
+                , subq_5.booking__ds__extract_week
+                , subq_5.booking__ds__extract_day
+                , subq_5.booking__ds__extract_dayofweek
+                , subq_5.booking__ds__extract_dayofyear
                 , subq_5.booking__ds_partitioned__day
                 , subq_5.booking__ds_partitioned__week
                 , subq_5.booking__ds_partitioned__month
                 , subq_5.booking__ds_partitioned__quarter
                 , subq_5.booking__ds_partitioned__year
+                , subq_5.booking__ds_partitioned__extract_year
+                , subq_5.booking__ds_partitioned__extract_quarter
+                , subq_5.booking__ds_partitioned__extract_month
+                , subq_5.booking__ds_partitioned__extract_week
+                , subq_5.booking__ds_partitioned__extract_day
+                , subq_5.booking__ds_partitioned__extract_dayofweek
+                , subq_5.booking__ds_partitioned__extract_dayofyear
                 , subq_5.booking__paid_at__day
                 , subq_5.booking__paid_at__week
                 , subq_5.booking__paid_at__month
                 , subq_5.booking__paid_at__quarter
                 , subq_5.booking__paid_at__year
+                , subq_5.booking__paid_at__extract_year
+                , subq_5.booking__paid_at__extract_quarter
+                , subq_5.booking__paid_at__extract_month
+                , subq_5.booking__paid_at__extract_week
+                , subq_5.booking__paid_at__extract_day
+                , subq_5.booking__paid_at__extract_dayofweek
+                , subq_5.booking__paid_at__extract_dayofyear
                 , subq_5.ds__day AS metric_time__day
                 , subq_5.ds__week AS metric_time__week
                 , subq_5.ds__month AS metric_time__month
@@ -256,32 +382,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -332,31 +500,73 @@ FROM (
             , subq_12.ds__month
             , subq_12.ds__quarter
             , subq_12.ds__year
+            , subq_12.ds__extract_year
+            , subq_12.ds__extract_quarter
+            , subq_12.ds__extract_month
+            , subq_12.ds__extract_week
+            , subq_12.ds__extract_day
+            , subq_12.ds__extract_dayofweek
+            , subq_12.ds__extract_dayofyear
             , subq_12.ds_partitioned__day
             , subq_12.ds_partitioned__week
             , subq_12.ds_partitioned__month
             , subq_12.ds_partitioned__quarter
             , subq_12.ds_partitioned__year
+            , subq_12.ds_partitioned__extract_year
+            , subq_12.ds_partitioned__extract_quarter
+            , subq_12.ds_partitioned__extract_month
+            , subq_12.ds_partitioned__extract_week
+            , subq_12.ds_partitioned__extract_day
+            , subq_12.ds_partitioned__extract_dayofweek
+            , subq_12.ds_partitioned__extract_dayofyear
             , subq_12.paid_at__day
             , subq_12.paid_at__week
             , subq_12.paid_at__month
             , subq_12.paid_at__quarter
             , subq_12.paid_at__year
+            , subq_12.paid_at__extract_year
+            , subq_12.paid_at__extract_quarter
+            , subq_12.paid_at__extract_month
+            , subq_12.paid_at__extract_week
+            , subq_12.paid_at__extract_day
+            , subq_12.paid_at__extract_dayofweek
+            , subq_12.paid_at__extract_dayofyear
             , subq_12.booking__ds__day
             , subq_12.booking__ds__week
             , subq_12.booking__ds__month
             , subq_12.booking__ds__quarter
             , subq_12.booking__ds__year
+            , subq_12.booking__ds__extract_year
+            , subq_12.booking__ds__extract_quarter
+            , subq_12.booking__ds__extract_month
+            , subq_12.booking__ds__extract_week
+            , subq_12.booking__ds__extract_day
+            , subq_12.booking__ds__extract_dayofweek
+            , subq_12.booking__ds__extract_dayofyear
             , subq_12.booking__ds_partitioned__day
             , subq_12.booking__ds_partitioned__week
             , subq_12.booking__ds_partitioned__month
             , subq_12.booking__ds_partitioned__quarter
             , subq_12.booking__ds_partitioned__year
+            , subq_12.booking__ds_partitioned__extract_year
+            , subq_12.booking__ds_partitioned__extract_quarter
+            , subq_12.booking__ds_partitioned__extract_month
+            , subq_12.booking__ds_partitioned__extract_week
+            , subq_12.booking__ds_partitioned__extract_day
+            , subq_12.booking__ds_partitioned__extract_dayofweek
+            , subq_12.booking__ds_partitioned__extract_dayofyear
             , subq_12.booking__paid_at__day
             , subq_12.booking__paid_at__week
             , subq_12.booking__paid_at__month
             , subq_12.booking__paid_at__quarter
             , subq_12.booking__paid_at__year
+            , subq_12.booking__paid_at__extract_year
+            , subq_12.booking__paid_at__extract_quarter
+            , subq_12.booking__paid_at__extract_month
+            , subq_12.booking__paid_at__extract_week
+            , subq_12.booking__paid_at__extract_day
+            , subq_12.booking__paid_at__extract_dayofweek
+            , subq_12.booking__paid_at__extract_dayofyear
             , subq_12.ds__day AS metric_time__day
             , subq_12.ds__week AS metric_time__week
             , subq_12.ds__month AS metric_time__month
@@ -406,32 +616,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -480,31 +732,73 @@ FROM (
             , subq_17.ds__month
             , subq_17.ds__quarter
             , subq_17.ds__year
+            , subq_17.ds__extract_year
+            , subq_17.ds__extract_quarter
+            , subq_17.ds__extract_month
+            , subq_17.ds__extract_week
+            , subq_17.ds__extract_day
+            , subq_17.ds__extract_dayofweek
+            , subq_17.ds__extract_dayofyear
             , subq_17.ds_partitioned__day
             , subq_17.ds_partitioned__week
             , subq_17.ds_partitioned__month
             , subq_17.ds_partitioned__quarter
             , subq_17.ds_partitioned__year
+            , subq_17.ds_partitioned__extract_year
+            , subq_17.ds_partitioned__extract_quarter
+            , subq_17.ds_partitioned__extract_month
+            , subq_17.ds_partitioned__extract_week
+            , subq_17.ds_partitioned__extract_day
+            , subq_17.ds_partitioned__extract_dayofweek
+            , subq_17.ds_partitioned__extract_dayofyear
             , subq_17.paid_at__day
             , subq_17.paid_at__week
             , subq_17.paid_at__month
             , subq_17.paid_at__quarter
             , subq_17.paid_at__year
+            , subq_17.paid_at__extract_year
+            , subq_17.paid_at__extract_quarter
+            , subq_17.paid_at__extract_month
+            , subq_17.paid_at__extract_week
+            , subq_17.paid_at__extract_day
+            , subq_17.paid_at__extract_dayofweek
+            , subq_17.paid_at__extract_dayofyear
             , subq_17.booking__ds__day
             , subq_17.booking__ds__week
             , subq_17.booking__ds__month
             , subq_17.booking__ds__quarter
             , subq_17.booking__ds__year
+            , subq_17.booking__ds__extract_year
+            , subq_17.booking__ds__extract_quarter
+            , subq_17.booking__ds__extract_month
+            , subq_17.booking__ds__extract_week
+            , subq_17.booking__ds__extract_day
+            , subq_17.booking__ds__extract_dayofweek
+            , subq_17.booking__ds__extract_dayofyear
             , subq_17.booking__ds_partitioned__day
             , subq_17.booking__ds_partitioned__week
             , subq_17.booking__ds_partitioned__month
             , subq_17.booking__ds_partitioned__quarter
             , subq_17.booking__ds_partitioned__year
+            , subq_17.booking__ds_partitioned__extract_year
+            , subq_17.booking__ds_partitioned__extract_quarter
+            , subq_17.booking__ds_partitioned__extract_month
+            , subq_17.booking__ds_partitioned__extract_week
+            , subq_17.booking__ds_partitioned__extract_day
+            , subq_17.booking__ds_partitioned__extract_dayofweek
+            , subq_17.booking__ds_partitioned__extract_dayofyear
             , subq_17.booking__paid_at__day
             , subq_17.booking__paid_at__week
             , subq_17.booking__paid_at__month
             , subq_17.booking__paid_at__quarter
             , subq_17.booking__paid_at__year
+            , subq_17.booking__paid_at__extract_year
+            , subq_17.booking__paid_at__extract_quarter
+            , subq_17.booking__paid_at__extract_month
+            , subq_17.booking__paid_at__extract_week
+            , subq_17.booking__paid_at__extract_day
+            , subq_17.booking__paid_at__extract_dayofweek
+            , subq_17.booking__paid_at__extract_dayofyear
             , subq_17.ds__day AS metric_time__day
             , subq_17.ds__week AS metric_time__week
             , subq_17.ds__month AS metric_time__month
@@ -554,32 +848,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql
index be96decab5..63116a5458 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql
@@ -45,32 +45,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql
index a5288e7009..a53f3a075b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql
@@ -36,21 +36,49 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.verification__ds__day
             , subq_0.verification__ds__week
             , subq_0.verification__ds__month
             , subq_0.verification__ds__quarter
             , subq_0.verification__ds__year
+            , subq_0.verification__ds__extract_year
+            , subq_0.verification__ds__extract_quarter
+            , subq_0.verification__ds__extract_month
+            , subq_0.verification__ds__extract_week
+            , subq_0.verification__ds__extract_day
+            , subq_0.verification__ds__extract_dayofweek
+            , subq_0.verification__ds__extract_dayofyear
             , subq_0.verification__ds_partitioned__day
             , subq_0.verification__ds_partitioned__week
             , subq_0.verification__ds_partitioned__month
             , subq_0.verification__ds_partitioned__quarter
             , subq_0.verification__ds_partitioned__year
+            , subq_0.verification__ds_partitioned__extract_year
+            , subq_0.verification__ds_partitioned__extract_quarter
+            , subq_0.verification__ds_partitioned__extract_month
+            , subq_0.verification__ds_partitioned__extract_week
+            , subq_0.verification__ds_partitioned__extract_day
+            , subq_0.verification__ds_partitioned__extract_dayofweek
+            , subq_0.verification__ds_partitioned__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -71,22 +99,50 @@ FROM (
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -110,32 +166,74 @@ FROM (
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS ds__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_dayofyear
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS created_at__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofyear
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds) AS user__ds__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS user__ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS user__ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS user__ds__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofyear
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS user__created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS user__created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS user__created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS user__created_at__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofyear
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofyear
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql
index c65a58a300..d88d2d32f3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -54,12 +82,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql
index 603dac8609..094486f462 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql
index adfa1c3f03..a8a26c9899 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -55,12 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index 48a1b43de5..c400372dd4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 08a913aa57..30ab4c1851 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -55,12 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index ed796b148d..ef337f422c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql
index 782ccc2826..16b897731d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql
@@ -31,32 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -83,11 +125,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -96,11 +152,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql
index 0f449eb59e..7dd5c3b39d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql
@@ -20,32 +20,74 @@ SELECT
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql
index ee19129508..e240956212 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql
@@ -20,32 +20,74 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql
index 214766cb17..073c7964da 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -165,31 +249,73 @@ FULL OUTER JOIN (
           , subq_5.ds__month
           , subq_5.ds__quarter
           , subq_5.ds__year
+          , subq_5.ds__extract_year
+          , subq_5.ds__extract_quarter
+          , subq_5.ds__extract_month
+          , subq_5.ds__extract_week
+          , subq_5.ds__extract_day
+          , subq_5.ds__extract_dayofweek
+          , subq_5.ds__extract_dayofyear
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
           , subq_5.ds_partitioned__quarter
           , subq_5.ds_partitioned__year
+          , subq_5.ds_partitioned__extract_year
+          , subq_5.ds_partitioned__extract_quarter
+          , subq_5.ds_partitioned__extract_month
+          , subq_5.ds_partitioned__extract_week
+          , subq_5.ds_partitioned__extract_day
+          , subq_5.ds_partitioned__extract_dayofweek
+          , subq_5.ds_partitioned__extract_dayofyear
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
           , subq_5.paid_at__quarter
           , subq_5.paid_at__year
+          , subq_5.paid_at__extract_year
+          , subq_5.paid_at__extract_quarter
+          , subq_5.paid_at__extract_month
+          , subq_5.paid_at__extract_week
+          , subq_5.paid_at__extract_day
+          , subq_5.paid_at__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
           , subq_5.booking__ds__quarter
           , subq_5.booking__ds__year
+          , subq_5.booking__ds__extract_year
+          , subq_5.booking__ds__extract_quarter
+          , subq_5.booking__ds__extract_month
+          , subq_5.booking__ds__extract_week
+          , subq_5.booking__ds__extract_day
+          , subq_5.booking__ds__extract_dayofweek
+          , subq_5.booking__ds__extract_dayofyear
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
           , subq_5.booking__ds_partitioned__quarter
           , subq_5.booking__ds_partitioned__year
+          , subq_5.booking__ds_partitioned__extract_year
+          , subq_5.booking__ds_partitioned__extract_quarter
+          , subq_5.booking__ds_partitioned__extract_month
+          , subq_5.booking__ds_partitioned__extract_week
+          , subq_5.booking__ds_partitioned__extract_day
+          , subq_5.booking__ds_partitioned__extract_dayofweek
+          , subq_5.booking__ds_partitioned__extract_dayofyear
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
           , subq_5.booking__paid_at__quarter
           , subq_5.booking__paid_at__year
+          , subq_5.booking__paid_at__extract_year
+          , subq_5.booking__paid_at__extract_quarter
+          , subq_5.booking__paid_at__extract_month
+          , subq_5.booking__paid_at__extract_week
+          , subq_5.booking__paid_at__extract_day
+          , subq_5.booking__paid_at__extract_dayofweek
+          , subq_5.booking__paid_at__extract_dayofyear
           , subq_5.ds__day AS metric_time__day
           , subq_5.ds__week AS metric_time__week
           , subq_5.ds__month AS metric_time__month
@@ -239,32 +365,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql
index 63637a9433..c80b16baf0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql
@@ -44,32 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -96,11 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -109,11 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 9c4d91d069..d5d52443ea 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -51,31 +51,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -125,32 +167,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -175,21 +259,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -218,11 +330,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -231,11 +357,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -296,21 +436,49 @@ FROM (
                 , subq_10.ds__month
                 , subq_10.ds__quarter
                 , subq_10.ds__year
+                , subq_10.ds__extract_year
+                , subq_10.ds__extract_quarter
+                , subq_10.ds__extract_month
+                , subq_10.ds__extract_week
+                , subq_10.ds__extract_day
+                , subq_10.ds__extract_dayofweek
+                , subq_10.ds__extract_dayofyear
                 , subq_10.ds_partitioned__day
                 , subq_10.ds_partitioned__week
                 , subq_10.ds_partitioned__month
                 , subq_10.ds_partitioned__quarter
                 , subq_10.ds_partitioned__year
+                , subq_10.ds_partitioned__extract_year
+                , subq_10.ds_partitioned__extract_quarter
+                , subq_10.ds_partitioned__extract_month
+                , subq_10.ds_partitioned__extract_week
+                , subq_10.ds_partitioned__extract_day
+                , subq_10.ds_partitioned__extract_dayofweek
+                , subq_10.ds_partitioned__extract_dayofyear
                 , subq_10.view__ds__day
                 , subq_10.view__ds__week
                 , subq_10.view__ds__month
                 , subq_10.view__ds__quarter
                 , subq_10.view__ds__year
+                , subq_10.view__ds__extract_year
+                , subq_10.view__ds__extract_quarter
+                , subq_10.view__ds__extract_month
+                , subq_10.view__ds__extract_week
+                , subq_10.view__ds__extract_day
+                , subq_10.view__ds__extract_dayofweek
+                , subq_10.view__ds__extract_dayofyear
                 , subq_10.view__ds_partitioned__day
                 , subq_10.view__ds_partitioned__week
                 , subq_10.view__ds_partitioned__month
                 , subq_10.view__ds_partitioned__quarter
                 , subq_10.view__ds_partitioned__year
+                , subq_10.view__ds_partitioned__extract_year
+                , subq_10.view__ds_partitioned__extract_quarter
+                , subq_10.view__ds_partitioned__extract_month
+                , subq_10.view__ds_partitioned__extract_week
+                , subq_10.view__ds_partitioned__extract_day
+                , subq_10.view__ds_partitioned__extract_dayofweek
+                , subq_10.view__ds_partitioned__extract_dayofyear
                 , subq_10.ds__day AS metric_time__day
                 , subq_10.ds__week AS metric_time__week
                 , subq_10.ds__month AS metric_time__month
@@ -330,21 +498,49 @@ FROM (
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS ds__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_dayofyear
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC('week', views_source_src_10009.ds) AS view__ds__week
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS view__ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS view__ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS view__ds__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS view__ds__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS view__ds__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS view__ds__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS view__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_dayofyear
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__year
+                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofyear
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -367,21 +563,49 @@ FROM (
                 , subq_13.ds__month
                 , subq_13.ds__quarter
                 , subq_13.ds__year
+                , subq_13.ds__extract_year
+                , subq_13.ds__extract_quarter
+                , subq_13.ds__extract_month
+                , subq_13.ds__extract_week
+                , subq_13.ds__extract_day
+                , subq_13.ds__extract_dayofweek
+                , subq_13.ds__extract_dayofyear
                 , subq_13.created_at__day
                 , subq_13.created_at__week
                 , subq_13.created_at__month
                 , subq_13.created_at__quarter
                 , subq_13.created_at__year
+                , subq_13.created_at__extract_year
+                , subq_13.created_at__extract_quarter
+                , subq_13.created_at__extract_month
+                , subq_13.created_at__extract_week
+                , subq_13.created_at__extract_day
+                , subq_13.created_at__extract_dayofweek
+                , subq_13.created_at__extract_dayofyear
                 , subq_13.listing__ds__day
                 , subq_13.listing__ds__week
                 , subq_13.listing__ds__month
                 , subq_13.listing__ds__quarter
                 , subq_13.listing__ds__year
+                , subq_13.listing__ds__extract_year
+                , subq_13.listing__ds__extract_quarter
+                , subq_13.listing__ds__extract_month
+                , subq_13.listing__ds__extract_week
+                , subq_13.listing__ds__extract_day
+                , subq_13.listing__ds__extract_dayofweek
+                , subq_13.listing__ds__extract_dayofyear
                 , subq_13.listing__created_at__day
                 , subq_13.listing__created_at__week
                 , subq_13.listing__created_at__month
                 , subq_13.listing__created_at__quarter
                 , subq_13.listing__created_at__year
+                , subq_13.listing__created_at__extract_year
+                , subq_13.listing__created_at__extract_quarter
+                , subq_13.listing__created_at__extract_month
+                , subq_13.listing__created_at__extract_week
+                , subq_13.listing__created_at__extract_day
+                , subq_13.listing__created_at__extract_dayofweek
+                , subq_13.listing__created_at__extract_dayofyear
                 , subq_13.ds__day AS metric_time__day
                 , subq_13.ds__week AS metric_time__week
                 , subq_13.ds__month AS metric_time__month
@@ -410,11 +634,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -423,11 +661,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index dd55a54b61..a56183e745 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -47,32 +47,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -99,11 +141,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -112,11 +168,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql
index 48583b238a..b6f01861d7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql
@@ -44,32 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -96,11 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -109,11 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql
index 4ca35f2544..d480357663 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql
@@ -38,32 +38,74 @@ FROM (
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
index b515ad2da5..f52c8d6acf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
index 5eb893b84a..4e79154b70 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
index 2393630095..f44071348d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
@@ -18,11 +18,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -40,11 +54,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
index 9ced88e0cc..4c321e73b0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
         , subq_0.company__ds__quarter
         , subq_0.company__ds__year
+        , subq_0.company__ds__extract_year
+        , subq_0.company__ds__extract_quarter
+        , subq_0.company__ds__extract_month
+        , subq_0.company__ds__extract_week
+        , subq_0.company__ds__extract_day
+        , subq_0.company__ds__extract_dayofweek
+        , subq_0.company__ds__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -43,11 +57,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index dd00d2b15e..4821d797fe 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_1.ds__month
         , subq_1.ds__quarter
         , subq_1.ds__year
+        , subq_1.ds__extract_year
+        , subq_1.ds__extract_quarter
+        , subq_1.ds__extract_month
+        , subq_1.ds__extract_week
+        , subq_1.ds__extract_day
+        , subq_1.ds__extract_dayofweek
+        , subq_1.ds__extract_dayofyear
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
         , subq_1.company__ds__quarter
         , subq_1.company__ds__year
+        , subq_1.company__ds__extract_year
+        , subq_1.company__ds__extract_quarter
+        , subq_1.company__ds__extract_month
+        , subq_1.company__ds__extract_week
+        , subq_1.company__ds__extract_day
+        , subq_1.company__ds__extract_dayofweek
+        , subq_1.company__ds__extract_dayofyear
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -42,11 +56,25 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
           , subq_0.company__ds__quarter
           , subq_0.company__ds__year
+          , subq_0.company__ds__extract_year
+          , subq_0.company__ds__extract_quarter
+          , subq_0.company__ds__extract_month
+          , subq_0.company__ds__extract_week
+          , subq_0.company__ds__extract_day
+          , subq_0.company__ds__extract_dayofweek
+          , subq_0.company__ds__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
index 658dcf3357..2a39c9282f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -21,11 +21,25 @@ FROM (
         , subq_1.ds__month
         , subq_1.ds__quarter
         , subq_1.ds__year
+        , subq_1.ds__extract_year
+        , subq_1.ds__extract_quarter
+        , subq_1.ds__extract_month
+        , subq_1.ds__extract_week
+        , subq_1.ds__extract_day
+        , subq_1.ds__extract_dayofweek
+        , subq_1.ds__extract_dayofyear
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
         , subq_1.company__ds__quarter
         , subq_1.company__ds__year
+        , subq_1.company__ds__extract_year
+        , subq_1.company__ds__extract_quarter
+        , subq_1.company__ds__extract_month
+        , subq_1.company__ds__extract_week
+        , subq_1.company__ds__extract_day
+        , subq_1.company__ds__extract_dayofweek
+        , subq_1.company__ds__extract_dayofyear
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -42,11 +56,25 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
           , subq_0.company__ds__quarter
           , subq_0.company__ds__year
+          , subq_0.company__ds__extract_year
+          , subq_0.company__ds__extract_quarter
+          , subq_0.company__ds__extract_month
+          , subq_0.company__ds__extract_week
+          , subq_0.company__ds__extract_day
+          , subq_0.company__ds__extract_dayofweek
+          , subq_0.company__ds__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
+            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql
index 9bafb5e1f6..82ded0a878 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -170,31 +254,73 @@ FROM (
             , subq_5.ds__month
             , subq_5.ds__quarter
             , subq_5.ds__year
+            , subq_5.ds__extract_year
+            , subq_5.ds__extract_quarter
+            , subq_5.ds__extract_month
+            , subq_5.ds__extract_week
+            , subq_5.ds__extract_day
+            , subq_5.ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear
             , subq_5.ds_partitioned__day
             , subq_5.ds_partitioned__week
             , subq_5.ds_partitioned__month
             , subq_5.ds_partitioned__quarter
             , subq_5.ds_partitioned__year
+            , subq_5.ds_partitioned__extract_year
+            , subq_5.ds_partitioned__extract_quarter
+            , subq_5.ds_partitioned__extract_month
+            , subq_5.ds_partitioned__extract_week
+            , subq_5.ds_partitioned__extract_day
+            , subq_5.ds_partitioned__extract_dayofweek
+            , subq_5.ds_partitioned__extract_dayofyear
             , subq_5.paid_at__day
             , subq_5.paid_at__week
             , subq_5.paid_at__month
             , subq_5.paid_at__quarter
             , subq_5.paid_at__year
+            , subq_5.paid_at__extract_year
+            , subq_5.paid_at__extract_quarter
+            , subq_5.paid_at__extract_month
+            , subq_5.paid_at__extract_week
+            , subq_5.paid_at__extract_day
+            , subq_5.paid_at__extract_dayofweek
+            , subq_5.paid_at__extract_dayofyear
             , subq_5.booking__ds__day
             , subq_5.booking__ds__week
             , subq_5.booking__ds__month
             , subq_5.booking__ds__quarter
             , subq_5.booking__ds__year
+            , subq_5.booking__ds__extract_year
+            , subq_5.booking__ds__extract_quarter
+            , subq_5.booking__ds__extract_month
+            , subq_5.booking__ds__extract_week
+            , subq_5.booking__ds__extract_day
+            , subq_5.booking__ds__extract_dayofweek
+            , subq_5.booking__ds__extract_dayofyear
             , subq_5.booking__ds_partitioned__day
             , subq_5.booking__ds_partitioned__week
             , subq_5.booking__ds_partitioned__month
             , subq_5.booking__ds_partitioned__quarter
             , subq_5.booking__ds_partitioned__year
+            , subq_5.booking__ds_partitioned__extract_year
+            , subq_5.booking__ds_partitioned__extract_quarter
+            , subq_5.booking__ds_partitioned__extract_month
+            , subq_5.booking__ds_partitioned__extract_week
+            , subq_5.booking__ds_partitioned__extract_day
+            , subq_5.booking__ds_partitioned__extract_dayofweek
+            , subq_5.booking__ds_partitioned__extract_dayofyear
             , subq_5.booking__paid_at__day
             , subq_5.booking__paid_at__week
             , subq_5.booking__paid_at__month
             , subq_5.booking__paid_at__quarter
             , subq_5.booking__paid_at__year
+            , subq_5.booking__paid_at__extract_year
+            , subq_5.booking__paid_at__extract_quarter
+            , subq_5.booking__paid_at__extract_month
+            , subq_5.booking__paid_at__extract_week
+            , subq_5.booking__paid_at__extract_day
+            , subq_5.booking__paid_at__extract_dayofweek
+            , subq_5.booking__paid_at__extract_dayofyear
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -244,32 +370,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
index edbbe545fd..f21c6e33a7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index c97b8fd930..34b929887f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
index 03b1c29282..44073119ae 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 6a32edb464..66bd68c2c6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -32,31 +32,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -106,32 +148,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -171,31 +255,73 @@ FROM (
             , subq_6.ds__month AS ds__month
             , subq_6.ds__quarter AS ds__quarter
             , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
             , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
             , subq_6.paid_at__quarter AS paid_at__quarter
             , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
             , subq_6.booking__ds__quarter AS booking__ds__quarter
             , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
             , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -231,31 +357,73 @@ FROM (
               , subq_5.ds__month
               , subq_5.ds__quarter
               , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dayofweek
+              , subq_5.ds__extract_dayofyear
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
               , subq_5.ds_partitioned__quarter
               , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dayofweek
+              , subq_5.ds_partitioned__extract_dayofyear
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
               , subq_5.paid_at__quarter
               , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dayofweek
+              , subq_5.paid_at__extract_dayofyear
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
               , subq_5.booking__ds__quarter
               , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dayofweek
+              , subq_5.booking__ds__extract_dayofyear
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
               , subq_5.booking__ds_partitioned__quarter
               , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dayofweek
+              , subq_5.booking__ds_partitioned__extract_dayofyear
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
               , subq_5.booking__paid_at__quarter
               , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dayofweek
+              , subq_5.booking__paid_at__extract_dayofyear
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -305,32 +473,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index d52164ec94..9ab70d9a6a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -33,31 +33,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -93,31 +135,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -167,32 +251,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -235,31 +361,73 @@ FROM (
             , subq_9.ds__month AS ds__month
             , subq_9.ds__quarter AS ds__quarter
             , subq_9.ds__year AS ds__year
+            , subq_9.ds__extract_year AS ds__extract_year
+            , subq_9.ds__extract_quarter AS ds__extract_quarter
+            , subq_9.ds__extract_month AS ds__extract_month
+            , subq_9.ds__extract_week AS ds__extract_week
+            , subq_9.ds__extract_day AS ds__extract_day
+            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
             , subq_9.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_9.ds_partitioned__year AS ds_partitioned__year
+            , subq_9.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_9.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
             , subq_9.paid_at__quarter AS paid_at__quarter
             , subq_9.paid_at__year AS paid_at__year
+            , subq_9.paid_at__extract_year AS paid_at__extract_year
+            , subq_9.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_9.paid_at__extract_month AS paid_at__extract_month
+            , subq_9.paid_at__extract_week AS paid_at__extract_week
+            , subq_9.paid_at__extract_day AS paid_at__extract_day
+            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
             , subq_9.booking__ds__quarter AS booking__ds__quarter
             , subq_9.booking__ds__year AS booking__ds__year
+            , subq_9.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_9.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_9.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_9.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_9.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_9.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_9.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_9.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_9.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
             , subq_9.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_9.booking__paid_at__year AS booking__paid_at__year
+            , subq_9.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_9.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -295,31 +463,73 @@ FROM (
               , subq_8.ds__month
               , subq_8.ds__quarter
               , subq_8.ds__year
+              , subq_8.ds__extract_year
+              , subq_8.ds__extract_quarter
+              , subq_8.ds__extract_month
+              , subq_8.ds__extract_week
+              , subq_8.ds__extract_day
+              , subq_8.ds__extract_dayofweek
+              , subq_8.ds__extract_dayofyear
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
               , subq_8.ds_partitioned__quarter
               , subq_8.ds_partitioned__year
+              , subq_8.ds_partitioned__extract_year
+              , subq_8.ds_partitioned__extract_quarter
+              , subq_8.ds_partitioned__extract_month
+              , subq_8.ds_partitioned__extract_week
+              , subq_8.ds_partitioned__extract_day
+              , subq_8.ds_partitioned__extract_dayofweek
+              , subq_8.ds_partitioned__extract_dayofyear
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
               , subq_8.paid_at__quarter
               , subq_8.paid_at__year
+              , subq_8.paid_at__extract_year
+              , subq_8.paid_at__extract_quarter
+              , subq_8.paid_at__extract_month
+              , subq_8.paid_at__extract_week
+              , subq_8.paid_at__extract_day
+              , subq_8.paid_at__extract_dayofweek
+              , subq_8.paid_at__extract_dayofyear
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
               , subq_8.booking__ds__quarter
               , subq_8.booking__ds__year
+              , subq_8.booking__ds__extract_year
+              , subq_8.booking__ds__extract_quarter
+              , subq_8.booking__ds__extract_month
+              , subq_8.booking__ds__extract_week
+              , subq_8.booking__ds__extract_day
+              , subq_8.booking__ds__extract_dayofweek
+              , subq_8.booking__ds__extract_dayofyear
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
               , subq_8.booking__ds_partitioned__quarter
               , subq_8.booking__ds_partitioned__year
+              , subq_8.booking__ds_partitioned__extract_year
+              , subq_8.booking__ds_partitioned__extract_quarter
+              , subq_8.booking__ds_partitioned__extract_month
+              , subq_8.booking__ds_partitioned__extract_week
+              , subq_8.booking__ds_partitioned__extract_day
+              , subq_8.booking__ds_partitioned__extract_dayofweek
+              , subq_8.booking__ds_partitioned__extract_dayofyear
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
               , subq_8.booking__paid_at__quarter
               , subq_8.booking__paid_at__year
+              , subq_8.booking__paid_at__extract_year
+              , subq_8.booking__paid_at__extract_quarter
+              , subq_8.booking__paid_at__extract_month
+              , subq_8.booking__paid_at__extract_week
+              , subq_8.booking__paid_at__extract_day
+              , subq_8.booking__paid_at__extract_dayofweek
+              , subq_8.booking__paid_at__extract_dayofyear
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -369,32 +579,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 1a2a3259ba..34b0e577f7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -33,31 +33,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -93,31 +135,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -167,32 +251,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -236,31 +362,73 @@ FROM (
             , subq_9.ds__month AS ds__month
             , subq_9.ds__quarter AS ds__quarter
             , subq_9.ds__year AS ds__year
+            , subq_9.ds__extract_year AS ds__extract_year
+            , subq_9.ds__extract_quarter AS ds__extract_quarter
+            , subq_9.ds__extract_month AS ds__extract_month
+            , subq_9.ds__extract_week AS ds__extract_week
+            , subq_9.ds__extract_day AS ds__extract_day
+            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
             , subq_9.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_9.ds_partitioned__year AS ds_partitioned__year
+            , subq_9.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_9.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
             , subq_9.paid_at__quarter AS paid_at__quarter
             , subq_9.paid_at__year AS paid_at__year
+            , subq_9.paid_at__extract_year AS paid_at__extract_year
+            , subq_9.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_9.paid_at__extract_month AS paid_at__extract_month
+            , subq_9.paid_at__extract_week AS paid_at__extract_week
+            , subq_9.paid_at__extract_day AS paid_at__extract_day
+            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
             , subq_9.booking__ds__quarter AS booking__ds__quarter
             , subq_9.booking__ds__year AS booking__ds__year
+            , subq_9.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_9.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_9.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_9.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_9.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_9.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_9.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_9.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_9.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
             , subq_9.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_9.booking__paid_at__year AS booking__paid_at__year
+            , subq_9.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_9.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -296,31 +464,73 @@ FROM (
               , subq_8.ds__month
               , subq_8.ds__quarter
               , subq_8.ds__year
+              , subq_8.ds__extract_year
+              , subq_8.ds__extract_quarter
+              , subq_8.ds__extract_month
+              , subq_8.ds__extract_week
+              , subq_8.ds__extract_day
+              , subq_8.ds__extract_dayofweek
+              , subq_8.ds__extract_dayofyear
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
               , subq_8.ds_partitioned__quarter
               , subq_8.ds_partitioned__year
+              , subq_8.ds_partitioned__extract_year
+              , subq_8.ds_partitioned__extract_quarter
+              , subq_8.ds_partitioned__extract_month
+              , subq_8.ds_partitioned__extract_week
+              , subq_8.ds_partitioned__extract_day
+              , subq_8.ds_partitioned__extract_dayofweek
+              , subq_8.ds_partitioned__extract_dayofyear
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
               , subq_8.paid_at__quarter
               , subq_8.paid_at__year
+              , subq_8.paid_at__extract_year
+              , subq_8.paid_at__extract_quarter
+              , subq_8.paid_at__extract_month
+              , subq_8.paid_at__extract_week
+              , subq_8.paid_at__extract_day
+              , subq_8.paid_at__extract_dayofweek
+              , subq_8.paid_at__extract_dayofyear
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
               , subq_8.booking__ds__quarter
               , subq_8.booking__ds__year
+              , subq_8.booking__ds__extract_year
+              , subq_8.booking__ds__extract_quarter
+              , subq_8.booking__ds__extract_month
+              , subq_8.booking__ds__extract_week
+              , subq_8.booking__ds__extract_day
+              , subq_8.booking__ds__extract_dayofweek
+              , subq_8.booking__ds__extract_dayofyear
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
               , subq_8.booking__ds_partitioned__quarter
               , subq_8.booking__ds_partitioned__year
+              , subq_8.booking__ds_partitioned__extract_year
+              , subq_8.booking__ds_partitioned__extract_quarter
+              , subq_8.booking__ds_partitioned__extract_month
+              , subq_8.booking__ds_partitioned__extract_week
+              , subq_8.booking__ds_partitioned__extract_day
+              , subq_8.booking__ds_partitioned__extract_dayofweek
+              , subq_8.booking__ds_partitioned__extract_dayofyear
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
               , subq_8.booking__paid_at__quarter
               , subq_8.booking__paid_at__year
+              , subq_8.booking__paid_at__extract_year
+              , subq_8.booking__paid_at__extract_quarter
+              , subq_8.booking__paid_at__extract_month
+              , subq_8.booking__paid_at__extract_week
+              , subq_8.booking__paid_at__extract_day
+              , subq_8.booking__paid_at__extract_dayofweek
+              , subq_8.booking__paid_at__extract_dayofyear
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -370,32 +580,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
index edd3eef59c..390f041085 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_4.ds__month AS ds__month
           , subq_4.ds__quarter AS ds__quarter
           , subq_4.ds__year AS ds__year
+          , subq_4.ds__extract_year AS ds__extract_year
+          , subq_4.ds__extract_quarter AS ds__extract_quarter
+          , subq_4.ds__extract_month AS ds__extract_month
+          , subq_4.ds__extract_week AS ds__extract_week
+          , subq_4.ds__extract_day AS ds__extract_day
+          , subq_4.ds__extract_dayofweek AS ds__extract_dayofweek
+          , subq_4.ds__extract_dayofyear AS ds__extract_dayofyear
           , subq_4.ds_partitioned__day AS ds_partitioned__day
           , subq_4.ds_partitioned__week AS ds_partitioned__week
           , subq_4.ds_partitioned__month AS ds_partitioned__month
           , subq_4.ds_partitioned__quarter AS ds_partitioned__quarter
           , subq_4.ds_partitioned__year AS ds_partitioned__year
+          , subq_4.ds_partitioned__extract_year AS ds_partitioned__extract_year
+          , subq_4.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+          , subq_4.ds_partitioned__extract_month AS ds_partitioned__extract_month
+          , subq_4.ds_partitioned__extract_week AS ds_partitioned__extract_week
+          , subq_4.ds_partitioned__extract_day AS ds_partitioned__extract_day
+          , subq_4.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+          , subq_4.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
           , subq_4.paid_at__day AS paid_at__day
           , subq_4.paid_at__week AS paid_at__week
           , subq_4.paid_at__month AS paid_at__month
           , subq_4.paid_at__quarter AS paid_at__quarter
           , subq_4.paid_at__year AS paid_at__year
+          , subq_4.paid_at__extract_year AS paid_at__extract_year
+          , subq_4.paid_at__extract_quarter AS paid_at__extract_quarter
+          , subq_4.paid_at__extract_month AS paid_at__extract_month
+          , subq_4.paid_at__extract_week AS paid_at__extract_week
+          , subq_4.paid_at__extract_day AS paid_at__extract_day
+          , subq_4.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+          , subq_4.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
           , subq_4.booking__ds__day AS booking__ds__day
           , subq_4.booking__ds__week AS booking__ds__week
           , subq_4.booking__ds__month AS booking__ds__month
           , subq_4.booking__ds__quarter AS booking__ds__quarter
           , subq_4.booking__ds__year AS booking__ds__year
+          , subq_4.booking__ds__extract_year AS booking__ds__extract_year
+          , subq_4.booking__ds__extract_quarter AS booking__ds__extract_quarter
+          , subq_4.booking__ds__extract_month AS booking__ds__extract_month
+          , subq_4.booking__ds__extract_week AS booking__ds__extract_week
+          , subq_4.booking__ds__extract_day AS booking__ds__extract_day
+          , subq_4.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+          , subq_4.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
           , subq_4.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_4.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_4.booking__ds_partitioned__month AS booking__ds_partitioned__month
           , subq_4.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
           , subq_4.booking__ds_partitioned__year AS booking__ds_partitioned__year
+          , subq_4.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+          , subq_4.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+          , subq_4.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+          , subq_4.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+          , subq_4.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+          , subq_4.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+          , subq_4.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
           , subq_4.booking__paid_at__day AS booking__paid_at__day
           , subq_4.booking__paid_at__week AS booking__paid_at__week
           , subq_4.booking__paid_at__month AS booking__paid_at__month
           , subq_4.booking__paid_at__quarter AS booking__paid_at__quarter
           , subq_4.booking__paid_at__year AS booking__paid_at__year
+          , subq_4.booking__paid_at__extract_year AS booking__paid_at__extract_year
+          , subq_4.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+          , subq_4.booking__paid_at__extract_month AS booking__paid_at__extract_month
+          , subq_4.booking__paid_at__extract_week AS booking__paid_at__extract_week
+          , subq_4.booking__paid_at__extract_day AS booking__paid_at__extract_day
+          , subq_4.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+          , subq_4.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
           , subq_4.listing AS listing
           , subq_4.guest AS guest
           , subq_4.host AS host
@@ -88,31 +130,73 @@ FROM (
             , subq_1.ds__month AS ds__month
             , subq_1.ds__quarter AS ds__quarter
             , subq_1.ds__year AS ds__year
+            , subq_1.ds__extract_year AS ds__extract_year
+            , subq_1.ds__extract_quarter AS ds__extract_quarter
+            , subq_1.ds__extract_month AS ds__extract_month
+            , subq_1.ds__extract_week AS ds__extract_week
+            , subq_1.ds__extract_day AS ds__extract_day
+            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
             , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_1.ds_partitioned__year AS ds_partitioned__year
+            , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
             , subq_1.paid_at__quarter AS paid_at__quarter
             , subq_1.paid_at__year AS paid_at__year
+            , subq_1.paid_at__extract_year AS paid_at__extract_year
+            , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_1.paid_at__extract_month AS paid_at__extract_month
+            , subq_1.paid_at__extract_week AS paid_at__extract_week
+            , subq_1.paid_at__extract_day AS paid_at__extract_day
+            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
             , subq_1.booking__ds__quarter AS booking__ds__quarter
             , subq_1.booking__ds__year AS booking__ds__year
+            , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
             , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
             , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
             , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
             , subq_1.booking__paid_at__year AS booking__paid_at__year
+            , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
             , subq_1.metric_time__week AS metric_time__week
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
@@ -152,31 +236,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -226,32 +352,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 26c360ab9e..3c8d87a17b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_1.ds__month AS ds__month
           , subq_1.ds__quarter AS ds__quarter
           , subq_1.ds__year AS ds__year
+          , subq_1.ds__extract_year AS ds__extract_year
+          , subq_1.ds__extract_quarter AS ds__extract_quarter
+          , subq_1.ds__extract_month AS ds__extract_month
+          , subq_1.ds__extract_week AS ds__extract_week
+          , subq_1.ds__extract_day AS ds__extract_day
+          , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
+          , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
           , subq_1.ds_partitioned__day AS ds_partitioned__day
           , subq_1.ds_partitioned__week AS ds_partitioned__week
           , subq_1.ds_partitioned__month AS ds_partitioned__month
           , subq_1.ds_partitioned__quarter AS ds_partitioned__quarter
           , subq_1.ds_partitioned__year AS ds_partitioned__year
+          , subq_1.ds_partitioned__extract_year AS ds_partitioned__extract_year
+          , subq_1.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+          , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
+          , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
+          , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
+          , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+          , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
           , subq_1.paid_at__day AS paid_at__day
           , subq_1.paid_at__week AS paid_at__week
           , subq_1.paid_at__month AS paid_at__month
           , subq_1.paid_at__quarter AS paid_at__quarter
           , subq_1.paid_at__year AS paid_at__year
+          , subq_1.paid_at__extract_year AS paid_at__extract_year
+          , subq_1.paid_at__extract_quarter AS paid_at__extract_quarter
+          , subq_1.paid_at__extract_month AS paid_at__extract_month
+          , subq_1.paid_at__extract_week AS paid_at__extract_week
+          , subq_1.paid_at__extract_day AS paid_at__extract_day
+          , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
+          , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
           , subq_1.booking__ds__day AS booking__ds__day
           , subq_1.booking__ds__week AS booking__ds__week
           , subq_1.booking__ds__month AS booking__ds__month
           , subq_1.booking__ds__quarter AS booking__ds__quarter
           , subq_1.booking__ds__year AS booking__ds__year
+          , subq_1.booking__ds__extract_year AS booking__ds__extract_year
+          , subq_1.booking__ds__extract_quarter AS booking__ds__extract_quarter
+          , subq_1.booking__ds__extract_month AS booking__ds__extract_month
+          , subq_1.booking__ds__extract_week AS booking__ds__extract_week
+          , subq_1.booking__ds__extract_day AS booking__ds__extract_day
+          , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
+          , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
           , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
           , subq_1.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
           , subq_1.booking__ds_partitioned__year AS booking__ds_partitioned__year
+          , subq_1.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+          , subq_1.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+          , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+          , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+          , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+          , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
+          , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
           , subq_1.booking__paid_at__day AS booking__paid_at__day
           , subq_1.booking__paid_at__week AS booking__paid_at__week
           , subq_1.booking__paid_at__month AS booking__paid_at__month
           , subq_1.booking__paid_at__quarter AS booking__paid_at__quarter
           , subq_1.booking__paid_at__year AS booking__paid_at__year
+          , subq_1.booking__paid_at__extract_year AS booking__paid_at__extract_year
+          , subq_1.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+          , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
+          , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
+          , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
+          , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
+          , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
           , subq_1.listing AS listing
           , subq_1.guest AS guest
           , subq_1.host AS host
@@ -87,31 +129,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -161,32 +245,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql
index 870b2c80ea..3adff18e62 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql
@@ -42,31 +42,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -116,32 +158,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -166,21 +250,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -209,11 +321,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -222,11 +348,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql
index ddba65921c..00efad0383 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql
@@ -25,32 +25,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql
index 7ce1a71c7f..7e0fdff19e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql
@@ -31,32 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 81e6d39ada..eb70f04221 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -48,31 +48,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -122,32 +164,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -172,21 +256,49 @@ FROM (
                 , subq_3.ds__month
                 , subq_3.ds__quarter
                 , subq_3.ds__year
+                , subq_3.ds__extract_year
+                , subq_3.ds__extract_quarter
+                , subq_3.ds__extract_month
+                , subq_3.ds__extract_week
+                , subq_3.ds__extract_day
+                , subq_3.ds__extract_dayofweek
+                , subq_3.ds__extract_dayofyear
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
                 , subq_3.created_at__quarter
                 , subq_3.created_at__year
+                , subq_3.created_at__extract_year
+                , subq_3.created_at__extract_quarter
+                , subq_3.created_at__extract_month
+                , subq_3.created_at__extract_week
+                , subq_3.created_at__extract_day
+                , subq_3.created_at__extract_dayofweek
+                , subq_3.created_at__extract_dayofyear
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
                 , subq_3.listing__ds__quarter
                 , subq_3.listing__ds__year
+                , subq_3.listing__ds__extract_year
+                , subq_3.listing__ds__extract_quarter
+                , subq_3.listing__ds__extract_month
+                , subq_3.listing__ds__extract_week
+                , subq_3.listing__ds__extract_day
+                , subq_3.listing__ds__extract_dayofweek
+                , subq_3.listing__ds__extract_dayofyear
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
                 , subq_3.listing__created_at__quarter
                 , subq_3.listing__created_at__year
+                , subq_3.listing__created_at__extract_year
+                , subq_3.listing__created_at__extract_quarter
+                , subq_3.listing__created_at__extract_month
+                , subq_3.listing__created_at__extract_week
+                , subq_3.listing__created_at__extract_day
+                , subq_3.listing__created_at__extract_dayofweek
+                , subq_3.listing__created_at__extract_dayofyear
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -215,11 +327,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -228,11 +354,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
index 4caa3d07f0..f7de81777d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
@@ -30,8 +30,8 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__day AS listing__window_start__day
-            , subq_4.window_end__day AS listing__window_end__day
+            , subq_4.window_start__extract_month AS listing__window_start__extract_month
+            , subq_4.window_end__extract_day AS listing__window_end__extract_day
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -50,31 +50,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -110,32 +152,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -152,8 +236,8 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__day
-              , subq_3.window_end__day
+              subq_3.window_start__extract_month
+              , subq_3.window_end__extract_day
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -164,11 +248,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -177,11 +275,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
+                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+                , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
@@ -196,12 +308,12 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__day
+                subq_2.metric_time__day >= subq_4.window_start__extract_month
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__day
+                  subq_2.metric_time__day < subq_4.window_end__extract_day
                 ) OR (
-                  subq_4.window_end__day IS NULL
+                  subq_4.window_end__extract_day IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
index 86a2010b35..8e679fa648 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,12 +32,12 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= listings_src_10017.active_from
+        subq_12.metric_time__day >= EXTRACT(MONTH FROM listings_src_10017.active_from)
       ) AND (
         (
-          subq_12.metric_time__day < listings_src_10017.active_to
+          subq_12.metric_time__day < EXTRACT(DAY FROM listings_src_10017.active_to)
         ) OR (
-          listings_src_10017.active_to IS NULL
+          EXTRACT(DAY FROM listings_src_10017.active_to) IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 6ed1bd4e99..6ef8853985 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 22702f0c48..29fb5d972e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
index 027f20ea5b..16e8afe8d0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -37,31 +37,73 @@ INNER JOIN (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -111,32 +153,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql
index 913fed793c..b00d690648 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql
@@ -26,31 +26,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
index 86b30c4553..583b4a4bf0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
@@ -21,21 +21,49 @@ FROM (
         , subq_0.ds__month
         , subq_0.ds__quarter
         , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dayofweek
+        , subq_0.ds__extract_dayofyear
         , subq_0.created_at__day
         , subq_0.created_at__week
         , subq_0.created_at__month
         , subq_0.created_at__quarter
         , subq_0.created_at__year
+        , subq_0.created_at__extract_year
+        , subq_0.created_at__extract_quarter
+        , subq_0.created_at__extract_month
+        , subq_0.created_at__extract_week
+        , subq_0.created_at__extract_day
+        , subq_0.created_at__extract_dayofweek
+        , subq_0.created_at__extract_dayofyear
         , subq_0.listing__ds__day
         , subq_0.listing__ds__week
         , subq_0.listing__ds__month
         , subq_0.listing__ds__quarter
         , subq_0.listing__ds__year
+        , subq_0.listing__ds__extract_year
+        , subq_0.listing__ds__extract_quarter
+        , subq_0.listing__ds__extract_month
+        , subq_0.listing__ds__extract_week
+        , subq_0.listing__ds__extract_day
+        , subq_0.listing__ds__extract_dayofweek
+        , subq_0.listing__ds__extract_dayofyear
         , subq_0.listing__created_at__day
         , subq_0.listing__created_at__week
         , subq_0.listing__created_at__month
         , subq_0.listing__created_at__quarter
         , subq_0.listing__created_at__year
+        , subq_0.listing__created_at__extract_year
+        , subq_0.listing__created_at__extract_quarter
+        , subq_0.listing__created_at__extract_month
+        , subq_0.listing__created_at__extract_week
+        , subq_0.listing__created_at__extract_day
+        , subq_0.listing__created_at__extract_dayofweek
+        , subq_0.listing__created_at__extract_dayofyear
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -64,11 +92,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -77,11 +119,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql
index 316737d00a..b05da97264 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql
@@ -35,32 +35,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql
index 73e6a70d92..437dc887b4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql
@@ -60,31 +60,73 @@ FROM (
                     , subq_0.ds__month
                     , subq_0.ds__quarter
                     , subq_0.ds__year
+                    , subq_0.ds__extract_year
+                    , subq_0.ds__extract_quarter
+                    , subq_0.ds__extract_month
+                    , subq_0.ds__extract_week
+                    , subq_0.ds__extract_day
+                    , subq_0.ds__extract_dayofweek
+                    , subq_0.ds__extract_dayofyear
                     , subq_0.ds_partitioned__day
                     , subq_0.ds_partitioned__week
                     , subq_0.ds_partitioned__month
                     , subq_0.ds_partitioned__quarter
                     , subq_0.ds_partitioned__year
+                    , subq_0.ds_partitioned__extract_year
+                    , subq_0.ds_partitioned__extract_quarter
+                    , subq_0.ds_partitioned__extract_month
+                    , subq_0.ds_partitioned__extract_week
+                    , subq_0.ds_partitioned__extract_day
+                    , subq_0.ds_partitioned__extract_dayofweek
+                    , subq_0.ds_partitioned__extract_dayofyear
                     , subq_0.paid_at__day
                     , subq_0.paid_at__week
                     , subq_0.paid_at__month
                     , subq_0.paid_at__quarter
                     , subq_0.paid_at__year
+                    , subq_0.paid_at__extract_year
+                    , subq_0.paid_at__extract_quarter
+                    , subq_0.paid_at__extract_month
+                    , subq_0.paid_at__extract_week
+                    , subq_0.paid_at__extract_day
+                    , subq_0.paid_at__extract_dayofweek
+                    , subq_0.paid_at__extract_dayofyear
                     , subq_0.booking__ds__day
                     , subq_0.booking__ds__week
                     , subq_0.booking__ds__month
                     , subq_0.booking__ds__quarter
                     , subq_0.booking__ds__year
+                    , subq_0.booking__ds__extract_year
+                    , subq_0.booking__ds__extract_quarter
+                    , subq_0.booking__ds__extract_month
+                    , subq_0.booking__ds__extract_week
+                    , subq_0.booking__ds__extract_day
+                    , subq_0.booking__ds__extract_dayofweek
+                    , subq_0.booking__ds__extract_dayofyear
                     , subq_0.booking__ds_partitioned__day
                     , subq_0.booking__ds_partitioned__week
                     , subq_0.booking__ds_partitioned__month
                     , subq_0.booking__ds_partitioned__quarter
                     , subq_0.booking__ds_partitioned__year
+                    , subq_0.booking__ds_partitioned__extract_year
+                    , subq_0.booking__ds_partitioned__extract_quarter
+                    , subq_0.booking__ds_partitioned__extract_month
+                    , subq_0.booking__ds_partitioned__extract_week
+                    , subq_0.booking__ds_partitioned__extract_day
+                    , subq_0.booking__ds_partitioned__extract_dayofweek
+                    , subq_0.booking__ds_partitioned__extract_dayofyear
                     , subq_0.booking__paid_at__day
                     , subq_0.booking__paid_at__week
                     , subq_0.booking__paid_at__month
                     , subq_0.booking__paid_at__quarter
                     , subq_0.booking__paid_at__year
+                    , subq_0.booking__paid_at__extract_year
+                    , subq_0.booking__paid_at__extract_quarter
+                    , subq_0.booking__paid_at__extract_month
+                    , subq_0.booking__paid_at__extract_week
+                    , subq_0.booking__paid_at__extract_day
+                    , subq_0.booking__paid_at__extract_dayofweek
+                    , subq_0.booking__paid_at__extract_dayofyear
                     , subq_0.ds__day AS metric_time__day
                     , subq_0.ds__week AS metric_time__week
                     , subq_0.ds__month AS metric_time__month
@@ -134,32 +176,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -184,21 +268,49 @@ FROM (
                     , subq_3.ds__month
                     , subq_3.ds__quarter
                     , subq_3.ds__year
+                    , subq_3.ds__extract_year
+                    , subq_3.ds__extract_quarter
+                    , subq_3.ds__extract_month
+                    , subq_3.ds__extract_week
+                    , subq_3.ds__extract_day
+                    , subq_3.ds__extract_dayofweek
+                    , subq_3.ds__extract_dayofyear
                     , subq_3.created_at__day
                     , subq_3.created_at__week
                     , subq_3.created_at__month
                     , subq_3.created_at__quarter
                     , subq_3.created_at__year
+                    , subq_3.created_at__extract_year
+                    , subq_3.created_at__extract_quarter
+                    , subq_3.created_at__extract_month
+                    , subq_3.created_at__extract_week
+                    , subq_3.created_at__extract_day
+                    , subq_3.created_at__extract_dayofweek
+                    , subq_3.created_at__extract_dayofyear
                     , subq_3.listing__ds__day
                     , subq_3.listing__ds__week
                     , subq_3.listing__ds__month
                     , subq_3.listing__ds__quarter
                     , subq_3.listing__ds__year
+                    , subq_3.listing__ds__extract_year
+                    , subq_3.listing__ds__extract_quarter
+                    , subq_3.listing__ds__extract_month
+                    , subq_3.listing__ds__extract_week
+                    , subq_3.listing__ds__extract_day
+                    , subq_3.listing__ds__extract_dayofweek
+                    , subq_3.listing__ds__extract_dayofyear
                     , subq_3.listing__created_at__day
                     , subq_3.listing__created_at__week
                     , subq_3.listing__created_at__month
                     , subq_3.listing__created_at__quarter
                     , subq_3.listing__created_at__year
+                    , subq_3.listing__created_at__extract_year
+                    , subq_3.listing__created_at__extract_quarter
+                    , subq_3.listing__created_at__extract_month
+                    , subq_3.listing__created_at__extract_week
+                    , subq_3.listing__created_at__extract_day
+                    , subq_3.listing__created_at__extract_dayofweek
+                    , subq_3.listing__created_at__extract_dayofyear
                     , subq_3.ds__day AS metric_time__day
                     , subq_3.ds__week AS metric_time__week
                     , subq_3.ds__month AS metric_time__month
@@ -227,11 +339,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -240,11 +366,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -317,31 +457,73 @@ FROM (
                     , subq_12.ds__month
                     , subq_12.ds__quarter
                     , subq_12.ds__year
+                    , subq_12.ds__extract_year
+                    , subq_12.ds__extract_quarter
+                    , subq_12.ds__extract_month
+                    , subq_12.ds__extract_week
+                    , subq_12.ds__extract_day
+                    , subq_12.ds__extract_dayofweek
+                    , subq_12.ds__extract_dayofyear
                     , subq_12.ds_partitioned__day
                     , subq_12.ds_partitioned__week
                     , subq_12.ds_partitioned__month
                     , subq_12.ds_partitioned__quarter
                     , subq_12.ds_partitioned__year
+                    , subq_12.ds_partitioned__extract_year
+                    , subq_12.ds_partitioned__extract_quarter
+                    , subq_12.ds_partitioned__extract_month
+                    , subq_12.ds_partitioned__extract_week
+                    , subq_12.ds_partitioned__extract_day
+                    , subq_12.ds_partitioned__extract_dayofweek
+                    , subq_12.ds_partitioned__extract_dayofyear
                     , subq_12.paid_at__day
                     , subq_12.paid_at__week
                     , subq_12.paid_at__month
                     , subq_12.paid_at__quarter
                     , subq_12.paid_at__year
+                    , subq_12.paid_at__extract_year
+                    , subq_12.paid_at__extract_quarter
+                    , subq_12.paid_at__extract_month
+                    , subq_12.paid_at__extract_week
+                    , subq_12.paid_at__extract_day
+                    , subq_12.paid_at__extract_dayofweek
+                    , subq_12.paid_at__extract_dayofyear
                     , subq_12.booking__ds__day
                     , subq_12.booking__ds__week
                     , subq_12.booking__ds__month
                     , subq_12.booking__ds__quarter
                     , subq_12.booking__ds__year
+                    , subq_12.booking__ds__extract_year
+                    , subq_12.booking__ds__extract_quarter
+                    , subq_12.booking__ds__extract_month
+                    , subq_12.booking__ds__extract_week
+                    , subq_12.booking__ds__extract_day
+                    , subq_12.booking__ds__extract_dayofweek
+                    , subq_12.booking__ds__extract_dayofyear
                     , subq_12.booking__ds_partitioned__day
                     , subq_12.booking__ds_partitioned__week
                     , subq_12.booking__ds_partitioned__month
                     , subq_12.booking__ds_partitioned__quarter
                     , subq_12.booking__ds_partitioned__year
+                    , subq_12.booking__ds_partitioned__extract_year
+                    , subq_12.booking__ds_partitioned__extract_quarter
+                    , subq_12.booking__ds_partitioned__extract_month
+                    , subq_12.booking__ds_partitioned__extract_week
+                    , subq_12.booking__ds_partitioned__extract_day
+                    , subq_12.booking__ds_partitioned__extract_dayofweek
+                    , subq_12.booking__ds_partitioned__extract_dayofyear
                     , subq_12.booking__paid_at__day
                     , subq_12.booking__paid_at__week
                     , subq_12.booking__paid_at__month
                     , subq_12.booking__paid_at__quarter
                     , subq_12.booking__paid_at__year
+                    , subq_12.booking__paid_at__extract_year
+                    , subq_12.booking__paid_at__extract_quarter
+                    , subq_12.booking__paid_at__extract_month
+                    , subq_12.booking__paid_at__extract_week
+                    , subq_12.booking__paid_at__extract_day
+                    , subq_12.booking__paid_at__extract_dayofweek
+                    , subq_12.booking__paid_at__extract_dayofyear
                     , subq_12.ds__day AS metric_time__day
                     , subq_12.ds__week AS metric_time__week
                     , subq_12.ds__month AS metric_time__month
@@ -391,32 +573,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -441,21 +665,49 @@ FROM (
                     , subq_15.ds__month
                     , subq_15.ds__quarter
                     , subq_15.ds__year
+                    , subq_15.ds__extract_year
+                    , subq_15.ds__extract_quarter
+                    , subq_15.ds__extract_month
+                    , subq_15.ds__extract_week
+                    , subq_15.ds__extract_day
+                    , subq_15.ds__extract_dayofweek
+                    , subq_15.ds__extract_dayofyear
                     , subq_15.created_at__day
                     , subq_15.created_at__week
                     , subq_15.created_at__month
                     , subq_15.created_at__quarter
                     , subq_15.created_at__year
+                    , subq_15.created_at__extract_year
+                    , subq_15.created_at__extract_quarter
+                    , subq_15.created_at__extract_month
+                    , subq_15.created_at__extract_week
+                    , subq_15.created_at__extract_day
+                    , subq_15.created_at__extract_dayofweek
+                    , subq_15.created_at__extract_dayofyear
                     , subq_15.listing__ds__day
                     , subq_15.listing__ds__week
                     , subq_15.listing__ds__month
                     , subq_15.listing__ds__quarter
                     , subq_15.listing__ds__year
+                    , subq_15.listing__ds__extract_year
+                    , subq_15.listing__ds__extract_quarter
+                    , subq_15.listing__ds__extract_month
+                    , subq_15.listing__ds__extract_week
+                    , subq_15.listing__ds__extract_day
+                    , subq_15.listing__ds__extract_dayofweek
+                    , subq_15.listing__ds__extract_dayofyear
                     , subq_15.listing__created_at__day
                     , subq_15.listing__created_at__week
                     , subq_15.listing__created_at__month
                     , subq_15.listing__created_at__quarter
                     , subq_15.listing__created_at__year
+                    , subq_15.listing__created_at__extract_year
+                    , subq_15.listing__created_at__extract_quarter
+                    , subq_15.listing__created_at__extract_month
+                    , subq_15.listing__created_at__extract_week
+                    , subq_15.listing__created_at__extract_day
+                    , subq_15.listing__created_at__extract_dayofweek
+                    , subq_15.listing__created_at__extract_dayofyear
                     , subq_15.ds__day AS metric_time__day
                     , subq_15.ds__week AS metric_time__week
                     , subq_15.ds__month AS metric_time__month
@@ -484,11 +736,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -497,11 +763,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -557,31 +837,73 @@ FROM (
             , subq_24.ds__month
             , subq_24.ds__quarter
             , subq_24.ds__year
+            , subq_24.ds__extract_year
+            , subq_24.ds__extract_quarter
+            , subq_24.ds__extract_month
+            , subq_24.ds__extract_week
+            , subq_24.ds__extract_day
+            , subq_24.ds__extract_dayofweek
+            , subq_24.ds__extract_dayofyear
             , subq_24.ds_partitioned__day
             , subq_24.ds_partitioned__week
             , subq_24.ds_partitioned__month
             , subq_24.ds_partitioned__quarter
             , subq_24.ds_partitioned__year
+            , subq_24.ds_partitioned__extract_year
+            , subq_24.ds_partitioned__extract_quarter
+            , subq_24.ds_partitioned__extract_month
+            , subq_24.ds_partitioned__extract_week
+            , subq_24.ds_partitioned__extract_day
+            , subq_24.ds_partitioned__extract_dayofweek
+            , subq_24.ds_partitioned__extract_dayofyear
             , subq_24.paid_at__day
             , subq_24.paid_at__week
             , subq_24.paid_at__month
             , subq_24.paid_at__quarter
             , subq_24.paid_at__year
+            , subq_24.paid_at__extract_year
+            , subq_24.paid_at__extract_quarter
+            , subq_24.paid_at__extract_month
+            , subq_24.paid_at__extract_week
+            , subq_24.paid_at__extract_day
+            , subq_24.paid_at__extract_dayofweek
+            , subq_24.paid_at__extract_dayofyear
             , subq_24.booking__ds__day
             , subq_24.booking__ds__week
             , subq_24.booking__ds__month
             , subq_24.booking__ds__quarter
             , subq_24.booking__ds__year
+            , subq_24.booking__ds__extract_year
+            , subq_24.booking__ds__extract_quarter
+            , subq_24.booking__ds__extract_month
+            , subq_24.booking__ds__extract_week
+            , subq_24.booking__ds__extract_day
+            , subq_24.booking__ds__extract_dayofweek
+            , subq_24.booking__ds__extract_dayofyear
             , subq_24.booking__ds_partitioned__day
             , subq_24.booking__ds_partitioned__week
             , subq_24.booking__ds_partitioned__month
             , subq_24.booking__ds_partitioned__quarter
             , subq_24.booking__ds_partitioned__year
+            , subq_24.booking__ds_partitioned__extract_year
+            , subq_24.booking__ds_partitioned__extract_quarter
+            , subq_24.booking__ds_partitioned__extract_month
+            , subq_24.booking__ds_partitioned__extract_week
+            , subq_24.booking__ds_partitioned__extract_day
+            , subq_24.booking__ds_partitioned__extract_dayofweek
+            , subq_24.booking__ds_partitioned__extract_dayofyear
             , subq_24.booking__paid_at__day
             , subq_24.booking__paid_at__week
             , subq_24.booking__paid_at__month
             , subq_24.booking__paid_at__quarter
             , subq_24.booking__paid_at__year
+            , subq_24.booking__paid_at__extract_year
+            , subq_24.booking__paid_at__extract_quarter
+            , subq_24.booking__paid_at__extract_month
+            , subq_24.booking__paid_at__extract_week
+            , subq_24.booking__paid_at__extract_day
+            , subq_24.booking__paid_at__extract_dayofweek
+            , subq_24.booking__paid_at__extract_dayofyear
             , subq_24.ds__day AS metric_time__day
             , subq_24.ds__week AS metric_time__week
             , subq_24.ds__month AS metric_time__month
@@ -631,32 +953,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
index 4176ca90e9..37ad3a608e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
@@ -45,31 +45,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -119,32 +161,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -186,31 +270,73 @@ FROM (
             , subq_7.ds__month
             , subq_7.ds__quarter
             , subq_7.ds__year
+            , subq_7.ds__extract_year
+            , subq_7.ds__extract_quarter
+            , subq_7.ds__extract_month
+            , subq_7.ds__extract_week
+            , subq_7.ds__extract_day
+            , subq_7.ds__extract_dayofweek
+            , subq_7.ds__extract_dayofyear
             , subq_7.ds_partitioned__day
             , subq_7.ds_partitioned__week
             , subq_7.ds_partitioned__month
             , subq_7.ds_partitioned__quarter
             , subq_7.ds_partitioned__year
+            , subq_7.ds_partitioned__extract_year
+            , subq_7.ds_partitioned__extract_quarter
+            , subq_7.ds_partitioned__extract_month
+            , subq_7.ds_partitioned__extract_week
+            , subq_7.ds_partitioned__extract_day
+            , subq_7.ds_partitioned__extract_dayofweek
+            , subq_7.ds_partitioned__extract_dayofyear
             , subq_7.paid_at__day
             , subq_7.paid_at__week
             , subq_7.paid_at__month
             , subq_7.paid_at__quarter
             , subq_7.paid_at__year
+            , subq_7.paid_at__extract_year
+            , subq_7.paid_at__extract_quarter
+            , subq_7.paid_at__extract_month
+            , subq_7.paid_at__extract_week
+            , subq_7.paid_at__extract_day
+            , subq_7.paid_at__extract_dayofweek
+            , subq_7.paid_at__extract_dayofyear
             , subq_7.booking__ds__day
             , subq_7.booking__ds__week
             , subq_7.booking__ds__month
             , subq_7.booking__ds__quarter
             , subq_7.booking__ds__year
+            , subq_7.booking__ds__extract_year
+            , subq_7.booking__ds__extract_quarter
+            , subq_7.booking__ds__extract_month
+            , subq_7.booking__ds__extract_week
+            , subq_7.booking__ds__extract_day
+            , subq_7.booking__ds__extract_dayofweek
+            , subq_7.booking__ds__extract_dayofyear
             , subq_7.booking__ds_partitioned__day
             , subq_7.booking__ds_partitioned__week
             , subq_7.booking__ds_partitioned__month
             , subq_7.booking__ds_partitioned__quarter
             , subq_7.booking__ds_partitioned__year
+            , subq_7.booking__ds_partitioned__extract_year
+            , subq_7.booking__ds_partitioned__extract_quarter
+            , subq_7.booking__ds_partitioned__extract_month
+            , subq_7.booking__ds_partitioned__extract_week
+            , subq_7.booking__ds_partitioned__extract_day
+            , subq_7.booking__ds_partitioned__extract_dayofweek
+            , subq_7.booking__ds_partitioned__extract_dayofyear
             , subq_7.booking__paid_at__day
             , subq_7.booking__paid_at__week
             , subq_7.booking__paid_at__month
             , subq_7.booking__paid_at__quarter
             , subq_7.booking__paid_at__year
+            , subq_7.booking__paid_at__extract_year
+            , subq_7.booking__paid_at__extract_quarter
+            , subq_7.booking__paid_at__extract_month
+            , subq_7.booking__paid_at__extract_week
+            , subq_7.booking__paid_at__extract_day
+            , subq_7.booking__paid_at__extract_dayofweek
+            , subq_7.booking__paid_at__extract_dayofyear
             , subq_7.ds__day AS metric_time__day
             , subq_7.ds__week AS metric_time__week
             , subq_7.ds__month AS metric_time__month
@@ -260,32 +386,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 13d80a91d0..a495423238 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -39,31 +39,73 @@ FROM (
               , subq_0.ds__month
               , subq_0.ds__quarter
               , subq_0.ds__year
+              , subq_0.ds__extract_year
+              , subq_0.ds__extract_quarter
+              , subq_0.ds__extract_month
+              , subq_0.ds__extract_week
+              , subq_0.ds__extract_day
+              , subq_0.ds__extract_dayofweek
+              , subq_0.ds__extract_dayofyear
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
               , subq_0.ds_partitioned__quarter
               , subq_0.ds_partitioned__year
+              , subq_0.ds_partitioned__extract_year
+              , subq_0.ds_partitioned__extract_quarter
+              , subq_0.ds_partitioned__extract_month
+              , subq_0.ds_partitioned__extract_week
+              , subq_0.ds_partitioned__extract_day
+              , subq_0.ds_partitioned__extract_dayofweek
+              , subq_0.ds_partitioned__extract_dayofyear
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
               , subq_0.paid_at__quarter
               , subq_0.paid_at__year
+              , subq_0.paid_at__extract_year
+              , subq_0.paid_at__extract_quarter
+              , subq_0.paid_at__extract_month
+              , subq_0.paid_at__extract_week
+              , subq_0.paid_at__extract_day
+              , subq_0.paid_at__extract_dayofweek
+              , subq_0.paid_at__extract_dayofyear
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
               , subq_0.booking__ds__quarter
               , subq_0.booking__ds__year
+              , subq_0.booking__ds__extract_year
+              , subq_0.booking__ds__extract_quarter
+              , subq_0.booking__ds__extract_month
+              , subq_0.booking__ds__extract_week
+              , subq_0.booking__ds__extract_day
+              , subq_0.booking__ds__extract_dayofweek
+              , subq_0.booking__ds__extract_dayofyear
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
               , subq_0.booking__ds_partitioned__quarter
               , subq_0.booking__ds_partitioned__year
+              , subq_0.booking__ds_partitioned__extract_year
+              , subq_0.booking__ds_partitioned__extract_quarter
+              , subq_0.booking__ds_partitioned__extract_month
+              , subq_0.booking__ds_partitioned__extract_week
+              , subq_0.booking__ds_partitioned__extract_day
+              , subq_0.booking__ds_partitioned__extract_dayofweek
+              , subq_0.booking__ds_partitioned__extract_dayofyear
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
               , subq_0.booking__paid_at__quarter
               , subq_0.booking__paid_at__year
+              , subq_0.booking__paid_at__extract_year
+              , subq_0.booking__paid_at__extract_quarter
+              , subq_0.booking__paid_at__extract_month
+              , subq_0.booking__paid_at__extract_week
+              , subq_0.booking__paid_at__extract_day
+              , subq_0.booking__paid_at__extract_dayofweek
+              , subq_0.booking__paid_at__extract_dayofyear
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -113,32 +155,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 14ec230f17..0e4cdb1a6a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -27,31 +27,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -160,21 +244,49 @@ FROM (
             , subq_5.ds__month
             , subq_5.ds__quarter
             , subq_5.ds__year
+            , subq_5.ds__extract_year
+            , subq_5.ds__extract_quarter
+            , subq_5.ds__extract_month
+            , subq_5.ds__extract_week
+            , subq_5.ds__extract_day
+            , subq_5.ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear
             , subq_5.created_at__day
             , subq_5.created_at__week
             , subq_5.created_at__month
             , subq_5.created_at__quarter
             , subq_5.created_at__year
+            , subq_5.created_at__extract_year
+            , subq_5.created_at__extract_quarter
+            , subq_5.created_at__extract_month
+            , subq_5.created_at__extract_week
+            , subq_5.created_at__extract_day
+            , subq_5.created_at__extract_dayofweek
+            , subq_5.created_at__extract_dayofyear
             , subq_5.listing__ds__day
             , subq_5.listing__ds__week
             , subq_5.listing__ds__month
             , subq_5.listing__ds__quarter
             , subq_5.listing__ds__year
+            , subq_5.listing__ds__extract_year
+            , subq_5.listing__ds__extract_quarter
+            , subq_5.listing__ds__extract_month
+            , subq_5.listing__ds__extract_week
+            , subq_5.listing__ds__extract_day
+            , subq_5.listing__ds__extract_dayofweek
+            , subq_5.listing__ds__extract_dayofyear
             , subq_5.listing__created_at__day
             , subq_5.listing__created_at__week
             , subq_5.listing__created_at__month
             , subq_5.listing__created_at__quarter
             , subq_5.listing__created_at__year
+            , subq_5.listing__created_at__extract_year
+            , subq_5.listing__created_at__extract_quarter
+            , subq_5.listing__created_at__extract_month
+            , subq_5.listing__created_at__extract_week
+            , subq_5.listing__created_at__extract_day
+            , subq_5.listing__created_at__extract_dayofweek
+            , subq_5.listing__created_at__extract_dayofyear
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -203,11 +315,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -216,11 +342,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
index 88cc0b431d..7509855402 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__day AS listing__window_start__day
-        , subq_7.window_end__day AS listing__window_end__day
+        , subq_7.window_start__extract_month AS listing__window_start__extract_month
+        , subq_7.window_end__extract_day AS listing__window_end__extract_day
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
         , subq_2.bookings AS bookings
@@ -40,31 +40,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -142,8 +226,8 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__day
-          , subq_6.window_end__day
+          subq_6.window_start__extract_month
+          , subq_6.window_end__extract_day
           , subq_6.listing
           , subq_6.user__home_state_latest
         FROM (
@@ -154,26 +238,61 @@ FROM (
             , subq_3.window_start__month AS window_start__month
             , subq_3.window_start__quarter AS window_start__quarter
             , subq_3.window_start__year AS window_start__year
+            , subq_3.window_start__extract_year AS window_start__extract_year
+            , subq_3.window_start__extract_quarter AS window_start__extract_quarter
+            , subq_3.window_start__extract_month AS window_start__extract_month
+            , subq_3.window_start__extract_week AS window_start__extract_week
+            , subq_3.window_start__extract_day AS window_start__extract_day
+            , subq_3.window_start__extract_dayofweek AS window_start__extract_dayofweek
+            , subq_3.window_start__extract_dayofyear AS window_start__extract_dayofyear
             , subq_3.window_end__day AS window_end__day
             , subq_3.window_end__week AS window_end__week
             , subq_3.window_end__month AS window_end__month
             , subq_3.window_end__quarter AS window_end__quarter
             , subq_3.window_end__year AS window_end__year
+            , subq_3.window_end__extract_year AS window_end__extract_year
+            , subq_3.window_end__extract_quarter AS window_end__extract_quarter
+            , subq_3.window_end__extract_month AS window_end__extract_month
+            , subq_3.window_end__extract_week AS window_end__extract_week
+            , subq_3.window_end__extract_day AS window_end__extract_day
+            , subq_3.window_end__extract_dayofweek AS window_end__extract_dayofweek
+            , subq_3.window_end__extract_dayofyear AS window_end__extract_dayofyear
             , subq_3.listing__window_start__day AS listing__window_start__day
             , subq_3.listing__window_start__week AS listing__window_start__week
             , subq_3.listing__window_start__month AS listing__window_start__month
             , subq_3.listing__window_start__quarter AS listing__window_start__quarter
             , subq_3.listing__window_start__year AS listing__window_start__year
+            , subq_3.listing__window_start__extract_year AS listing__window_start__extract_year
+            , subq_3.listing__window_start__extract_quarter AS listing__window_start__extract_quarter
+            , subq_3.listing__window_start__extract_month AS listing__window_start__extract_month
+            , subq_3.listing__window_start__extract_week AS listing__window_start__extract_week
+            , subq_3.listing__window_start__extract_day AS listing__window_start__extract_day
+            , subq_3.listing__window_start__extract_dayofweek AS listing__window_start__extract_dayofweek
+            , subq_3.listing__window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
             , subq_3.listing__window_end__day AS listing__window_end__day
             , subq_3.listing__window_end__week AS listing__window_end__week
             , subq_3.listing__window_end__month AS listing__window_end__month
             , subq_3.listing__window_end__quarter AS listing__window_end__quarter
             , subq_3.listing__window_end__year AS listing__window_end__year
+            , subq_3.listing__window_end__extract_year AS listing__window_end__extract_year
+            , subq_3.listing__window_end__extract_quarter AS listing__window_end__extract_quarter
+            , subq_3.listing__window_end__extract_month AS listing__window_end__extract_month
+            , subq_3.listing__window_end__extract_week AS listing__window_end__extract_week
+            , subq_3.listing__window_end__extract_day AS listing__window_end__extract_day
+            , subq_3.listing__window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
+            , subq_3.listing__window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
             , subq_5.ds__day AS user__ds__day
             , subq_5.ds__week AS user__ds__week
             , subq_5.ds__month AS user__ds__month
             , subq_5.ds__quarter AS user__ds__quarter
             , subq_5.ds__year AS user__ds__year
+            , subq_5.ds__extract_year AS user__ds__extract_year
+            , subq_5.ds__extract_quarter AS user__ds__extract_quarter
+            , subq_5.ds__extract_month AS user__ds__extract_month
+            , subq_5.ds__extract_week AS user__ds__extract_week
+            , subq_5.ds__extract_day AS user__ds__extract_day
+            , subq_5.ds__extract_dayofweek AS user__ds__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS user__ds__extract_dayofyear
             , subq_3.listing AS listing
             , subq_3.user AS user
             , subq_3.listing__user AS listing__user
@@ -192,11 +311,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -205,11 +338,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
+              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+              , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -227,11 +374,25 @@ FROM (
             --    'ds__month',
             --    'ds__quarter',
             --    'ds__year',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
+            --    'ds__day',
             --    'user__ds__day',
             --    'user__ds__week',
             --    'user__ds__month',
             --    'user__ds__quarter',
             --    'user__ds__year',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
+            --    'user__ds__day',
             --    'user']
             SELECT
               subq_4.ds__day
@@ -239,11 +400,25 @@ FROM (
               , subq_4.ds__month
               , subq_4.ds__quarter
               , subq_4.ds__year
+              , subq_4.ds__extract_year
+              , subq_4.ds__extract_quarter
+              , subq_4.ds__extract_month
+              , subq_4.ds__extract_week
+              , subq_4.ds__extract_day
+              , subq_4.ds__extract_dayofweek
+              , subq_4.ds__extract_dayofyear
               , subq_4.user__ds__day
               , subq_4.user__ds__week
               , subq_4.user__ds__month
               , subq_4.user__ds__quarter
               , subq_4.user__ds__year
+              , subq_4.user__ds__extract_year
+              , subq_4.user__ds__extract_quarter
+              , subq_4.user__ds__extract_month
+              , subq_4.user__ds__extract_week
+              , subq_4.user__ds__extract_day
+              , subq_4.user__ds__extract_dayofweek
+              , subq_4.user__ds__extract_dayofyear
               , subq_4.user
               , subq_4.home_state_latest
               , subq_4.user__home_state_latest
@@ -255,12 +430,26 @@ FROM (
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS ds__year
+                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS ds__extract_year
+                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS ds__extract_quarter
+                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS ds__extract_month
+                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS ds__extract_week
+                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_dayofyear
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC('week', users_latest_src_10021.ds) AS user__ds__week
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS user__ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS user__ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS user__ds__year
+                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS user__ds__extract_year
+                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
+                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS user__ds__extract_month
+                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
+                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS user__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_dayofyear
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
@@ -275,12 +464,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__day
+            subq_2.metric_time__day >= subq_7.window_start__extract_month
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.window_end__day
+              subq_2.metric_time__day < subq_7.window_end__extract_day
             ) OR (
-              subq_7.window_end__day IS NULL
+              subq_7.window_end__extract_day IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index feb5ed0fdc..dac9dfcf79 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,8 +23,8 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    listings_src_10017.active_from AS window_start__day
-    , listings_src_10017.active_to AS window_end__day
+    EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
+    , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
   FROM ***************************.dim_listings listings_src_10017
@@ -38,12 +38,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__day
+      subq_13.metric_time__day >= subq_18.window_start__extract_month
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.window_end__day
+        subq_13.metric_time__day < subq_18.window_end__extract_day
       ) OR (
-        subq_18.window_end__day IS NULL
+        subq_18.window_end__extract_day IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
index 94054a124c..27cc3589f7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.lux_listing__window_start__day AS listing__lux_listing__window_start__day
-        , subq_7.lux_listing__window_end__day AS listing__lux_listing__window_end__day
+        , subq_7.lux_listing__window_start__extract_month AS listing__lux_listing__window_start__extract_month
+        , subq_7.lux_listing__window_end__extract_week AS listing__lux_listing__window_end__extract_week
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
         , subq_2.bookings AS bookings
@@ -40,31 +40,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -100,32 +142,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -145,8 +229,8 @@ FROM (
         --    'lux_listing__window_end__day',
         --    'listing']
         SELECT
-          subq_6.lux_listing__window_start__day
-          , subq_6.lux_listing__window_end__day
+          subq_6.lux_listing__window_start__extract_month
+          , subq_6.lux_listing__window_end__extract_week
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
         FROM (
@@ -157,11 +241,25 @@ FROM (
             , subq_5.window_start__month AS lux_listing__window_start__month
             , subq_5.window_start__quarter AS lux_listing__window_start__quarter
             , subq_5.window_start__year AS lux_listing__window_start__year
+            , subq_5.window_start__extract_year AS lux_listing__window_start__extract_year
+            , subq_5.window_start__extract_quarter AS lux_listing__window_start__extract_quarter
+            , subq_5.window_start__extract_month AS lux_listing__window_start__extract_month
+            , subq_5.window_start__extract_week AS lux_listing__window_start__extract_week
+            , subq_5.window_start__extract_day AS lux_listing__window_start__extract_day
+            , subq_5.window_start__extract_dayofweek AS lux_listing__window_start__extract_dayofweek
+            , subq_5.window_start__extract_dayofyear AS lux_listing__window_start__extract_dayofyear
             , subq_5.window_end__day AS lux_listing__window_end__day
             , subq_5.window_end__week AS lux_listing__window_end__week
             , subq_5.window_end__month AS lux_listing__window_end__month
             , subq_5.window_end__quarter AS lux_listing__window_end__quarter
             , subq_5.window_end__year AS lux_listing__window_end__year
+            , subq_5.window_end__extract_year AS lux_listing__window_end__extract_year
+            , subq_5.window_end__extract_quarter AS lux_listing__window_end__extract_quarter
+            , subq_5.window_end__extract_month AS lux_listing__window_end__extract_month
+            , subq_5.window_end__extract_week AS lux_listing__window_end__extract_week
+            , subq_5.window_end__extract_day AS lux_listing__window_end__extract_day
+            , subq_5.window_end__extract_dayofweek AS lux_listing__window_end__extract_dayofweek
+            , subq_5.window_end__extract_dayofyear AS lux_listing__window_end__extract_dayofyear
             , subq_3.listing AS listing
             , subq_3.lux_listing AS lux_listing
             , subq_3.listing__lux_listing AS listing__lux_listing
@@ -183,21 +281,49 @@ FROM (
             --    'window_start__month',
             --    'window_start__quarter',
             --    'window_start__year',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
+            --    'window_start__day',
             --    'window_end__day',
             --    'window_end__week',
             --    'window_end__month',
             --    'window_end__quarter',
             --    'window_end__year',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
+            --    'window_end__day',
             --    'lux_listing__window_start__day',
             --    'lux_listing__window_start__week',
             --    'lux_listing__window_start__month',
             --    'lux_listing__window_start__quarter',
             --    'lux_listing__window_start__year',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__day',
             --    'lux_listing__window_end__day',
             --    'lux_listing__window_end__week',
             --    'lux_listing__window_end__month',
             --    'lux_listing__window_end__quarter',
             --    'lux_listing__window_end__year',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__day',
             --    'lux_listing']
             SELECT
               subq_4.window_start__day
@@ -205,21 +331,49 @@ FROM (
               , subq_4.window_start__month
               , subq_4.window_start__quarter
               , subq_4.window_start__year
+              , subq_4.window_start__extract_year
+              , subq_4.window_start__extract_quarter
+              , subq_4.window_start__extract_month
+              , subq_4.window_start__extract_week
+              , subq_4.window_start__extract_day
+              , subq_4.window_start__extract_dayofweek
+              , subq_4.window_start__extract_dayofyear
               , subq_4.window_end__day
               , subq_4.window_end__week
               , subq_4.window_end__month
               , subq_4.window_end__quarter
               , subq_4.window_end__year
+              , subq_4.window_end__extract_year
+              , subq_4.window_end__extract_quarter
+              , subq_4.window_end__extract_month
+              , subq_4.window_end__extract_week
+              , subq_4.window_end__extract_day
+              , subq_4.window_end__extract_dayofweek
+              , subq_4.window_end__extract_dayofyear
               , subq_4.lux_listing__window_start__day
               , subq_4.lux_listing__window_start__week
               , subq_4.lux_listing__window_start__month
               , subq_4.lux_listing__window_start__quarter
               , subq_4.lux_listing__window_start__year
+              , subq_4.lux_listing__window_start__extract_year
+              , subq_4.lux_listing__window_start__extract_quarter
+              , subq_4.lux_listing__window_start__extract_month
+              , subq_4.lux_listing__window_start__extract_week
+              , subq_4.lux_listing__window_start__extract_day
+              , subq_4.lux_listing__window_start__extract_dayofweek
+              , subq_4.lux_listing__window_start__extract_dayofyear
               , subq_4.lux_listing__window_end__day
               , subq_4.lux_listing__window_end__week
               , subq_4.lux_listing__window_end__month
               , subq_4.lux_listing__window_end__quarter
               , subq_4.lux_listing__window_end__year
+              , subq_4.lux_listing__window_end__extract_year
+              , subq_4.lux_listing__window_end__extract_quarter
+              , subq_4.lux_listing__window_end__extract_month
+              , subq_4.lux_listing__window_end__extract_week
+              , subq_4.lux_listing__window_end__extract_day
+              , subq_4.lux_listing__window_end__extract_dayofweek
+              , subq_4.lux_listing__window_end__extract_dayofyear
               , subq_4.lux_listing
               , subq_4.is_confirmed_lux
               , subq_4.lux_listing__is_confirmed_lux
@@ -231,22 +385,50 @@ FROM (
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS window_start__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofyear
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS window_end__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofyear
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_from) AS lux_listing__window_start__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS lux_listing__window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS lux_listing__window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS lux_listing__window_start__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS lux_listing__window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS lux_listing__window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS lux_listing__window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS lux_listing__window_end__year
+                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
+                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
+                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofyear
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
@@ -261,12 +443,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.lux_listing__window_start__day
+            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_month
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.lux_listing__window_end__day
+              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_week
             ) OR (
-              subq_7.lux_listing__window_end__day IS NULL
+              subq_7.lux_listing__window_end__extract_week IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index f1b419a284..f84156c6f9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -26,8 +26,8 @@ LEFT OUTER JOIN (
   --    'lux_listing__window_end__day',
   --    'listing']
   SELECT
-    lux_listings_src_10019.valid_from AS lux_listing__window_start__day
-    , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
+    EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
+    , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
   FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_10018
@@ -41,12 +41,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.lux_listing__window_start__day
+      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_month
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.lux_listing__window_end__day
+        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_week
       ) OR (
-        subq_18.lux_listing__window_end__day IS NULL
+        subq_18.lux_listing__window_end__extract_week IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql
index ae8b7838b7..cb9670f074 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql
@@ -33,32 +33,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -85,11 +127,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -98,11 +154,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -131,11 +201,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -144,11 +228,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
index d35179ebf0..fbddd59f54 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
@@ -36,21 +36,49 @@ FROM (
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.ds__day
             , subq_0.ds__week
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.account_id__ds_partitioned__day
             , subq_0.account_id__ds_partitioned__week
             , subq_0.account_id__ds_partitioned__month
             , subq_0.account_id__ds_partitioned__quarter
             , subq_0.account_id__ds_partitioned__year
+            , subq_0.account_id__ds_partitioned__extract_year
+            , subq_0.account_id__ds_partitioned__extract_quarter
+            , subq_0.account_id__ds_partitioned__extract_month
+            , subq_0.account_id__ds_partitioned__extract_week
+            , subq_0.account_id__ds_partitioned__extract_day
+            , subq_0.account_id__ds_partitioned__extract_dayofweek
+            , subq_0.account_id__ds_partitioned__extract_dayofyear
             , subq_0.account_id__ds__day
             , subq_0.account_id__ds__week
             , subq_0.account_id__ds__month
             , subq_0.account_id__ds__quarter
             , subq_0.account_id__ds__year
+            , subq_0.account_id__ds__extract_year
+            , subq_0.account_id__ds__extract_quarter
+            , subq_0.account_id__ds__extract_month
+            , subq_0.account_id__ds__extract_week
+            , subq_0.account_id__ds__extract_day
+            , subq_0.account_id__ds__extract_dayofweek
+            , subq_0.account_id__ds__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -69,22 +97,50 @@ FROM (
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS ds__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_dayofyear
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS account_id__ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS account_id__ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS account_id__ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS account_id__ds__year
+              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
+              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
+              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
+              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
+              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofyear
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -106,16 +162,37 @@ FROM (
             , subq_3.ds_partitioned__month AS ds_partitioned__month
             , subq_3.ds_partitioned__quarter AS ds_partitioned__quarter
             , subq_3.ds_partitioned__year AS ds_partitioned__year
+            , subq_3.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_3.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_3.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_3.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_3.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_3.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
+            , subq_3.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
             , subq_3.account_id__ds_partitioned__day AS account_id__ds_partitioned__day
             , subq_3.account_id__ds_partitioned__week AS account_id__ds_partitioned__week
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
             , subq_3.account_id__ds_partitioned__quarter AS account_id__ds_partitioned__quarter
             , subq_3.account_id__ds_partitioned__year AS account_id__ds_partitioned__year
+            , subq_3.account_id__ds_partitioned__extract_year AS account_id__ds_partitioned__extract_year
+            , subq_3.account_id__ds_partitioned__extract_quarter AS account_id__ds_partitioned__extract_quarter
+            , subq_3.account_id__ds_partitioned__extract_month AS account_id__ds_partitioned__extract_month
+            , subq_3.account_id__ds_partitioned__extract_week AS account_id__ds_partitioned__extract_week
+            , subq_3.account_id__ds_partitioned__extract_day AS account_id__ds_partitioned__extract_day
+            , subq_3.account_id__ds_partitioned__extract_dayofweek AS account_id__ds_partitioned__extract_dayofweek
+            , subq_3.account_id__ds_partitioned__extract_dayofyear AS account_id__ds_partitioned__extract_dayofyear
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
             , subq_5.ds_partitioned__quarter AS customer_id__ds_partitioned__quarter
             , subq_5.ds_partitioned__year AS customer_id__ds_partitioned__year
+            , subq_5.ds_partitioned__extract_year AS customer_id__ds_partitioned__extract_year
+            , subq_5.ds_partitioned__extract_quarter AS customer_id__ds_partitioned__extract_quarter
+            , subq_5.ds_partitioned__extract_month AS customer_id__ds_partitioned__extract_month
+            , subq_5.ds_partitioned__extract_week AS customer_id__ds_partitioned__extract_week
+            , subq_5.ds_partitioned__extract_day AS customer_id__ds_partitioned__extract_day
+            , subq_5.ds_partitioned__extract_dayofweek AS customer_id__ds_partitioned__extract_dayofweek
+            , subq_5.ds_partitioned__extract_dayofyear AS customer_id__ds_partitioned__extract_dayofyear
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
@@ -132,12 +209,26 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
+              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -154,11 +245,25 @@ FROM (
             --    'ds_partitioned__month',
             --    'ds_partitioned__quarter',
             --    'ds_partitioned__year',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
+            --    'ds_partitioned__day',
             --    'customer_id__ds_partitioned__day',
             --    'customer_id__ds_partitioned__week',
             --    'customer_id__ds_partitioned__month',
             --    'customer_id__ds_partitioned__quarter',
             --    'customer_id__ds_partitioned__year',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__day',
             --    'customer_id']
             SELECT
               subq_4.ds_partitioned__day
@@ -166,11 +271,25 @@ FROM (
               , subq_4.ds_partitioned__month
               , subq_4.ds_partitioned__quarter
               , subq_4.ds_partitioned__year
+              , subq_4.ds_partitioned__extract_year
+              , subq_4.ds_partitioned__extract_quarter
+              , subq_4.ds_partitioned__extract_month
+              , subq_4.ds_partitioned__extract_week
+              , subq_4.ds_partitioned__extract_day
+              , subq_4.ds_partitioned__extract_dayofweek
+              , subq_4.ds_partitioned__extract_dayofyear
               , subq_4.customer_id__ds_partitioned__day
               , subq_4.customer_id__ds_partitioned__week
               , subq_4.customer_id__ds_partitioned__month
               , subq_4.customer_id__ds_partitioned__quarter
               , subq_4.customer_id__ds_partitioned__year
+              , subq_4.customer_id__ds_partitioned__extract_year
+              , subq_4.customer_id__ds_partitioned__extract_quarter
+              , subq_4.customer_id__ds_partitioned__extract_month
+              , subq_4.customer_id__ds_partitioned__extract_week
+              , subq_4.customer_id__ds_partitioned__extract_day
+              , subq_4.customer_id__ds_partitioned__extract_dayofweek
+              , subq_4.customer_id__ds_partitioned__extract_dayofyear
               , subq_4.customer_id
               , subq_4.customer_name
               , subq_4.customer_atomic_weight
@@ -186,6 +305,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofyear
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -193,6 +319,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__year
+                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
+                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
+                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
+                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
+                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofweek
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofyear
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
index 5c9089deaf..eb31a4fb3a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
@@ -23,31 +23,73 @@ FROM (
           , subq_1.ds__month
           , subq_1.ds__quarter
           , subq_1.ds__year
+          , subq_1.ds__extract_year
+          , subq_1.ds__extract_quarter
+          , subq_1.ds__extract_month
+          , subq_1.ds__extract_week
+          , subq_1.ds__extract_day
+          , subq_1.ds__extract_dayofweek
+          , subq_1.ds__extract_dayofyear
           , subq_1.ds_partitioned__day
           , subq_1.ds_partitioned__week
           , subq_1.ds_partitioned__month
           , subq_1.ds_partitioned__quarter
           , subq_1.ds_partitioned__year
+          , subq_1.ds_partitioned__extract_year
+          , subq_1.ds_partitioned__extract_quarter
+          , subq_1.ds_partitioned__extract_month
+          , subq_1.ds_partitioned__extract_week
+          , subq_1.ds_partitioned__extract_day
+          , subq_1.ds_partitioned__extract_dayofweek
+          , subq_1.ds_partitioned__extract_dayofyear
           , subq_1.paid_at__day
           , subq_1.paid_at__week
           , subq_1.paid_at__month
           , subq_1.paid_at__quarter
           , subq_1.paid_at__year
+          , subq_1.paid_at__extract_year
+          , subq_1.paid_at__extract_quarter
+          , subq_1.paid_at__extract_month
+          , subq_1.paid_at__extract_week
+          , subq_1.paid_at__extract_day
+          , subq_1.paid_at__extract_dayofweek
+          , subq_1.paid_at__extract_dayofyear
           , subq_1.booking__ds__day
           , subq_1.booking__ds__week
           , subq_1.booking__ds__month
           , subq_1.booking__ds__quarter
           , subq_1.booking__ds__year
+          , subq_1.booking__ds__extract_year
+          , subq_1.booking__ds__extract_quarter
+          , subq_1.booking__ds__extract_month
+          , subq_1.booking__ds__extract_week
+          , subq_1.booking__ds__extract_day
+          , subq_1.booking__ds__extract_dayofweek
+          , subq_1.booking__ds__extract_dayofyear
           , subq_1.booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month
           , subq_1.booking__ds_partitioned__quarter
           , subq_1.booking__ds_partitioned__year
+          , subq_1.booking__ds_partitioned__extract_year
+          , subq_1.booking__ds_partitioned__extract_quarter
+          , subq_1.booking__ds_partitioned__extract_month
+          , subq_1.booking__ds_partitioned__extract_week
+          , subq_1.booking__ds_partitioned__extract_day
+          , subq_1.booking__ds_partitioned__extract_dayofweek
+          , subq_1.booking__ds_partitioned__extract_dayofyear
           , subq_1.booking__paid_at__day
           , subq_1.booking__paid_at__week
           , subq_1.booking__paid_at__month
           , subq_1.booking__paid_at__quarter
           , subq_1.booking__paid_at__year
+          , subq_1.booking__paid_at__extract_year
+          , subq_1.booking__paid_at__extract_quarter
+          , subq_1.booking__paid_at__extract_month
+          , subq_1.booking__paid_at__extract_week
+          , subq_1.booking__paid_at__extract_day
+          , subq_1.booking__paid_at__extract_dayofweek
+          , subq_1.booking__paid_at__extract_dayofyear
           , subq_1.metric_time__day
           , subq_1.metric_time__week
           , subq_1.metric_time__month
@@ -82,31 +124,73 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
             , subq_0.paid_at__quarter
             , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dayofweek
+            , subq_0.paid_at__extract_dayofyear
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
             , subq_0.booking__ds__quarter
             , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dayofweek
+            , subq_0.booking__ds__extract_dayofyear
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
             , subq_0.booking__ds_partitioned__quarter
             , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dayofweek
+            , subq_0.booking__ds_partitioned__extract_dayofyear
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
             , subq_0.booking__paid_at__quarter
             , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dayofweek
+            , subq_0.booking__paid_at__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -156,32 +240,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -217,21 +343,49 @@ CROSS JOIN (
           , subq_7.ds__month
           , subq_7.ds__quarter
           , subq_7.ds__year
+          , subq_7.ds__extract_year
+          , subq_7.ds__extract_quarter
+          , subq_7.ds__extract_month
+          , subq_7.ds__extract_week
+          , subq_7.ds__extract_day
+          , subq_7.ds__extract_dayofweek
+          , subq_7.ds__extract_dayofyear
           , subq_7.created_at__day
           , subq_7.created_at__week
           , subq_7.created_at__month
           , subq_7.created_at__quarter
           , subq_7.created_at__year
+          , subq_7.created_at__extract_year
+          , subq_7.created_at__extract_quarter
+          , subq_7.created_at__extract_month
+          , subq_7.created_at__extract_week
+          , subq_7.created_at__extract_day
+          , subq_7.created_at__extract_dayofweek
+          , subq_7.created_at__extract_dayofyear
           , subq_7.listing__ds__day
           , subq_7.listing__ds__week
           , subq_7.listing__ds__month
           , subq_7.listing__ds__quarter
           , subq_7.listing__ds__year
+          , subq_7.listing__ds__extract_year
+          , subq_7.listing__ds__extract_quarter
+          , subq_7.listing__ds__extract_month
+          , subq_7.listing__ds__extract_week
+          , subq_7.listing__ds__extract_day
+          , subq_7.listing__ds__extract_dayofweek
+          , subq_7.listing__ds__extract_dayofyear
           , subq_7.listing__created_at__day
           , subq_7.listing__created_at__week
           , subq_7.listing__created_at__month
           , subq_7.listing__created_at__quarter
           , subq_7.listing__created_at__year
+          , subq_7.listing__created_at__extract_year
+          , subq_7.listing__created_at__extract_quarter
+          , subq_7.listing__created_at__extract_month
+          , subq_7.listing__created_at__extract_week
+          , subq_7.listing__created_at__extract_day
+          , subq_7.listing__created_at__extract_dayofweek
+          , subq_7.listing__created_at__extract_dayofyear
           , subq_7.metric_time__day
           , subq_7.metric_time__week
           , subq_7.metric_time__month
@@ -257,21 +411,49 @@ CROSS JOIN (
             , subq_6.ds__month
             , subq_6.ds__quarter
             , subq_6.ds__year
+            , subq_6.ds__extract_year
+            , subq_6.ds__extract_quarter
+            , subq_6.ds__extract_month
+            , subq_6.ds__extract_week
+            , subq_6.ds__extract_day
+            , subq_6.ds__extract_dayofweek
+            , subq_6.ds__extract_dayofyear
             , subq_6.created_at__day
             , subq_6.created_at__week
             , subq_6.created_at__month
             , subq_6.created_at__quarter
             , subq_6.created_at__year
+            , subq_6.created_at__extract_year
+            , subq_6.created_at__extract_quarter
+            , subq_6.created_at__extract_month
+            , subq_6.created_at__extract_week
+            , subq_6.created_at__extract_day
+            , subq_6.created_at__extract_dayofweek
+            , subq_6.created_at__extract_dayofyear
             , subq_6.listing__ds__day
             , subq_6.listing__ds__week
             , subq_6.listing__ds__month
             , subq_6.listing__ds__quarter
             , subq_6.listing__ds__year
+            , subq_6.listing__ds__extract_year
+            , subq_6.listing__ds__extract_quarter
+            , subq_6.listing__ds__extract_month
+            , subq_6.listing__ds__extract_week
+            , subq_6.listing__ds__extract_day
+            , subq_6.listing__ds__extract_dayofweek
+            , subq_6.listing__ds__extract_dayofyear
             , subq_6.listing__created_at__day
             , subq_6.listing__created_at__week
             , subq_6.listing__created_at__month
             , subq_6.listing__created_at__quarter
             , subq_6.listing__created_at__year
+            , subq_6.listing__created_at__extract_year
+            , subq_6.listing__created_at__extract_quarter
+            , subq_6.listing__created_at__extract_month
+            , subq_6.listing__created_at__extract_week
+            , subq_6.listing__created_at__extract_day
+            , subq_6.listing__created_at__extract_dayofweek
+            , subq_6.listing__created_at__extract_dayofyear
             , subq_6.ds__day AS metric_time__day
             , subq_6.ds__week AS metric_time__week
             , subq_6.ds__month AS metric_time__month
@@ -300,11 +482,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -313,11 +509,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql
index 14a9f0385a..dc0afd0f09 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql
@@ -44,31 +44,73 @@ FROM (
                 , subq_0.ds__month
                 , subq_0.ds__quarter
                 , subq_0.ds__year
+                , subq_0.ds__extract_year
+                , subq_0.ds__extract_quarter
+                , subq_0.ds__extract_month
+                , subq_0.ds__extract_week
+                , subq_0.ds__extract_day
+                , subq_0.ds__extract_dayofweek
+                , subq_0.ds__extract_dayofyear
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
                 , subq_0.ds_partitioned__quarter
                 , subq_0.ds_partitioned__year
+                , subq_0.ds_partitioned__extract_year
+                , subq_0.ds_partitioned__extract_quarter
+                , subq_0.ds_partitioned__extract_month
+                , subq_0.ds_partitioned__extract_week
+                , subq_0.ds_partitioned__extract_day
+                , subq_0.ds_partitioned__extract_dayofweek
+                , subq_0.ds_partitioned__extract_dayofyear
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
                 , subq_0.paid_at__quarter
                 , subq_0.paid_at__year
+                , subq_0.paid_at__extract_year
+                , subq_0.paid_at__extract_quarter
+                , subq_0.paid_at__extract_month
+                , subq_0.paid_at__extract_week
+                , subq_0.paid_at__extract_day
+                , subq_0.paid_at__extract_dayofweek
+                , subq_0.paid_at__extract_dayofyear
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
                 , subq_0.booking__ds__quarter
                 , subq_0.booking__ds__year
+                , subq_0.booking__ds__extract_year
+                , subq_0.booking__ds__extract_quarter
+                , subq_0.booking__ds__extract_month
+                , subq_0.booking__ds__extract_week
+                , subq_0.booking__ds__extract_day
+                , subq_0.booking__ds__extract_dayofweek
+                , subq_0.booking__ds__extract_dayofyear
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
                 , subq_0.booking__ds_partitioned__quarter
                 , subq_0.booking__ds_partitioned__year
+                , subq_0.booking__ds_partitioned__extract_year
+                , subq_0.booking__ds_partitioned__extract_quarter
+                , subq_0.booking__ds_partitioned__extract_month
+                , subq_0.booking__ds_partitioned__extract_week
+                , subq_0.booking__ds_partitioned__extract_day
+                , subq_0.booking__ds_partitioned__extract_dayofweek
+                , subq_0.booking__ds_partitioned__extract_dayofyear
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
                 , subq_0.booking__paid_at__quarter
                 , subq_0.booking__paid_at__year
+                , subq_0.booking__paid_at__extract_year
+                , subq_0.booking__paid_at__extract_quarter
+                , subq_0.booking__paid_at__extract_month
+                , subq_0.booking__paid_at__extract_week
+                , subq_0.booking__paid_at__extract_day
+                , subq_0.booking__paid_at__extract_dayofweek
+                , subq_0.booking__paid_at__extract_dayofyear
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -118,32 +160,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -182,31 +266,73 @@ FROM (
                 , subq_5.ds__month
                 , subq_5.ds__quarter
                 , subq_5.ds__year
+                , subq_5.ds__extract_year
+                , subq_5.ds__extract_quarter
+                , subq_5.ds__extract_month
+                , subq_5.ds__extract_week
+                , subq_5.ds__extract_day
+                , subq_5.ds__extract_dayofweek
+                , subq_5.ds__extract_dayofyear
                 , subq_5.ds_partitioned__day
                 , subq_5.ds_partitioned__week
                 , subq_5.ds_partitioned__month
                 , subq_5.ds_partitioned__quarter
                 , subq_5.ds_partitioned__year
+                , subq_5.ds_partitioned__extract_year
+                , subq_5.ds_partitioned__extract_quarter
+                , subq_5.ds_partitioned__extract_month
+                , subq_5.ds_partitioned__extract_week
+                , subq_5.ds_partitioned__extract_day
+                , subq_5.ds_partitioned__extract_dayofweek
+                , subq_5.ds_partitioned__extract_dayofyear
                 , subq_5.paid_at__day
                 , subq_5.paid_at__week
                 , subq_5.paid_at__month
                 , subq_5.paid_at__quarter
                 , subq_5.paid_at__year
+                , subq_5.paid_at__extract_year
+                , subq_5.paid_at__extract_quarter
+                , subq_5.paid_at__extract_month
+                , subq_5.paid_at__extract_week
+                , subq_5.paid_at__extract_day
+                , subq_5.paid_at__extract_dayofweek
+                , subq_5.paid_at__extract_dayofyear
                 , subq_5.booking__ds__day
                 , subq_5.booking__ds__week
                 , subq_5.booking__ds__month
                 , subq_5.booking__ds__quarter
                 , subq_5.booking__ds__year
+                , subq_5.booking__ds__extract_year
+                , subq_5.booking__ds__extract_quarter
+                , subq_5.booking__ds__extract_month
+                , subq_5.booking__ds__extract_week
+                , subq_5.booking__ds__extract_day
+                , subq_5.booking__ds__extract_dayofweek
+                , subq_5.booking__ds__extract_dayofyear
                 , subq_5.booking__ds_partitioned__day
                 , subq_5.booking__ds_partitioned__week
                 , subq_5.booking__ds_partitioned__month
                 , subq_5.booking__ds_partitioned__quarter
                 , subq_5.booking__ds_partitioned__year
+                , subq_5.booking__ds_partitioned__extract_year
+                , subq_5.booking__ds_partitioned__extract_quarter
+                , subq_5.booking__ds_partitioned__extract_month
+                , subq_5.booking__ds_partitioned__extract_week
+                , subq_5.booking__ds_partitioned__extract_day
+                , subq_5.booking__ds_partitioned__extract_dayofweek
+                , subq_5.booking__ds_partitioned__extract_dayofyear
                 , subq_5.booking__paid_at__day
                 , subq_5.booking__paid_at__week
                 , subq_5.booking__paid_at__month
                 , subq_5.booking__paid_at__quarter
                 , subq_5.booking__paid_at__year
+                , subq_5.booking__paid_at__extract_year
+                , subq_5.booking__paid_at__extract_quarter
+                , subq_5.booking__paid_at__extract_month
+                , subq_5.booking__paid_at__extract_week
+                , subq_5.booking__paid_at__extract_day
+                , subq_5.booking__paid_at__extract_dayofweek
+                , subq_5.booking__paid_at__extract_dayofyear
                 , subq_5.ds__day AS metric_time__day
                 , subq_5.ds__week AS metric_time__week
                 , subq_5.ds__month AS metric_time__month
@@ -256,32 +382,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -332,31 +500,73 @@ FROM (
             , subq_12.ds__month
             , subq_12.ds__quarter
             , subq_12.ds__year
+            , subq_12.ds__extract_year
+            , subq_12.ds__extract_quarter
+            , subq_12.ds__extract_month
+            , subq_12.ds__extract_week
+            , subq_12.ds__extract_day
+            , subq_12.ds__extract_dayofweek
+            , subq_12.ds__extract_dayofyear
             , subq_12.ds_partitioned__day
             , subq_12.ds_partitioned__week
             , subq_12.ds_partitioned__month
             , subq_12.ds_partitioned__quarter
             , subq_12.ds_partitioned__year
+            , subq_12.ds_partitioned__extract_year
+            , subq_12.ds_partitioned__extract_quarter
+            , subq_12.ds_partitioned__extract_month
+            , subq_12.ds_partitioned__extract_week
+            , subq_12.ds_partitioned__extract_day
+            , subq_12.ds_partitioned__extract_dayofweek
+            , subq_12.ds_partitioned__extract_dayofyear
             , subq_12.paid_at__day
             , subq_12.paid_at__week
             , subq_12.paid_at__month
             , subq_12.paid_at__quarter
             , subq_12.paid_at__year
+            , subq_12.paid_at__extract_year
+            , subq_12.paid_at__extract_quarter
+            , subq_12.paid_at__extract_month
+            , subq_12.paid_at__extract_week
+            , subq_12.paid_at__extract_day
+            , subq_12.paid_at__extract_dayofweek
+            , subq_12.paid_at__extract_dayofyear
             , subq_12.booking__ds__day
             , subq_12.booking__ds__week
             , subq_12.booking__ds__month
             , subq_12.booking__ds__quarter
             , subq_12.booking__ds__year
+            , subq_12.booking__ds__extract_year
+            , subq_12.booking__ds__extract_quarter
+            , subq_12.booking__ds__extract_month
+            , subq_12.booking__ds__extract_week
+            , subq_12.booking__ds__extract_day
+            , subq_12.booking__ds__extract_dayofweek
+            , subq_12.booking__ds__extract_dayofyear
             , subq_12.booking__ds_partitioned__day
             , subq_12.booking__ds_partitioned__week
             , subq_12.booking__ds_partitioned__month
             , subq_12.booking__ds_partitioned__quarter
             , subq_12.booking__ds_partitioned__year
+            , subq_12.booking__ds_partitioned__extract_year
+            , subq_12.booking__ds_partitioned__extract_quarter
+            , subq_12.booking__ds_partitioned__extract_month
+            , subq_12.booking__ds_partitioned__extract_week
+            , subq_12.booking__ds_partitioned__extract_day
+            , subq_12.booking__ds_partitioned__extract_dayofweek
+            , subq_12.booking__ds_partitioned__extract_dayofyear
             , subq_12.booking__paid_at__day
             , subq_12.booking__paid_at__week
             , subq_12.booking__paid_at__month
             , subq_12.booking__paid_at__quarter
             , subq_12.booking__paid_at__year
+            , subq_12.booking__paid_at__extract_year
+            , subq_12.booking__paid_at__extract_quarter
+            , subq_12.booking__paid_at__extract_month
+            , subq_12.booking__paid_at__extract_week
+            , subq_12.booking__paid_at__extract_day
+            , subq_12.booking__paid_at__extract_dayofweek
+            , subq_12.booking__paid_at__extract_dayofyear
             , subq_12.ds__day AS metric_time__day
             , subq_12.ds__week AS metric_time__week
             , subq_12.ds__month AS metric_time__month
@@ -406,32 +616,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -480,31 +732,73 @@ FROM (
             , subq_17.ds__month
             , subq_17.ds__quarter
             , subq_17.ds__year
+            , subq_17.ds__extract_year
+            , subq_17.ds__extract_quarter
+            , subq_17.ds__extract_month
+            , subq_17.ds__extract_week
+            , subq_17.ds__extract_day
+            , subq_17.ds__extract_dayofweek
+            , subq_17.ds__extract_dayofyear
             , subq_17.ds_partitioned__day
             , subq_17.ds_partitioned__week
             , subq_17.ds_partitioned__month
             , subq_17.ds_partitioned__quarter
             , subq_17.ds_partitioned__year
+            , subq_17.ds_partitioned__extract_year
+            , subq_17.ds_partitioned__extract_quarter
+            , subq_17.ds_partitioned__extract_month
+            , subq_17.ds_partitioned__extract_week
+            , subq_17.ds_partitioned__extract_day
+            , subq_17.ds_partitioned__extract_dayofweek
+            , subq_17.ds_partitioned__extract_dayofyear
             , subq_17.paid_at__day
             , subq_17.paid_at__week
             , subq_17.paid_at__month
             , subq_17.paid_at__quarter
             , subq_17.paid_at__year
+            , subq_17.paid_at__extract_year
+            , subq_17.paid_at__extract_quarter
+            , subq_17.paid_at__extract_month
+            , subq_17.paid_at__extract_week
+            , subq_17.paid_at__extract_day
+            , subq_17.paid_at__extract_dayofweek
+            , subq_17.paid_at__extract_dayofyear
             , subq_17.booking__ds__day
             , subq_17.booking__ds__week
             , subq_17.booking__ds__month
             , subq_17.booking__ds__quarter
             , subq_17.booking__ds__year
+            , subq_17.booking__ds__extract_year
+            , subq_17.booking__ds__extract_quarter
+            , subq_17.booking__ds__extract_month
+            , subq_17.booking__ds__extract_week
+            , subq_17.booking__ds__extract_day
+            , subq_17.booking__ds__extract_dayofweek
+            , subq_17.booking__ds__extract_dayofyear
             , subq_17.booking__ds_partitioned__day
             , subq_17.booking__ds_partitioned__week
             , subq_17.booking__ds_partitioned__month
             , subq_17.booking__ds_partitioned__quarter
             , subq_17.booking__ds_partitioned__year
+            , subq_17.booking__ds_partitioned__extract_year
+            , subq_17.booking__ds_partitioned__extract_quarter
+            , subq_17.booking__ds_partitioned__extract_month
+            , subq_17.booking__ds_partitioned__extract_week
+            , subq_17.booking__ds_partitioned__extract_day
+            , subq_17.booking__ds_partitioned__extract_dayofweek
+            , subq_17.booking__ds_partitioned__extract_dayofyear
             , subq_17.booking__paid_at__day
             , subq_17.booking__paid_at__week
             , subq_17.booking__paid_at__month
             , subq_17.booking__paid_at__quarter
             , subq_17.booking__paid_at__year
+            , subq_17.booking__paid_at__extract_year
+            , subq_17.booking__paid_at__extract_quarter
+            , subq_17.booking__paid_at__extract_month
+            , subq_17.booking__paid_at__extract_week
+            , subq_17.booking__paid_at__extract_day
+            , subq_17.booking__paid_at__extract_dayofweek
+            , subq_17.booking__paid_at__extract_dayofyear
             , subq_17.ds__day AS metric_time__day
             , subq_17.ds__week AS metric_time__week
             , subq_17.ds__month AS metric_time__month
@@ -554,32 +848,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql
index be96decab5..63116a5458 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql
@@ -45,32 +45,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql
index a5288e7009..a53f3a075b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql
@@ -36,21 +36,49 @@ FROM (
             , subq_0.ds__month
             , subq_0.ds__quarter
             , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dayofweek
+            , subq_0.ds__extract_dayofyear
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
             , subq_0.ds_partitioned__quarter
             , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dayofweek
+            , subq_0.ds_partitioned__extract_dayofyear
             , subq_0.verification__ds__day
             , subq_0.verification__ds__week
             , subq_0.verification__ds__month
             , subq_0.verification__ds__quarter
             , subq_0.verification__ds__year
+            , subq_0.verification__ds__extract_year
+            , subq_0.verification__ds__extract_quarter
+            , subq_0.verification__ds__extract_month
+            , subq_0.verification__ds__extract_week
+            , subq_0.verification__ds__extract_day
+            , subq_0.verification__ds__extract_dayofweek
+            , subq_0.verification__ds__extract_dayofyear
             , subq_0.verification__ds_partitioned__day
             , subq_0.verification__ds_partitioned__week
             , subq_0.verification__ds_partitioned__month
             , subq_0.verification__ds_partitioned__quarter
             , subq_0.verification__ds_partitioned__year
+            , subq_0.verification__ds_partitioned__extract_year
+            , subq_0.verification__ds_partitioned__extract_quarter
+            , subq_0.verification__ds_partitioned__extract_month
+            , subq_0.verification__ds_partitioned__extract_week
+            , subq_0.verification__ds_partitioned__extract_day
+            , subq_0.verification__ds_partitioned__extract_dayofweek
+            , subq_0.verification__ds_partitioned__extract_dayofyear
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -71,22 +99,50 @@ FROM (
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
+              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -110,32 +166,74 @@ FROM (
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS ds__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_dayofyear
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS created_at__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofyear
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds) AS user__ds__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS user__ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS user__ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS user__ds__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofyear
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS user__created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS user__created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS user__created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS user__created_at__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofyear
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__year
+            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofyear
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql
index c65a58a300..d88d2d32f3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -54,12 +82,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql
index 603dac8609..094486f462 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql
index adfa1c3f03..a8a26c9899 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -55,12 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index 48a1b43de5..c400372dd4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 08a913aa57..30ab4c1851 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_0.ds__month AS ds__month
   , subq_0.ds__quarter AS ds__quarter
   , subq_0.ds__year AS ds__year
+  , subq_0.ds__extract_year AS ds__extract_year
+  , subq_0.ds__extract_quarter AS ds__extract_quarter
+  , subq_0.ds__extract_month AS ds__extract_month
+  , subq_0.ds__extract_week AS ds__extract_week
+  , subq_0.ds__extract_day AS ds__extract_day
+  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
   , subq_0.account__ds__quarter AS account__ds__quarter
   , subq_0.account__ds__year AS account__ds__year
+  , subq_0.account__ds__extract_year AS account__ds__extract_year
+  , subq_0.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_0.account__ds__extract_month AS account__ds__extract_month
+  , subq_0.account__ds__extract_week AS account__ds__extract_week
+  , subq_0.account__ds__extract_day AS account__ds__extract_day
+  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -55,12 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
+      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index ed796b148d..ef337f422c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -5,11 +5,25 @@ SELECT
   , subq_3.ds__month AS ds__month
   , subq_3.ds__quarter AS ds__quarter
   , subq_3.ds__year AS ds__year
+  , subq_3.ds__extract_year AS ds__extract_year
+  , subq_3.ds__extract_quarter AS ds__extract_quarter
+  , subq_3.ds__extract_month AS ds__extract_month
+  , subq_3.ds__extract_week AS ds__extract_week
+  , subq_3.ds__extract_day AS ds__extract_day
+  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
+  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
   , subq_3.account__ds__quarter AS account__ds__quarter
   , subq_3.account__ds__year AS account__ds__year
+  , subq_3.account__ds__extract_year AS account__ds__extract_year
+  , subq_3.account__ds__extract_quarter AS account__ds__extract_quarter
+  , subq_3.account__ds__extract_month AS account__ds__extract_month
+  , subq_3.account__ds__extract_week AS account__ds__extract_week
+  , subq_3.account__ds__extract_day AS account__ds__extract_day
+  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
+  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -28,12 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
+    , EXTRACT(YEAR FROM ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS ds__extract_week
+    , EXTRACT(DAY FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
+    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
+    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
+    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql
index 782ccc2826..16b897731d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql
@@ -31,32 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -83,11 +125,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -96,11 +152,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
+      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql
index 0f449eb59e..7dd5c3b39d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql
@@ -20,32 +20,74 @@ SELECT
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql
index ee19129508..e240956212 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql
@@ -20,32 +20,74 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml
index f6e315621f..c0830e210b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml
@@ -31,11 +31,11 @@
             <!-- node_id = ss_10 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
             <!-- where = None -->
@@ -44,7 +44,7 @@
                 <!-- node_id = ss_9 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -53,7 +53,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -63,11 +63,11 @@
                     <!-- node_id = ss_8 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                     <!-- where = None -->
@@ -76,227 +76,395 @@
                         <!-- node_id = ss_7 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                        <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                        <!--    'column_alias': 'ds_partitioned__week'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                        <!--    'column_alias': 'ds_partitioned__month'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                        <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                        <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                        <!--    'column_alias': 'ds_partitioned__year'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                        <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                        <!--    'column_alias': 'paid_at__day'}                        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                        <!--    'column_alias': 'paid_at__week'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                        <!--    'column_alias': 'paid_at__month'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                        <!--    'column_alias': 'paid_at__quarter'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                        <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                        <!--    'column_alias': 'paid_at__year'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                        <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                        <!--    'column_alias': 'booking__ds__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                        <!--    'column_alias': 'booking__ds__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                        <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                        <!--    'column_alias': 'booking__ds__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                        <!--    'column_alias': 'booking__ds__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                        <!--    'column_alias': 'booking__ds__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                        <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                        <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                        <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                        <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                        <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                        <!--    'column_alias': 'listing'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                        <!--    'column_alias': 'guest'}                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                        <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                        <!--    'column_alias': 'host'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                        <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                        <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                        <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                        <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                        <!--    'column_alias': 'bookings'}                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                        <!--    'column_alias': 'bookers'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                         <!-- col50 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                         <!-- col51 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                         <!-- col52 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!-- col53 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col54 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col55 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col56 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col57 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col58 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col59 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col60 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!-- col61 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!-- col62 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!-- col63 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!-- col64 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!-- col65 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                        <!-- col66 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                        <!-- col67 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                        <!-- col68 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                        <!-- col69 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                        <!-- col70 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col71 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col72 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!-- col73 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!-- col74 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!-- col75 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!-- col76 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!-- col77 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                        <!--    'column_alias': 'listing'}                             -->
+                        <!-- col78 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                        <!--    'column_alias': 'guest'}                               -->
+                        <!-- col79 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                        <!--    'column_alias': 'host'}                                -->
+                        <!-- col80 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!-- col81 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!-- col82 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!-- col83 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!-- col84 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!-- col85 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                        <!--    'column_alias': 'bookings'}                            -->
+                        <!-- col86 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!-- col87 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!-- col88 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!-- col89 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!-- col90 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                        <!--    'column_alias': 'bookers'}                             -->
+                        <!-- col91 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!-- col92 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!-- col93 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!-- col94 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                         <!--    'column_alias': 'booking_value_p99'}                   -->
-                        <!-- col53 =                                                   -->
+                        <!-- col95 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                        <!-- col54 =                                                         -->
+                        <!-- col96 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col55 =                                                       -->
+                        <!-- col97 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
@@ -313,27 +481,27 @@
                             <!--    'column_alias': 'instant_bookings'}                                                              -->
                             <!-- col2 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                             <!--    'column_alias': 'booking_value'}                         -->
                             <!-- col3 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                             <!--    'column_alias': 'max_booking_value'}                     -->
                             <!-- col4 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                             <!--    'column_alias': 'min_booking_value'}                     -->
                             <!-- col5 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                             <!--    'column_alias': 'bookers'}                               -->
                             <!-- col6 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                             <!--    'column_alias': 'average_booking_value'}                 -->
                             <!-- col7 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                             <!--    'column_alias': 'booking_payments'}                      -->
                             <!-- col8 =                                                                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -341,31 +509,31 @@
                             <!--    'column_alias': 'referred_bookings'}                                                                          -->
                             <!-- col9 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                             <!--    'column_alias': 'median_booking_value'}                  -->
                             <!-- col10 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                             <!--    'column_alias': 'booking_value_p99'}                     -->
                             <!-- col11 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                             <!-- col12 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col13 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- col14 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                             <!--    'column_alias': 'is_instant'}                            -->
                             <!-- col15 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                             <!--    'column_alias': 'ds__day'}                               -->
                             <!-- col16 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -383,133 +551,301 @@
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                             <!--    'column_alias': 'ds__year'}                        -->
-                            <!-- col20 =                                                     -->
+                            <!-- col20 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                            <!--    'column_alias': 'ds__extract_year'}              -->
+                            <!-- col21 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}           -->
+                            <!-- col22 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                            <!--    'column_alias': 'ds__extract_month'}             -->
+                            <!-- col23 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                            <!--    'column_alias': 'ds__extract_week'}              -->
+                            <!-- col24 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                            <!--    'column_alias': 'ds__extract_day'}               -->
+                            <!-- col25 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!-- col26 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                            <!-- col21 =                                               -->
+                            <!-- col28 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}            -->
-                            <!-- col22 =                                               -->
+                            <!-- col29 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}           -->
-                            <!-- col23 =                                               -->
+                            <!-- col30 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                            <!-- col24 =                                               -->
+                            <!-- col31 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}            -->
-                            <!-- col25 =                                                     -->
+                            <!-- col32 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                            <!-- col33 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                            <!-- col34 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                            <!-- col35 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                            <!-- col36 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                            <!-- col37 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col38 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                             <!--    'column_alias': 'paid_at__day'}                          -->
-                            <!-- col26 =                                               -->
+                            <!-- col40 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                             <!--    'column_alias': 'paid_at__week'}                   -->
-                            <!-- col27 =                                               -->
+                            <!-- col41 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                             <!--    'column_alias': 'paid_at__month'}                  -->
-                            <!-- col28 =                                               -->
+                            <!-- col42 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                -->
-                            <!-- col29 =                                               -->
+                            <!-- col43 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                             <!--    'column_alias': 'paid_at__year'}                   -->
-                            <!-- col30 =                                                     -->
+                            <!-- col44 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}         -->
+                            <!-- col45 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                            <!-- col46 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}        -->
+                            <!-- col47 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}         -->
+                            <!-- col48 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}          -->
+                            <!-- col49 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!-- col50 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                             <!--    'column_alias': 'booking__is_instant'}                   -->
-                            <!-- col31 =                                                     -->
+                            <!-- col52 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                             <!--    'column_alias': 'booking__ds__day'}                      -->
-                            <!-- col32 =                                               -->
+                            <!-- col53 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                             <!--    'column_alias': 'booking__ds__week'}               -->
-                            <!-- col33 =                                               -->
+                            <!-- col54 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                             <!--    'column_alias': 'booking__ds__month'}              -->
-                            <!-- col34 =                                               -->
+                            <!-- col55 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}            -->
-                            <!-- col35 =                                               -->
+                            <!-- col56 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                             <!--    'column_alias': 'booking__ds__year'}               -->
-                            <!-- col36 =                                                     -->
+                            <!-- col57 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                            <!-- col58 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                            <!-- col59 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                            <!-- col60 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                            <!-- col61 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                            <!-- col62 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                            <!-- col63 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                            <!-- col37 =                                               -->
+                            <!-- col65 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                            <!-- col38 =                                               -->
+                            <!-- col66 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                            <!-- col39 =                                                 -->
+                            <!-- col67 =                                                 -->
                             <!--   {'class': 'SqlSelectColumn',                          -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                            <!-- col40 =                                               -->
+                            <!-- col68 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                            <!-- col41 =                                                     -->
+                            <!-- col69 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col70 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col71 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col72 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col73 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col74 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col75 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                            <!-- col42 =                                               -->
+                            <!-- col77 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}          -->
-                            <!-- col43 =                                               -->
+                            <!-- col78 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}         -->
-                            <!-- col44 =                                               -->
+                            <!-- col79 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                            <!-- col45 =                                               -->
+                            <!-- col80 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}          -->
-                            <!-- col46 =                                                     -->
+                            <!-- col81 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                            <!-- col82 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                            <!-- col83 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                            <!-- col84 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                            <!-- col85 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                            <!-- col86 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col87 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                             <!--    'column_alias': 'listing'}                               -->
-                            <!-- col47 =                                                     -->
+                            <!-- col89 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                             <!--    'column_alias': 'guest'}                                 -->
-                            <!-- col48 =                                                     -->
+                            <!-- col90 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                             <!--    'column_alias': 'host'}                                  -->
-                            <!-- col49 =                                                     -->
+                            <!-- col91 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                             <!--    'column_alias': 'booking__listing'}                      -->
-                            <!-- col50 =                                                     -->
+                            <!-- col92 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                             <!--    'column_alias': 'booking__guest'}                        -->
-                            <!-- col51 =                                                     -->
+                            <!-- col93 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
@@ -528,11 +864,11 @@
             <!-- node_id = ss_14 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
             <!--    'column_alias': 'booking_value'}                       -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
             <!-- where = None -->
@@ -541,7 +877,7 @@
                 <!-- node_id = ss_13 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -550,7 +886,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -560,11 +896,11 @@
                     <!-- node_id = ss_12 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_357),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                     <!--    'column_alias': 'booking_value'}                       -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                     <!-- where = None -->
@@ -573,227 +909,395 @@
                         <!-- node_id = ss_11 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                        <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                        <!--    'column_alias': 'ds_partitioned__week'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                        <!--    'column_alias': 'ds_partitioned__month'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                        <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                        <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                        <!--    'column_alias': 'ds_partitioned__year'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                        <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                        <!--    'column_alias': 'paid_at__day'}                        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                        <!--    'column_alias': 'paid_at__week'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                        <!--    'column_alias': 'paid_at__month'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                        <!--    'column_alias': 'paid_at__quarter'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                        <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                        <!--    'column_alias': 'paid_at__year'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                        <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                        <!--    'column_alias': 'booking__ds__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                        <!--    'column_alias': 'booking__ds__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                        <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                        <!--    'column_alias': 'booking__ds__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                        <!--    'column_alias': 'booking__ds__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
-                        <!--    'column_alias': 'booking__ds__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                        <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
-                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                        <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
-                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                        <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
-                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                        <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
-                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                        <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
-                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
-                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
-                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
-                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
-                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
-                        <!--    'column_alias': 'listing'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
-                        <!--    'column_alias': 'guest'}                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                        <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
-                        <!--    'column_alias': 'host'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                        <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                        <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                        <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                        <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                        <!--    'column_alias': 'bookings'}                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                        <!--    'column_alias': 'bookers'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                         <!-- col50 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
-                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                         <!-- col51 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
-                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                         <!-- col52 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!-- col53 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col54 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col55 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col56 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col57 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col58 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col59 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col60 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!-- col61 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!-- col62 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!-- col63 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!-- col64 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!-- col65 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                        <!-- col66 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                        <!-- col67 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                        <!-- col68 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                        <!-- col69 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                        <!-- col70 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col71 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col72 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!-- col73 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!-- col74 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!-- col75 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!-- col76 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!-- col77 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                        <!--    'column_alias': 'listing'}                             -->
+                        <!-- col78 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
+                        <!--    'column_alias': 'guest'}                               -->
+                        <!-- col79 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                        <!--    'column_alias': 'host'}                                -->
+                        <!-- col80 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!-- col81 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!-- col82 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!-- col83 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!-- col84 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!-- col85 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                        <!--    'column_alias': 'bookings'}                            -->
+                        <!-- col86 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!-- col87 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!-- col88 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!-- col89 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!-- col90 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                        <!--    'column_alias': 'bookers'}                             -->
+                        <!-- col91 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!-- col92 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!-- col93 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!-- col94 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                         <!--    'column_alias': 'booking_value_p99'}                   -->
-                        <!-- col53 =                                                   -->
+                        <!-- col95 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                        <!-- col54 =                                                         -->
+                        <!-- col96 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col55 =                                                       -->
+                        <!-- col97 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
@@ -810,27 +1314,27 @@
                             <!--    'column_alias': 'instant_bookings'}                                                              -->
                             <!-- col2 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                             <!--    'column_alias': 'booking_value'}                         -->
                             <!-- col3 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                             <!--    'column_alias': 'max_booking_value'}                     -->
                             <!-- col4 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                             <!--    'column_alias': 'min_booking_value'}                     -->
                             <!-- col5 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                             <!--    'column_alias': 'bookers'}                               -->
                             <!-- col6 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                             <!--    'column_alias': 'average_booking_value'}                 -->
                             <!-- col7 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                             <!--    'column_alias': 'booking_payments'}                      -->
                             <!-- col8 =                                                                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -838,31 +1342,31 @@
                             <!--    'column_alias': 'referred_bookings'}                                                                          -->
                             <!-- col9 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                             <!--    'column_alias': 'median_booking_value'}                  -->
                             <!-- col10 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                             <!--    'column_alias': 'booking_value_p99'}                     -->
                             <!-- col11 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                             <!-- col12 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col13 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- col14 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                             <!--    'column_alias': 'is_instant'}                            -->
                             <!-- col15 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                             <!--    'column_alias': 'ds__day'}                               -->
                             <!-- col16 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -880,133 +1384,301 @@
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                             <!--    'column_alias': 'ds__year'}                        -->
-                            <!-- col20 =                                                     -->
+                            <!-- col20 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                            <!--    'column_alias': 'ds__extract_year'}              -->
+                            <!-- col21 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}           -->
+                            <!-- col22 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                            <!--    'column_alias': 'ds__extract_month'}             -->
+                            <!-- col23 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                            <!--    'column_alias': 'ds__extract_week'}              -->
+                            <!-- col24 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                            <!--    'column_alias': 'ds__extract_day'}               -->
+                            <!-- col25 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!-- col26 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                            <!-- col21 =                                               -->
+                            <!-- col28 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}            -->
-                            <!-- col22 =                                               -->
+                            <!-- col29 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}           -->
-                            <!-- col23 =                                               -->
+                            <!-- col30 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                            <!-- col24 =                                               -->
+                            <!-- col31 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}            -->
-                            <!-- col25 =                                                     -->
+                            <!-- col32 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                            <!-- col33 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                            <!-- col34 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                            <!-- col35 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                            <!-- col36 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                            <!-- col37 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col38 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                             <!--    'column_alias': 'paid_at__day'}                          -->
-                            <!-- col26 =                                               -->
+                            <!-- col40 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                             <!--    'column_alias': 'paid_at__week'}                   -->
-                            <!-- col27 =                                               -->
+                            <!-- col41 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                             <!--    'column_alias': 'paid_at__month'}                  -->
-                            <!-- col28 =                                               -->
+                            <!-- col42 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                -->
-                            <!-- col29 =                                               -->
+                            <!-- col43 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                             <!--    'column_alias': 'paid_at__year'}                   -->
-                            <!-- col30 =                                                     -->
+                            <!-- col44 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}         -->
+                            <!-- col45 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                            <!-- col46 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}        -->
+                            <!-- col47 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}         -->
+                            <!-- col48 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}          -->
+                            <!-- col49 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!-- col50 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                             <!--    'column_alias': 'booking__is_instant'}                   -->
-                            <!-- col31 =                                                     -->
+                            <!-- col52 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                             <!--    'column_alias': 'booking__ds__day'}                      -->
-                            <!-- col32 =                                               -->
+                            <!-- col53 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                             <!--    'column_alias': 'booking__ds__week'}               -->
-                            <!-- col33 =                                               -->
+                            <!-- col54 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                             <!--    'column_alias': 'booking__ds__month'}              -->
-                            <!-- col34 =                                               -->
+                            <!-- col55 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}            -->
-                            <!-- col35 =                                               -->
+                            <!-- col56 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                             <!--    'column_alias': 'booking__ds__year'}               -->
-                            <!-- col36 =                                                     -->
+                            <!-- col57 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                            <!-- col58 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                            <!-- col59 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                            <!-- col60 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                            <!-- col61 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                            <!-- col62 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                            <!-- col63 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                            <!-- col37 =                                               -->
+                            <!-- col65 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                            <!-- col38 =                                               -->
+                            <!-- col66 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                            <!-- col39 =                                                 -->
+                            <!-- col67 =                                                 -->
                             <!--   {'class': 'SqlSelectColumn',                          -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                            <!-- col40 =                                               -->
+                            <!-- col68 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                            <!-- col41 =                                                     -->
+                            <!-- col69 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col70 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col71 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col72 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col73 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col74 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col75 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                            <!-- col42 =                                               -->
+                            <!-- col77 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}          -->
-                            <!-- col43 =                                               -->
+                            <!-- col78 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}         -->
-                            <!-- col44 =                                               -->
+                            <!-- col79 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                            <!-- col45 =                                               -->
+                            <!-- col80 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}          -->
-                            <!-- col46 =                                                     -->
+                            <!-- col81 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                            <!-- col82 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                            <!-- col83 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                            <!-- col84 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                            <!-- col85 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                            <!-- col86 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col87 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                             <!--    'column_alias': 'listing'}                               -->
-                            <!-- col47 =                                                     -->
+                            <!-- col89 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                             <!--    'column_alias': 'guest'}                                 -->
-                            <!-- col48 =                                                     -->
+                            <!-- col90 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                             <!--    'column_alias': 'host'}                                  -->
-                            <!-- col49 =                                                     -->
+                            <!-- col91 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                             <!--    'column_alias': 'booking__listing'}                      -->
-                            <!-- col50 =                                                     -->
+                            <!-- col92 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                             <!--    'column_alias': 'booking__guest'}                        -->
-                            <!-- col51 =                                                     -->
+                            <!-- col93 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml
index 7a5de1b9b7..34419b3c74 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml
@@ -92,27 +92,27 @@
                         <!--    'column_alias': 'instant_bookings'}                                                              -->
                         <!-- col2 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                         <!--    'column_alias': 'booking_value'}                         -->
                         <!-- col3 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                         <!--    'column_alias': 'max_booking_value'}                     -->
                         <!-- col4 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                         <!--    'column_alias': 'min_booking_value'}                     -->
                         <!-- col5 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                         <!--    'column_alias': 'bookers'}                               -->
                         <!-- col6 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                         <!--    'column_alias': 'average_booking_value'}                 -->
                         <!-- col7 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                         <!--    'column_alias': 'booking_payments'}                      -->
                         <!-- col8 =                                                                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -120,31 +120,31 @@
                         <!--    'column_alias': 'referred_bookings'}                                                                          -->
                         <!-- col9 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                         <!--    'column_alias': 'median_booking_value'}                  -->
                         <!-- col10 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                         <!--    'column_alias': 'booking_value_p99'}                     -->
                         <!-- col11 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                         <!-- col12 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                         <!-- col13 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- col14 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                         <!--    'column_alias': 'is_instant'}                            -->
                         <!-- col15 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                         <!--    'column_alias': 'ds__day'}                               -->
                         <!-- col16 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -162,133 +162,301 @@
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                         <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col20 =                                                     -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col25 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!-- col26 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                        <!-- col21 =                                               -->
+                        <!-- col28 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                         <!--    'column_alias': 'ds_partitioned__week'}            -->
-                        <!-- col22 =                                               -->
+                        <!-- col29 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                         <!--    'column_alias': 'ds_partitioned__month'}           -->
-                        <!-- col23 =                                               -->
+                        <!-- col30 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                        <!-- col24 =                                               -->
+                        <!-- col31 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                         <!--    'column_alias': 'ds_partitioned__year'}            -->
-                        <!-- col25 =                                                     -->
+                        <!-- col32 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                        <!-- col33 =                                                -->
+                        <!--   {'class': 'SqlSelectColumn',                         -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                        <!-- col34 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                        <!-- col35 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                        <!-- col36 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                        <!-- col37 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col38 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col39 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                         <!--    'column_alias': 'paid_at__day'}                          -->
-                        <!-- col26 =                                               -->
+                        <!-- col40 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                         <!--    'column_alias': 'paid_at__week'}                   -->
-                        <!-- col27 =                                               -->
+                        <!-- col41 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                         <!--    'column_alias': 'paid_at__month'}                  -->
-                        <!-- col28 =                                               -->
+                        <!-- col42 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                         <!--    'column_alias': 'paid_at__quarter'}                -->
-                        <!-- col29 =                                               -->
+                        <!-- col43 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                         <!--    'column_alias': 'paid_at__year'}                   -->
-                        <!-- col30 =                                                     -->
+                        <!-- col44 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}         -->
+                        <!-- col45 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                        <!-- col46 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}        -->
+                        <!-- col47 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}         -->
+                        <!-- col48 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}          -->
+                        <!-- col49 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                        <!-- col50 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                        <!-- col51 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                         <!--    'column_alias': 'booking__is_instant'}                   -->
-                        <!-- col31 =                                                     -->
+                        <!-- col52 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                         <!--    'column_alias': 'booking__ds__day'}                      -->
-                        <!-- col32 =                                               -->
+                        <!-- col53 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                         <!--    'column_alias': 'booking__ds__week'}               -->
-                        <!-- col33 =                                               -->
+                        <!-- col54 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                         <!--    'column_alias': 'booking__ds__month'}              -->
-                        <!-- col34 =                                               -->
+                        <!-- col55 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                         <!--    'column_alias': 'booking__ds__quarter'}            -->
-                        <!-- col35 =                                               -->
+                        <!-- col56 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                         <!--    'column_alias': 'booking__ds__year'}               -->
-                        <!-- col36 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                        <!-- col57 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                        <!-- col58 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                        <!-- col59 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                        <!-- col60 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                        <!-- col61 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                        <!-- col62 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                        <!-- col63 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                        <!-- col64 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                        <!-- col37 =                                               -->
+                        <!-- col65 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                        <!-- col38 =                                               -->
+                        <!-- col66 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                        <!-- col39 =                                                 -->
+                        <!-- col67 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                        <!-- col40 =                                               -->
+                        <!-- col68 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                        <!-- col41 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                        <!-- col69 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col70 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col71 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col72 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col73 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col74 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col75 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col76 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                         <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                        <!-- col42 =                                               -->
+                        <!-- col77 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                         <!--    'column_alias': 'booking__paid_at__week'}          -->
-                        <!-- col43 =                                               -->
+                        <!-- col78 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                         <!--    'column_alias': 'booking__paid_at__month'}         -->
-                        <!-- col44 =                                               -->
+                        <!-- col79 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                         <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                        <!-- col45 =                                               -->
+                        <!-- col80 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                         <!--    'column_alias': 'booking__paid_at__year'}          -->
-                        <!-- col46 =                                                     -->
+                        <!-- col81 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                        <!-- col82 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                        <!-- col83 =                                                -->
+                        <!--   {'class': 'SqlSelectColumn',                         -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                        <!-- col84 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                        <!-- col85 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                        <!-- col86 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col87 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col88 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                         <!--    'column_alias': 'listing'}                               -->
-                        <!-- col47 =                                                     -->
+                        <!-- col89 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                         <!--    'column_alias': 'guest'}                                 -->
-                        <!-- col48 =                                                     -->
+                        <!-- col90 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                         <!--    'column_alias': 'host'}                                  -->
-                        <!-- col49 =                                                     -->
+                        <!-- col91 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                         <!--    'column_alias': 'booking__listing'}                      -->
-                        <!-- col50 =                                                     -->
+                        <!-- col92 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                         <!--    'column_alias': 'booking__guest'}                        -->
-                        <!-- col51 =                                                     -->
+                        <!-- col93 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                         <!--    'column_alias': 'booking__host'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                         <!-- where = None -->
@@ -323,15 +491,15 @@
                         <!--    'column_alias': 'listings'}                                 -->
                         <!-- col1 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                         <!--    'column_alias': 'largest_listing'}                       -->
                         <!-- col2 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                         <!--    'column_alias': 'smallest_listing'}                      -->
                         <!-- col3 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                         <!--    'column_alias': 'ds__day'}                               -->
                         <!-- col4 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -349,101 +517,213 @@
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                         <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col8 =                                                      -->
+                        <!-- col8 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col9 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col10 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col11 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col12 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col13 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!-- col14 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!-- col15 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                         <!--    'column_alias': 'created_at__day'}                       -->
-                        <!-- col9 =                                                -->
+                        <!-- col16 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                         <!--    'column_alias': 'created_at__week'}                -->
-                        <!-- col10 =                                               -->
+                        <!-- col17 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                         <!--    'column_alias': 'created_at__month'}               -->
-                        <!-- col11 =                                               -->
+                        <!-- col18 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                         <!--    'column_alias': 'created_at__quarter'}             -->
-                        <!-- col12 =                                               -->
+                        <!-- col19 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                         <!--    'column_alias': 'created_at__year'}                -->
-                        <!-- col13 =                                                     -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                        <!--    'column_alias': 'created_at__extract_year'}      -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                        <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                        <!--    'column_alias': 'created_at__extract_month'}     -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                        <!--    'column_alias': 'created_at__extract_week'}      -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                        <!--    'column_alias': 'created_at__extract_day'}       -->
+                        <!-- col25 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                        <!-- col26 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                        <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                         <!--    'column_alias': 'country_latest'}                        -->
-                        <!-- col14 =                                                     -->
+                        <!-- col28 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                         <!--    'column_alias': 'is_lux_latest'}                         -->
-                        <!-- col15 =                                                     -->
+                        <!-- col29 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                         <!--    'column_alias': 'capacity_latest'}                       -->
-                        <!-- col16 =                                                     -->
+                        <!-- col30 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                         <!--    'column_alias': 'listing__ds__day'}                      -->
-                        <!-- col17 =                                               -->
+                        <!-- col31 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                         <!--    'column_alias': 'listing__ds__week'}               -->
-                        <!-- col18 =                                               -->
+                        <!-- col32 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                         <!--    'column_alias': 'listing__ds__month'}              -->
-                        <!-- col19 =                                               -->
+                        <!-- col33 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                         <!--    'column_alias': 'listing__ds__quarter'}            -->
-                        <!-- col20 =                                               -->
+                        <!-- col34 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                         <!--    'column_alias': 'listing__ds__year'}               -->
-                        <!-- col21 =                                                     -->
+                        <!-- col35 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                        <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                        <!-- col36 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                        <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                        <!-- col37 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                        <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                        <!-- col38 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                        <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                        <!-- col39 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                        <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                        <!-- col40 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                        <!-- col41 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                        <!-- col42 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                         <!--    'column_alias': 'listing__created_at__day'}              -->
-                        <!-- col22 =                                               -->
+                        <!-- col43 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                         <!--    'column_alias': 'listing__created_at__week'}       -->
-                        <!-- col23 =                                               -->
+                        <!-- col44 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                         <!--    'column_alias': 'listing__created_at__month'}      -->
-                        <!-- col24 =                                               -->
+                        <!-- col45 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                         <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                        <!-- col25 =                                               -->
+                        <!-- col46 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                         <!--    'column_alias': 'listing__created_at__year'}       -->
-                        <!-- col26 =                                                     -->
+                        <!-- col47 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                        <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                        <!-- col48 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                        <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                        <!-- col49 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                        <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                        <!-- col50 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                        <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                        <!-- col51 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                        <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                        <!-- col52 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                        <!-- col53 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                        <!-- col54 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                         <!--    'column_alias': 'listing__country_latest'}               -->
-                        <!-- col27 =                                                     -->
+                        <!-- col55 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                         <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                        <!-- col28 =                                                     -->
+                        <!-- col56 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                         <!--    'column_alias': 'listing__capacity_latest'}              -->
-                        <!-- col29 =                                                     -->
+                        <!-- col57 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                         <!--    'column_alias': 'listing'}                               -->
-                        <!-- col30 =                                                     -->
+                        <!-- col58 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                         <!--    'column_alias': 'user'}                                  -->
-                        <!-- col31 =                                                     -->
+                        <!-- col59 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                         <!--    'column_alias': 'listing__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
index fc211e9645..9315fdef74 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_24 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
         <!--    'column_alias': 'ds__day'}                             -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
         <!--    'column_alias': 'listing__country_latest'}             -->
         <!-- col2 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
@@ -29,11 +29,11 @@
             <!--    'column_alias': 'listing__country_latest'}                                     -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- col3 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
             <!--    'column_alias': 'views'}                               -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
             <!-- join_0 =                                                   -->
@@ -48,15 +48,15 @@
                 <!-- node_id = ss_14 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                 <!--    'column_alias': 'ds__day'}                             -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                 <!--    'column_alias': 'listing__country_latest'}             -->
                 <!-- col2 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
@@ -65,11 +65,11 @@
                     <!-- node_id = ss_13 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- col2 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -78,11 +78,11 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- group_by1 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -92,15 +92,15 @@
                         <!-- node_id = ss_12 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                         <!--    'column_alias': 'listing__country_latest'}             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
@@ -109,19 +109,19 @@
                             <!-- node_id = ss_11 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                             <!--    'column_alias': 'listing__country_latest'}             -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- join_0 =                                                    -->
@@ -138,15 +138,15 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
@@ -155,227 +155,395 @@
                                     <!-- node_id = ss_7 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                                    <!--    'column_alias': 'paid_at__day'}                        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                                    <!--    'column_alias': 'paid_at__week'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                                    <!--    'column_alias': 'paid_at__month'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                                    <!--    'column_alias': 'paid_at__year'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                                    <!--    'column_alias': 'booking__ds__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                                    <!--    'column_alias': 'booking__ds__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                                    <!--    'column_alias': 'booking__ds__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                                    <!--    'column_alias': 'booking__ds__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                    <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                    <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                    <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                    <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!-- col53 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col54 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col55 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col56 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col57 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col58 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col59 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col60 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!-- col61 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!-- col62 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!-- col63 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!-- col64 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!-- col65 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                    <!-- col66 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                    <!-- col67 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                    <!-- col68 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                    <!-- col69 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                    <!-- col70 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col71 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col72 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!-- col73 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!-- col74 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!-- col75 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!-- col76 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!-- col77 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!-- col78 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!-- col79 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                                    <!--    'column_alias': 'host'}                                -->
+                                    <!-- col80 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!-- col81 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!-- col82 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!-- col83 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!-- col84 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!-- col85 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!-- col86 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!-- col87 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!-- col88 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!-- col89 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!-- col90 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col91 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!-- col92 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!-- col93 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!-- col94 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                   -->
-                                    <!-- col53 =                                                   -->
+                                    <!-- col95 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                    <!-- col54 =                                                         -->
+                                    <!-- col96 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                    <!-- col55 =                                                       -->
+                                    <!-- col97 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
@@ -392,27 +560,27 @@
                                         <!--    'column_alias': 'instant_bookings'}                                                              -->
                                         <!-- col2 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                         <!--    'column_alias': 'booking_value'}                         -->
                                         <!-- col3 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                         <!--    'column_alias': 'max_booking_value'}                     -->
                                         <!-- col4 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                         <!--    'column_alias': 'min_booking_value'}                     -->
                                         <!-- col5 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                         <!--    'column_alias': 'bookers'}                               -->
                                         <!-- col6 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                         <!--    'column_alias': 'average_booking_value'}                 -->
                                         <!-- col7 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                         <!--    'column_alias': 'booking_payments'}                      -->
                                         <!-- col8 =                                                                                                           -->
                                         <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -420,31 +588,31 @@
                                         <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                         <!-- col9 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                         <!--    'column_alias': 'median_booking_value'}                  -->
                                         <!-- col10 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                         <!--    'column_alias': 'booking_value_p99'}                     -->
                                         <!-- col11 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                         <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                         <!-- col12 =                                                         -->
                                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                         <!-- col13 =                                                       -->
                                         <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                         <!-- col14 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                         <!--    'column_alias': 'is_instant'}                            -->
                                         <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                         <!--    'column_alias': 'ds__day'}                               -->
                                         <!-- col16 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -462,133 +630,301 @@
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                         <!--    'column_alias': 'ds__year'}                        -->
-                                        <!-- col20 =                                                     -->
+                                        <!-- col20 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                        <!--    'column_alias': 'ds__extract_year'}              -->
+                                        <!-- col21 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                        <!-- col22 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                        <!--    'column_alias': 'ds__extract_month'}             -->
+                                        <!-- col23 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                        <!--    'column_alias': 'ds__extract_week'}              -->
+                                        <!-- col24 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                        <!--    'column_alias': 'ds__extract_day'}               -->
+                                        <!-- col25 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!-- col26 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                         <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                        <!-- col21 =                                               -->
+                                        <!-- col28 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                         <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                        <!-- col22 =                                               -->
+                                        <!-- col29 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                         <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                        <!-- col23 =                                               -->
+                                        <!-- col30 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                        <!-- col24 =                                               -->
+                                        <!-- col31 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                         <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                        <!-- col25 =                                                     -->
+                                        <!-- col32 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                        <!-- col33 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                        <!-- col34 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                        <!-- col35 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                        <!-- col36 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                        <!-- col37 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col38 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col39 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                         <!--    'column_alias': 'paid_at__day'}                          -->
-                                        <!-- col26 =                                               -->
+                                        <!-- col40 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                         <!--    'column_alias': 'paid_at__week'}                   -->
-                                        <!-- col27 =                                               -->
+                                        <!-- col41 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                         <!--    'column_alias': 'paid_at__month'}                  -->
-                                        <!-- col28 =                                               -->
+                                        <!-- col42 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                         <!--    'column_alias': 'paid_at__quarter'}                -->
-                                        <!-- col29 =                                               -->
+                                        <!-- col43 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                         <!--    'column_alias': 'paid_at__year'}                   -->
-                                        <!-- col30 =                                                     -->
+                                        <!-- col44 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                        <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                        <!-- col45 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                        <!-- col46 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                        <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                        <!-- col47 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                        <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                        <!-- col48 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                        <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                        <!-- col49 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!-- col50 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!-- col51 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                         <!--    'column_alias': 'booking__is_instant'}                   -->
-                                        <!-- col31 =                                                     -->
+                                        <!-- col52 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                         <!--    'column_alias': 'booking__ds__day'}                      -->
-                                        <!-- col32 =                                               -->
+                                        <!-- col53 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                         <!--    'column_alias': 'booking__ds__week'}               -->
-                                        <!-- col33 =                                               -->
+                                        <!-- col54 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                         <!--    'column_alias': 'booking__ds__month'}              -->
-                                        <!-- col34 =                                               -->
+                                        <!-- col55 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                         <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                        <!-- col35 =                                               -->
+                                        <!-- col56 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                         <!--    'column_alias': 'booking__ds__year'}               -->
-                                        <!-- col36 =                                                     -->
+                                        <!-- col57 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                        <!-- col58 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                        <!-- col59 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                        <!-- col60 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                        <!-- col61 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                        <!-- col62 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                        <!-- col63 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col64 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                        <!-- col37 =                                               -->
+                                        <!-- col65 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                        <!-- col38 =                                               -->
+                                        <!-- col66 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                        <!-- col39 =                                                 -->
+                                        <!-- col67 =                                                 -->
                                         <!--   {'class': 'SqlSelectColumn',                          -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                        <!-- col40 =                                               -->
+                                        <!-- col68 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                        <!-- col41 =                                                     -->
+                                        <!-- col69 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                        <!-- col70 =                                                         -->
+                                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                        <!-- col71 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                        <!-- col72 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                        <!-- col73 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                        <!-- col74 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col75 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col76 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                         <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                        <!-- col42 =                                               -->
+                                        <!-- col77 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                         <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                        <!-- col43 =                                               -->
+                                        <!-- col78 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                         <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                        <!-- col44 =                                               -->
+                                        <!-- col79 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                         <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                        <!-- col45 =                                               -->
+                                        <!-- col80 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                         <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                        <!-- col46 =                                                     -->
+                                        <!-- col81 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                        <!-- col82 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                        <!-- col83 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                        <!-- col84 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                        <!-- col85 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                        <!-- col86 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                        <!-- col87 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col88 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                         <!--    'column_alias': 'listing'}                               -->
-                                        <!-- col47 =                                                     -->
+                                        <!-- col89 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                         <!--    'column_alias': 'guest'}                                 -->
-                                        <!-- col48 =                                                     -->
+                                        <!-- col90 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                         <!--    'column_alias': 'host'}                                  -->
-                                        <!-- col49 =                                                     -->
+                                        <!-- col91 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                         <!--    'column_alias': 'booking__listing'}                      -->
-                                        <!-- col50 =                                                     -->
+                                        <!-- col92 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                         <!--    'column_alias': 'booking__guest'}                        -->
-                                        <!-- col51 =                                                     -->
+                                        <!-- col93 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                         <!--    'column_alias': 'booking__host'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                         <!-- where = None -->
@@ -607,11 +943,11 @@
                                 <!-- node_id = ss_10 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                                 <!--    'column_alias': 'country_latest'}                      -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                                 <!-- where = None -->
@@ -620,284 +956,508 @@
                                     <!-- node_id = ss_9 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
-                                    <!--    'column_alias': 'created_at__day'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
-                                    <!--    'column_alias': 'created_at__week'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                                    <!--    'column_alias': 'created_at__month'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                                    <!--    'column_alias': 'created_at__quarter'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
-                                    <!--    'column_alias': 'created_at__year'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
-                                    <!--    'column_alias': 'listing__ds__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
-                                    <!--    'column_alias': 'listing__ds__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
-                                    <!--    'column_alias': 'listing__ds__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                                    <!--    'column_alias': 'created_at__day'}                     -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
-                                    <!--    'column_alias': 'listing__ds__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                                    <!--    'column_alias': 'created_at__week'}                    -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                                    <!--    'column_alias': 'listing__ds__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                    <!--    'column_alias': 'created_at__month'}                   -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                                    <!--    'column_alias': 'listing__created_at__day'}            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                    <!--    'column_alias': 'created_at__quarter'}                 -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                                    <!--    'column_alias': 'listing__created_at__week'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                    <!--    'column_alias': 'created_at__year'}                    -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                                    <!--    'column_alias': 'listing__created_at__month'}          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                    <!--    'column_alias': 'created_at__extract_year'}            -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                                    <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                    <!--    'column_alias': 'created_at__extract_quarter'}         -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                                    <!--    'column_alias': 'listing__created_at__year'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                    <!--    'column_alias': 'created_at__extract_month'}           -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                    <!--    'column_alias': 'created_at__extract_week'}            -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                    <!--    'column_alias': 'created_at__extract_day'}             -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                    <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                    <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                    <!--    'column_alias': 'listing__ds__day'}                    -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                    <!--    'column_alias': 'listing__ds__week'}                   -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                                    <!--    'column_alias': 'user'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                    <!--    'column_alias': 'listing__ds__month'}                  -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                                    <!--    'column_alias': 'listing__user'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                    <!--    'column_alias': 'listing__ds__quarter'}                -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                                    <!--    'column_alias': 'country_latest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                    <!--    'column_alias': 'listing__ds__year'}                   -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_year'}           -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_month'}          -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_week'}           -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_day'}            -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
-                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
-                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
-                                    <!--    'column_alias': 'smallest_listing'}                    -->
-                                    <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
-                                    <!-- where = None -->
-                                    <SqlSelectStatementNode>
-                                        <!-- description = Read Elements From Semantic Model 'listings_latest' -->
-                                        <!-- node_id = ss_10004 -->
-                                        <!-- col0 =                                                         -->
-                                        <!--   {'class': 'SqlSelectColumn',                                 -->
-                                        <!--    'expr': SqlStringExpression(node_id=str_10004 sql_expr=1),  -->
-                                        <!--    'column_alias': 'listings'}                                 -->
-                                        <!-- col1 =                                                      -->
-                                        <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
-                                        <!--    'column_alias': 'largest_listing'}                       -->
-                                        <!-- col2 =                                                      -->
-                                        <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
-                                        <!--    'column_alias': 'smallest_listing'}                      -->
-                                        <!-- col3 =                                                      -->
-                                        <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
-                                        <!--    'column_alias': 'ds__day'}                               -->
-                                        <!-- col4 =                                                -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10048),  -->
-                                        <!--    'column_alias': 'ds__week'}                        -->
-                                        <!-- col5 =                                                -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10049),  -->
-                                        <!--    'column_alias': 'ds__month'}                       -->
-                                        <!-- col6 =                                                -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10050),  -->
-                                        <!--    'column_alias': 'ds__quarter'}                     -->
-                                        <!-- col7 =                                                -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                    <!--    'column_alias': 'listing__created_at__day'}            -->
+                                    <!-- col37 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                    <!--    'column_alias': 'listing__created_at__week'}           -->
+                                    <!-- col38 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                    <!--    'column_alias': 'listing__created_at__month'}          -->
+                                    <!-- col39 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                    <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                                    <!-- col40 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                    <!--    'column_alias': 'listing__created_at__year'}           -->
+                                    <!-- col41 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_year'}   -->
+                                    <!-- col42 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),    -->
+                                    <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                    <!-- col43 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                    <!-- col44 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_week'}   -->
+                                    <!-- col45 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_day'}    -->
+                                    <!-- col46 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),      -->
+                                    <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                    <!-- col47 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),      -->
+                                    <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                    <!-- col48 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!-- col49 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!-- col50 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!-- col51 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!-- col52 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!-- col53 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!-- col54 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                    <!--    'column_alias': 'user'}                                -->
+                                    <!-- col55 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                    <!--    'column_alias': 'listing__user'}                       -->
+                                    <!-- col56 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                                    <!--    'column_alias': 'country_latest'}                      -->
+                                    <!-- col57 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!-- col58 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!-- col59 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!-- col60 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!-- col61 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!-- col62 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!-- col63 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!-- col64 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                                    <!--    'column_alias': 'smallest_listing'}                    -->
+                                    <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
+                                    <!-- where = None -->
+                                    <SqlSelectStatementNode>
+                                        <!-- description = Read Elements From Semantic Model 'listings_latest' -->
+                                        <!-- node_id = ss_10004 -->
+                                        <!-- col0 =                                                         -->
+                                        <!--   {'class': 'SqlSelectColumn',                                 -->
+                                        <!--    'expr': SqlStringExpression(node_id=str_10004 sql_expr=1),  -->
+                                        <!--    'column_alias': 'listings'}                                 -->
+                                        <!-- col1 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                        <!--    'column_alias': 'largest_listing'}                       -->
+                                        <!-- col2 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
+                                        <!--    'column_alias': 'smallest_listing'}                      -->
+                                        <!-- col3 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
+                                        <!--    'column_alias': 'ds__day'}                               -->
+                                        <!-- col4 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10048),  -->
+                                        <!--    'column_alias': 'ds__week'}                        -->
+                                        <!-- col5 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10049),  -->
+                                        <!--    'column_alias': 'ds__month'}                       -->
+                                        <!-- col6 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10050),  -->
+                                        <!--    'column_alias': 'ds__quarter'}                     -->
+                                        <!-- col7 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                                         <!--    'column_alias': 'ds__year'}                        -->
-                                        <!-- col8 =                                                      -->
+                                        <!-- col8 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                                        <!--    'column_alias': 'ds__extract_year'}              -->
+                                        <!-- col9 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                        <!-- col10 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                                        <!--    'column_alias': 'ds__extract_month'}             -->
+                                        <!-- col11 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                                        <!--    'column_alias': 'ds__extract_week'}              -->
+                                        <!-- col12 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                                        <!--    'column_alias': 'ds__extract_day'}               -->
+                                        <!-- col13 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!-- col14 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                                         <!--    'column_alias': 'created_at__day'}                       -->
-                                        <!-- col9 =                                                -->
+                                        <!-- col16 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                                         <!--    'column_alias': 'created_at__week'}                -->
-                                        <!-- col10 =                                               -->
+                                        <!-- col17 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                                         <!--    'column_alias': 'created_at__month'}               -->
-                                        <!-- col11 =                                               -->
+                                        <!-- col18 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                                         <!--    'column_alias': 'created_at__quarter'}             -->
-                                        <!-- col12 =                                               -->
+                                        <!-- col19 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                                         <!--    'column_alias': 'created_at__year'}                -->
-                                        <!-- col13 =                                                     -->
+                                        <!-- col20 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                                        <!--    'column_alias': 'created_at__extract_year'}      -->
+                                        <!-- col21 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                                        <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                                        <!-- col22 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                                        <!--    'column_alias': 'created_at__extract_month'}     -->
+                                        <!-- col23 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                                        <!--    'column_alias': 'created_at__extract_week'}      -->
+                                        <!-- col24 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                                        <!--    'column_alias': 'created_at__extract_day'}       -->
+                                        <!-- col25 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                                        <!-- col26 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                        <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                                         <!--    'column_alias': 'country_latest'}                        -->
-                                        <!-- col14 =                                                     -->
+                                        <!-- col28 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                                         <!--    'column_alias': 'is_lux_latest'}                         -->
-                                        <!-- col15 =                                                     -->
+                                        <!-- col29 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                                         <!--    'column_alias': 'capacity_latest'}                       -->
-                                        <!-- col16 =                                                     -->
+                                        <!-- col30 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                                         <!--    'column_alias': 'listing__ds__day'}                      -->
-                                        <!-- col17 =                                               -->
+                                        <!-- col31 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                                         <!--    'column_alias': 'listing__ds__week'}               -->
-                                        <!-- col18 =                                               -->
+                                        <!-- col32 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                                         <!--    'column_alias': 'listing__ds__month'}              -->
-                                        <!-- col19 =                                               -->
+                                        <!-- col33 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                                         <!--    'column_alias': 'listing__ds__quarter'}            -->
-                                        <!-- col20 =                                               -->
+                                        <!-- col34 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                                         <!--    'column_alias': 'listing__ds__year'}               -->
-                                        <!-- col21 =                                                     -->
+                                        <!-- col35 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                                        <!-- col36 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                                        <!-- col37 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                                        <!-- col38 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                                        <!-- col39 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                                        <!-- col40 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                                        <!-- col41 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                        <!-- col42 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                                         <!--    'column_alias': 'listing__created_at__day'}              -->
-                                        <!-- col22 =                                               -->
+                                        <!-- col43 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                                         <!--    'column_alias': 'listing__created_at__week'}       -->
-                                        <!-- col23 =                                               -->
+                                        <!-- col44 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                                         <!--    'column_alias': 'listing__created_at__month'}      -->
-                                        <!-- col24 =                                               -->
+                                        <!-- col45 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                                         <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                                        <!-- col25 =                                               -->
+                                        <!-- col46 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                                         <!--    'column_alias': 'listing__created_at__year'}       -->
-                                        <!-- col26 =                                                     -->
+                                        <!-- col47 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                                        <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                                        <!-- col48 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                                        <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                        <!-- col49 =                                                   -->
+                                        <!--   {'class': 'SqlSelectColumn',                            -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                                        <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                        <!-- col50 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                                        <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                                        <!-- col51 =                                                 -->
+                                        <!--   {'class': 'SqlSelectColumn',                          -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                                        <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                                        <!-- col52 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                        <!-- col53 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                        <!-- col54 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                                         <!--    'column_alias': 'listing__country_latest'}               -->
-                                        <!-- col27 =                                                     -->
+                                        <!-- col55 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                                         <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                                        <!-- col28 =                                                     -->
+                                        <!-- col56 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                                         <!--    'column_alias': 'listing__capacity_latest'}              -->
-                                        <!-- col29 =                                                     -->
+                                        <!-- col57 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                                         <!--    'column_alias': 'listing'}                               -->
-                                        <!-- col30 =                                                     -->
+                                        <!-- col58 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                                         <!--    'column_alias': 'user'}                                  -->
-                                        <!-- col31 =                                                     -->
+                                        <!-- col59 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                                         <!--    'column_alias': 'listing__user'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                         <!-- where = None -->
@@ -918,15 +1478,15 @@
                 <!-- node_id = ss_22 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
                 <!--    'column_alias': 'ds__day'}                             -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
                 <!--    'column_alias': 'listing__country_latest'}             -->
                 <!-- col2 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
                 <!--    'column_alias': 'views'}                               -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_21) -->
                 <!-- where = None -->
@@ -935,11 +1495,11 @@
                     <!-- node_id = ss_21 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_433),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- col2 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -948,11 +1508,11 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_20) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- group_by1 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_433),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -962,15 +1522,15 @@
                         <!-- node_id = ss_20 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_431),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_430),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
                         <!--    'column_alias': 'listing__country_latest'}             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_429),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
                         <!--    'column_alias': 'views'}                               -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
                         <!-- where = None -->
@@ -979,19 +1539,19 @@
                             <!-- node_id = ss_19 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_426),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_427),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_428),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                             <!--    'column_alias': 'listing__country_latest'}             -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_425),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
                             <!--    'column_alias': 'views'}                               -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
                             <!-- join_0 =                                                    -->
@@ -1008,15 +1568,15 @@
                                 <!-- node_id = ss_16 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                                 <!--    'column_alias': 'views'}                               -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                                 <!-- where = None -->
@@ -1025,123 +1585,235 @@
                                     <!-- node_id = ss_15 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_357),  -->
-                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_358),  -->
-                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
-                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
-                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
-                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_362),  -->
-                                    <!--    'column_alias': 'view__ds__day'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_363),  -->
-                                    <!--    'column_alias': 'view__ds__week'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
-                                    <!--    'column_alias': 'view__ds__month'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
-                                    <!--    'column_alias': 'view__ds__quarter'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
+                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),  -->
-                                    <!--    'column_alias': 'view__ds__year'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_367),  -->
-                                    <!--    'column_alias': 'view__ds_partitioned__day'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),  -->
-                                    <!--    'column_alias': 'view__ds_partitioned__week'}          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_369),  -->
-                                    <!--    'column_alias': 'view__ds_partitioned__month'}         -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),  -->
-                                    <!--    'column_alias': 'view__ds_partitioned__quarter'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),  -->
-                                    <!--    'column_alias': 'view__ds_partitioned__year'}          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_372),  -->
-                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_373),  -->
-                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
-                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_375),  -->
-                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_376),  -->
-                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                                    <!--    'column_alias': 'view__ds__day'}                       -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_377),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                                    <!--    'column_alias': 'view__ds__week'}                      -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_378),  -->
-                                    <!--    'column_alias': 'user'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                                    <!--    'column_alias': 'view__ds__month'}                     -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_379),  -->
-                                    <!--    'column_alias': 'view__listing'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                                    <!--    'column_alias': 'view__ds__quarter'}                   -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),  -->
-                                    <!--    'column_alias': 'view__user'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                                    <!--    'column_alias': 'view__ds__year'}                      -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                                    <!--    'column_alias': 'view__ds__extract_year'}              -->
+                                    <!-- col30 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                                    <!--    'column_alias': 'view__ds__extract_quarter'}           -->
+                                    <!-- col31 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
+                                    <!--    'column_alias': 'view__ds__extract_month'}             -->
+                                    <!-- col32 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
+                                    <!--    'column_alias': 'view__ds__extract_week'}              -->
+                                    <!-- col33 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
+                                    <!--    'column_alias': 'view__ds__extract_day'}               -->
+                                    <!-- col34 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                                    <!--    'column_alias': 'view__ds__extract_dayofweek'}         -->
+                                    <!-- col35 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                                    <!--    'column_alias': 'view__ds__extract_dayofyear'}         -->
+                                    <!-- col36 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                                    <!--    'column_alias': 'view__ds_partitioned__day'}           -->
+                                    <!-- col37 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                                    <!--    'column_alias': 'view__ds_partitioned__week'}          -->
+                                    <!-- col38 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                                    <!--    'column_alias': 'view__ds_partitioned__month'}         -->
+                                    <!-- col39 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                                    <!--    'column_alias': 'view__ds_partitioned__quarter'}       -->
+                                    <!-- col40 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                                    <!--    'column_alias': 'view__ds_partitioned__year'}          -->
+                                    <!-- col41 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                                    <!--    'column_alias': 'view__ds_partitioned__extract_year'}  -->
+                                    <!-- col42 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),     -->
+                                    <!--    'column_alias': 'view__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col43 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),   -->
+                                    <!--    'column_alias': 'view__ds_partitioned__extract_month'}  -->
+                                    <!-- col44 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                                    <!--    'column_alias': 'view__ds_partitioned__extract_week'}  -->
+                                    <!-- col45 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                                    <!--    'column_alias': 'view__ds_partitioned__extract_day'}   -->
+                                    <!-- col46 =                                                        -->
+                                    <!--   {'class': 'SqlSelectColumn',                                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),       -->
+                                    <!--    'column_alias': 'view__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col47 =                                                        -->
+                                    <!--   {'class': 'SqlSelectColumn',                                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),       -->
+                                    <!--    'column_alias': 'view__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col48 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!-- col49 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!-- col50 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!-- col51 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!-- col52 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!-- col53 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!-- col54 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                                    <!--    'column_alias': 'user'}                                -->
+                                    <!-- col55 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                                    <!--    'column_alias': 'view__listing'}                       -->
+                                    <!-- col56 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                                    <!--    'column_alias': 'view__user'}                          -->
+                                    <!-- col57 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                                     <!--    'column_alias': 'views'}                               -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10009) -->
                                     <!-- where = None -->
@@ -1154,7 +1826,7 @@
                                         <!--    'column_alias': 'views'}                                    -->
                                         <!-- col1 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10191),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10087),  -->
                                         <!--    'column_alias': 'ds__day'}                               -->
                                         <!-- col2 =                                                -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -1172,81 +1844,193 @@
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10107),  -->
                                         <!--    'column_alias': 'ds__year'}                        -->
-                                        <!-- col6 =                                                      -->
+                                        <!-- col6 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10182),  -->
+                                        <!--    'column_alias': 'ds__extract_year'}              -->
+                                        <!-- col7 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10183),  -->
+                                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                        <!-- col8 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10184),  -->
+                                        <!--    'column_alias': 'ds__extract_month'}             -->
+                                        <!-- col9 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10185),  -->
+                                        <!--    'column_alias': 'ds__extract_week'}              -->
+                                        <!-- col10 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10186),  -->
+                                        <!--    'column_alias': 'ds__extract_day'}               -->
+                                        <!-- col11 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10187),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!-- col12 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10188),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!-- col13 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10196),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10088),  -->
                                         <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                        <!-- col7 =                                                -->
+                                        <!-- col14 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10108),  -->
                                         <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                        <!-- col8 =                                                -->
+                                        <!-- col15 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10109),  -->
                                         <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                        <!-- col9 =                                                -->
+                                        <!-- col16 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10110),  -->
                                         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                        <!-- col10 =                                               -->
+                                        <!-- col17 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10111),  -->
                                         <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                        <!-- col11 =                                                     -->
+                                        <!-- col18 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10189),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                        <!-- col19 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10190),     -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                        <!-- col20 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10191),   -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                        <!-- col21 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10192),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                        <!-- col22 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10193),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                        <!-- col23 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10194),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col24 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10195),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col25 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10201),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10089),  -->
                                         <!--    'column_alias': 'view__ds__day'}                         -->
-                                        <!-- col12 =                                               -->
+                                        <!-- col26 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10112),  -->
                                         <!--    'column_alias': 'view__ds__week'}                  -->
-                                        <!-- col13 =                                               -->
+                                        <!-- col27 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10113),  -->
                                         <!--    'column_alias': 'view__ds__month'}                 -->
-                                        <!-- col14 =                                               -->
+                                        <!-- col28 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10114),  -->
                                         <!--    'column_alias': 'view__ds__quarter'}               -->
-                                        <!-- col15 =                                               -->
+                                        <!-- col29 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10115),  -->
                                         <!--    'column_alias': 'view__ds__year'}                  -->
-                                        <!-- col16 =                                                     -->
+                                        <!-- col30 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10196),  -->
+                                        <!--    'column_alias': 'view__ds__extract_year'}        -->
+                                        <!-- col31 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10197),  -->
+                                        <!--    'column_alias': 'view__ds__extract_quarter'}     -->
+                                        <!-- col32 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10198),  -->
+                                        <!--    'column_alias': 'view__ds__extract_month'}       -->
+                                        <!-- col33 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10199),  -->
+                                        <!--    'column_alias': 'view__ds__extract_week'}        -->
+                                        <!-- col34 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10200),  -->
+                                        <!--    'column_alias': 'view__ds__extract_day'}         -->
+                                        <!-- col35 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10201),  -->
+                                        <!--    'column_alias': 'view__ds__extract_dayofweek'}   -->
+                                        <!-- col36 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10202),  -->
+                                        <!--    'column_alias': 'view__ds__extract_dayofyear'}   -->
+                                        <!-- col37 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10206),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10090),  -->
                                         <!--    'column_alias': 'view__ds_partitioned__day'}             -->
-                                        <!-- col17 =                                               -->
+                                        <!-- col38 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10116),  -->
                                         <!--    'column_alias': 'view__ds_partitioned__week'}      -->
-                                        <!-- col18 =                                               -->
+                                        <!-- col39 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10117),  -->
                                         <!--    'column_alias': 'view__ds_partitioned__month'}     -->
-                                        <!-- col19 =                                               -->
+                                        <!-- col40 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10118),  -->
                                         <!--    'column_alias': 'view__ds_partitioned__quarter'}   -->
-                                        <!-- col20 =                                               -->
+                                        <!-- col41 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10119),  -->
                                         <!--    'column_alias': 'view__ds_partitioned__year'}      -->
-                                        <!-- col21 =                                                     -->
+                                        <!-- col42 =                                                   -->
+                                        <!--   {'class': 'SqlSelectColumn',                            -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10203),        -->
+                                        <!--    'column_alias': 'view__ds_partitioned__extract_year'}  -->
+                                        <!-- col43 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10204),           -->
+                                        <!--    'column_alias': 'view__ds_partitioned__extract_quarter'}  -->
+                                        <!-- col44 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10205),         -->
+                                        <!--    'column_alias': 'view__ds_partitioned__extract_month'}  -->
+                                        <!-- col45 =                                                   -->
+                                        <!--   {'class': 'SqlSelectColumn',                            -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10206),        -->
+                                        <!--    'column_alias': 'view__ds_partitioned__extract_week'}  -->
+                                        <!-- col46 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10207),       -->
+                                        <!--    'column_alias': 'view__ds_partitioned__extract_day'}  -->
+                                        <!-- col47 =                                                        -->
+                                        <!--   {'class': 'SqlSelectColumn',                                 -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10208),             -->
+                                        <!--    'column_alias': 'view__ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col48 =                                                        -->
+                                        <!--   {'class': 'SqlSelectColumn',                                 -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10209),             -->
+                                        <!--    'column_alias': 'view__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col49 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10211),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10091),  -->
                                         <!--    'column_alias': 'listing'}                               -->
-                                        <!-- col22 =                                                     -->
+                                        <!-- col50 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10212),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10092),  -->
                                         <!--    'column_alias': 'user'}                                  -->
-                                        <!-- col23 =                                                     -->
+                                        <!-- col51 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10213),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10093),  -->
                                         <!--    'column_alias': 'view__listing'}                         -->
-                                        <!-- col24 =                                                     -->
+                                        <!-- col52 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10214),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10094),  -->
                                         <!--    'column_alias': 'view__user'}                            -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10009) -->
                                         <!-- where = None -->
@@ -1265,11 +2049,11 @@
                                 <!-- node_id = ss_18 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_422),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_421),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
                                 <!--    'column_alias': 'country_latest'}                      -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                                 <!-- where = None -->
@@ -1278,151 +2062,263 @@
                                     <!-- node_id = ss_17 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
-                                    <!--    'column_alias': 'created_at__day'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),  -->
-                                    <!--    'column_alias': 'created_at__week'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),  -->
-                                    <!--    'column_alias': 'created_at__month'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),  -->
-                                    <!--    'column_alias': 'created_at__quarter'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),  -->
-                                    <!--    'column_alias': 'created_at__year'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),  -->
-                                    <!--    'column_alias': 'listing__ds__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),  -->
-                                    <!--    'column_alias': 'listing__ds__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),  -->
-                                    <!--    'column_alias': 'listing__ds__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                                    <!--    'column_alias': 'created_at__day'}                     -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
-                                    <!--    'column_alias': 'listing__ds__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                                    <!--    'column_alias': 'created_at__week'}                    -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_407),  -->
-                                    <!--    'column_alias': 'listing__ds__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                                    <!--    'column_alias': 'created_at__month'}                   -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_408),  -->
-                                    <!--    'column_alias': 'listing__created_at__day'}            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                                    <!--    'column_alias': 'created_at__quarter'}                 -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),  -->
-                                    <!--    'column_alias': 'listing__created_at__week'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                                    <!--    'column_alias': 'created_at__year'}                    -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_410),  -->
-                                    <!--    'column_alias': 'listing__created_at__month'}          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                                    <!--    'column_alias': 'created_at__extract_year'}            -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
-                                    <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                                    <!--    'column_alias': 'created_at__extract_quarter'}         -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_412),  -->
-                                    <!--    'column_alias': 'listing__created_at__year'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
+                                    <!--    'column_alias': 'created_at__extract_month'}           -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_413),  -->
-                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
+                                    <!--    'column_alias': 'created_at__extract_week'}            -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
-                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
+                                    <!--    'column_alias': 'created_at__extract_day'}             -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
-                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
+                                    <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_416),  -->
-                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
+                                    <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_417),  -->
-                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
+                                    <!--    'column_alias': 'listing__ds__day'}                    -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_418),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
+                                    <!--    'column_alias': 'listing__ds__week'}                   -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_419),  -->
-                                    <!--    'column_alias': 'user'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
+                                    <!--    'column_alias': 'listing__ds__month'}                  -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_420),  -->
-                                    <!--    'column_alias': 'listing__user'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                                    <!--    'column_alias': 'listing__ds__quarter'}                -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),  -->
-                                    <!--    'column_alias': 'country_latest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                                    <!--    'column_alias': 'listing__ds__year'}                   -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),  -->
-                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_year'}           -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),  -->
-                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),  -->
-                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_month'}          -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),  -->
-                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_week'}           -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),  -->
-                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_day'}            -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
-                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
-                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                                    <!--    'column_alias': 'listing__created_at__day'}            -->
+                                    <!-- col37 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
+                                    <!--    'column_alias': 'listing__created_at__week'}           -->
+                                    <!-- col38 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
+                                    <!--    'column_alias': 'listing__created_at__month'}          -->
+                                    <!-- col39 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                                    <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                                    <!-- col40 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                                    <!--    'column_alias': 'listing__created_at__year'}           -->
+                                    <!-- col41 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_year'}   -->
+                                    <!-- col42 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),    -->
+                                    <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                    <!-- col43 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                    <!-- col44 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_week'}   -->
+                                    <!-- col45 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_day'}    -->
+                                    <!-- col46 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),      -->
+                                    <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                    <!-- col47 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),      -->
+                                    <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                    <!-- col48 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
+                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!-- col49 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!-- col50 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!-- col51 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!-- col52 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
+                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!-- col53 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!-- col54 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
+                                    <!--    'column_alias': 'user'}                                -->
+                                    <!-- col55 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
+                                    <!--    'column_alias': 'listing__user'}                       -->
+                                    <!-- col56 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                                    <!--    'column_alias': 'country_latest'}                      -->
+                                    <!-- col57 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!-- col58 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!-- col59 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!-- col60 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!-- col61 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!-- col62 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!-- col63 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!-- col64 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
                                     <!--    'column_alias': 'smallest_listing'}                    -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                     <!-- where = None -->
@@ -1435,15 +2331,15 @@
                                         <!--    'column_alias': 'listings'}                                 -->
                                         <!-- col1 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                                         <!--    'column_alias': 'largest_listing'}                       -->
                                         <!-- col2 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                                         <!--    'column_alias': 'smallest_listing'}                      -->
                                         <!-- col3 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                                         <!--    'column_alias': 'ds__day'}                               -->
                                         <!-- col4 =                                                -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -1461,101 +2357,213 @@
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                                         <!--    'column_alias': 'ds__year'}                        -->
-                                        <!-- col8 =                                                      -->
+                                        <!-- col8 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                                        <!--    'column_alias': 'ds__extract_year'}              -->
+                                        <!-- col9 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                        <!-- col10 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                                        <!--    'column_alias': 'ds__extract_month'}             -->
+                                        <!-- col11 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                                        <!--    'column_alias': 'ds__extract_week'}              -->
+                                        <!-- col12 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                                        <!--    'column_alias': 'ds__extract_day'}               -->
+                                        <!-- col13 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!-- col14 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                                         <!--    'column_alias': 'created_at__day'}                       -->
-                                        <!-- col9 =                                                -->
+                                        <!-- col16 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                                         <!--    'column_alias': 'created_at__week'}                -->
-                                        <!-- col10 =                                               -->
+                                        <!-- col17 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                                         <!--    'column_alias': 'created_at__month'}               -->
-                                        <!-- col11 =                                               -->
+                                        <!-- col18 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                                         <!--    'column_alias': 'created_at__quarter'}             -->
-                                        <!-- col12 =                                               -->
+                                        <!-- col19 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                                         <!--    'column_alias': 'created_at__year'}                -->
-                                        <!-- col13 =                                                     -->
+                                        <!-- col20 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                                        <!--    'column_alias': 'created_at__extract_year'}      -->
+                                        <!-- col21 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                                        <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                                        <!-- col22 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                                        <!--    'column_alias': 'created_at__extract_month'}     -->
+                                        <!-- col23 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                                        <!--    'column_alias': 'created_at__extract_week'}      -->
+                                        <!-- col24 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                                        <!--    'column_alias': 'created_at__extract_day'}       -->
+                                        <!-- col25 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                                        <!-- col26 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                        <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                                         <!--    'column_alias': 'country_latest'}                        -->
-                                        <!-- col14 =                                                     -->
+                                        <!-- col28 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                                         <!--    'column_alias': 'is_lux_latest'}                         -->
-                                        <!-- col15 =                                                     -->
+                                        <!-- col29 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                                         <!--    'column_alias': 'capacity_latest'}                       -->
-                                        <!-- col16 =                                                     -->
+                                        <!-- col30 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                                         <!--    'column_alias': 'listing__ds__day'}                      -->
-                                        <!-- col17 =                                               -->
+                                        <!-- col31 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                                         <!--    'column_alias': 'listing__ds__week'}               -->
-                                        <!-- col18 =                                               -->
+                                        <!-- col32 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                                         <!--    'column_alias': 'listing__ds__month'}              -->
-                                        <!-- col19 =                                               -->
+                                        <!-- col33 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                                         <!--    'column_alias': 'listing__ds__quarter'}            -->
-                                        <!-- col20 =                                               -->
+                                        <!-- col34 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                                         <!--    'column_alias': 'listing__ds__year'}               -->
-                                        <!-- col21 =                                                     -->
+                                        <!-- col35 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                                        <!-- col36 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                                        <!-- col37 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                                        <!-- col38 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                                        <!-- col39 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                                        <!-- col40 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                                        <!-- col41 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                        <!-- col42 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                                         <!--    'column_alias': 'listing__created_at__day'}              -->
-                                        <!-- col22 =                                               -->
+                                        <!-- col43 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                                         <!--    'column_alias': 'listing__created_at__week'}       -->
-                                        <!-- col23 =                                               -->
+                                        <!-- col44 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                                         <!--    'column_alias': 'listing__created_at__month'}      -->
-                                        <!-- col24 =                                               -->
+                                        <!-- col45 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                                         <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                                        <!-- col25 =                                               -->
+                                        <!-- col46 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                                         <!--    'column_alias': 'listing__created_at__year'}       -->
-                                        <!-- col26 =                                                     -->
+                                        <!-- col47 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                                        <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                                        <!-- col48 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                                        <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                        <!-- col49 =                                                   -->
+                                        <!--   {'class': 'SqlSelectColumn',                            -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                                        <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                        <!-- col50 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                                        <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                                        <!-- col51 =                                                 -->
+                                        <!--   {'class': 'SqlSelectColumn',                          -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                                        <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                                        <!-- col52 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                        <!-- col53 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                        <!-- col54 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                                         <!--    'column_alias': 'listing__country_latest'}               -->
-                                        <!-- col27 =                                                     -->
+                                        <!-- col55 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                                         <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                                        <!-- col28 =                                                     -->
+                                        <!-- col56 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                                         <!--    'column_alias': 'listing__capacity_latest'}              -->
-                                        <!-- col29 =                                                     -->
+                                        <!-- col57 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                                         <!--    'column_alias': 'listing'}                               -->
-                                        <!-- col30 =                                                     -->
+                                        <!-- col58 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                                         <!--    'column_alias': 'user'}                                  -->
-                                        <!-- col31 =                                                     -->
+                                        <!-- col59 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                                         <!--    'column_alias': 'listing__user'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
index 82a0ab149d..95cd7fa4a4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
@@ -104,27 +104,27 @@
                         <!--    'column_alias': 'instant_bookings'}                                                              -->
                         <!-- col2 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                         <!--    'column_alias': 'booking_value'}                         -->
                         <!-- col3 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                         <!--    'column_alias': 'max_booking_value'}                     -->
                         <!-- col4 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                         <!--    'column_alias': 'min_booking_value'}                     -->
                         <!-- col5 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                         <!--    'column_alias': 'bookers'}                               -->
                         <!-- col6 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                         <!--    'column_alias': 'average_booking_value'}                 -->
                         <!-- col7 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                         <!--    'column_alias': 'booking_payments'}                      -->
                         <!-- col8 =                                                                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -132,31 +132,31 @@
                         <!--    'column_alias': 'referred_bookings'}                                                                          -->
                         <!-- col9 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                         <!--    'column_alias': 'median_booking_value'}                  -->
                         <!-- col10 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                         <!--    'column_alias': 'booking_value_p99'}                     -->
                         <!-- col11 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                         <!-- col12 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                         <!-- col13 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- col14 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                         <!--    'column_alias': 'is_instant'}                            -->
                         <!-- col15 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                         <!--    'column_alias': 'ds__day'}                               -->
                         <!-- col16 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -174,133 +174,301 @@
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                         <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col20 =                                                     -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col25 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!-- col26 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                        <!-- col21 =                                               -->
+                        <!-- col28 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                         <!--    'column_alias': 'ds_partitioned__week'}            -->
-                        <!-- col22 =                                               -->
+                        <!-- col29 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                         <!--    'column_alias': 'ds_partitioned__month'}           -->
-                        <!-- col23 =                                               -->
+                        <!-- col30 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                        <!-- col24 =                                               -->
+                        <!-- col31 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                         <!--    'column_alias': 'ds_partitioned__year'}            -->
-                        <!-- col25 =                                                     -->
+                        <!-- col32 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                        <!-- col33 =                                                -->
+                        <!--   {'class': 'SqlSelectColumn',                         -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                        <!-- col34 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                        <!-- col35 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                        <!-- col36 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                        <!-- col37 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col38 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col39 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                         <!--    'column_alias': 'paid_at__day'}                          -->
-                        <!-- col26 =                                               -->
+                        <!-- col40 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                         <!--    'column_alias': 'paid_at__week'}                   -->
-                        <!-- col27 =                                               -->
+                        <!-- col41 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                         <!--    'column_alias': 'paid_at__month'}                  -->
-                        <!-- col28 =                                               -->
+                        <!-- col42 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                         <!--    'column_alias': 'paid_at__quarter'}                -->
-                        <!-- col29 =                                               -->
+                        <!-- col43 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                         <!--    'column_alias': 'paid_at__year'}                   -->
-                        <!-- col30 =                                                     -->
+                        <!-- col44 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}         -->
+                        <!-- col45 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                        <!-- col46 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}        -->
+                        <!-- col47 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}         -->
+                        <!-- col48 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}          -->
+                        <!-- col49 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                        <!-- col50 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                        <!-- col51 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                         <!--    'column_alias': 'booking__is_instant'}                   -->
-                        <!-- col31 =                                                     -->
+                        <!-- col52 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                         <!--    'column_alias': 'booking__ds__day'}                      -->
-                        <!-- col32 =                                               -->
+                        <!-- col53 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                         <!--    'column_alias': 'booking__ds__week'}               -->
-                        <!-- col33 =                                               -->
+                        <!-- col54 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                         <!--    'column_alias': 'booking__ds__month'}              -->
-                        <!-- col34 =                                               -->
+                        <!-- col55 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                         <!--    'column_alias': 'booking__ds__quarter'}            -->
-                        <!-- col35 =                                               -->
+                        <!-- col56 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                         <!--    'column_alias': 'booking__ds__year'}               -->
-                        <!-- col36 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                        <!-- col57 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                        <!-- col58 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                        <!-- col59 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                        <!-- col60 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                        <!-- col61 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                        <!-- col62 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                        <!-- col63 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                        <!-- col64 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                        <!-- col37 =                                               -->
+                        <!-- col65 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                        <!-- col38 =                                               -->
+                        <!-- col66 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                        <!-- col39 =                                                 -->
+                        <!-- col67 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                        <!-- col40 =                                               -->
+                        <!-- col68 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                        <!-- col41 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                        <!-- col69 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col70 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col71 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col72 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col73 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col74 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col75 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col76 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                         <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                        <!-- col42 =                                               -->
+                        <!-- col77 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                         <!--    'column_alias': 'booking__paid_at__week'}          -->
-                        <!-- col43 =                                               -->
+                        <!-- col78 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                         <!--    'column_alias': 'booking__paid_at__month'}         -->
-                        <!-- col44 =                                               -->
+                        <!-- col79 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                         <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                        <!-- col45 =                                               -->
+                        <!-- col80 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                         <!--    'column_alias': 'booking__paid_at__year'}          -->
-                        <!-- col46 =                                                     -->
+                        <!-- col81 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                        <!-- col82 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                        <!-- col83 =                                                -->
+                        <!--   {'class': 'SqlSelectColumn',                         -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                        <!-- col84 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                        <!-- col85 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                        <!-- col86 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col87 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col88 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                         <!--    'column_alias': 'listing'}                               -->
-                        <!-- col47 =                                                     -->
+                        <!-- col89 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                         <!--    'column_alias': 'guest'}                                 -->
-                        <!-- col48 =                                                     -->
+                        <!-- col90 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                         <!--    'column_alias': 'host'}                                  -->
-                        <!-- col49 =                                                     -->
+                        <!-- col91 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                         <!--    'column_alias': 'booking__listing'}                      -->
-                        <!-- col50 =                                                     -->
+                        <!-- col92 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                         <!--    'column_alias': 'booking__guest'}                        -->
-                        <!-- col51 =                                                     -->
+                        <!-- col93 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                         <!--    'column_alias': 'booking__host'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                         <!-- where = None -->
@@ -335,15 +503,15 @@
                         <!--    'column_alias': 'listings'}                                 -->
                         <!-- col1 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                         <!--    'column_alias': 'largest_listing'}                       -->
                         <!-- col2 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                         <!--    'column_alias': 'smallest_listing'}                      -->
                         <!-- col3 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                         <!--    'column_alias': 'ds__day'}                               -->
                         <!-- col4 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -361,101 +529,213 @@
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                         <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col8 =                                                      -->
+                        <!-- col8 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col9 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col10 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col11 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col12 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col13 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!-- col14 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!-- col15 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                         <!--    'column_alias': 'created_at__day'}                       -->
-                        <!-- col9 =                                                -->
+                        <!-- col16 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                         <!--    'column_alias': 'created_at__week'}                -->
-                        <!-- col10 =                                               -->
+                        <!-- col17 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                         <!--    'column_alias': 'created_at__month'}               -->
-                        <!-- col11 =                                               -->
+                        <!-- col18 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                         <!--    'column_alias': 'created_at__quarter'}             -->
-                        <!-- col12 =                                               -->
+                        <!-- col19 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                         <!--    'column_alias': 'created_at__year'}                -->
-                        <!-- col13 =                                                     -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                        <!--    'column_alias': 'created_at__extract_year'}      -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                        <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                        <!--    'column_alias': 'created_at__extract_month'}     -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                        <!--    'column_alias': 'created_at__extract_week'}      -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                        <!--    'column_alias': 'created_at__extract_day'}       -->
+                        <!-- col25 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                        <!-- col26 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                        <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                         <!--    'column_alias': 'country_latest'}                        -->
-                        <!-- col14 =                                                     -->
+                        <!-- col28 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                         <!--    'column_alias': 'is_lux_latest'}                         -->
-                        <!-- col15 =                                                     -->
+                        <!-- col29 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                         <!--    'column_alias': 'capacity_latest'}                       -->
-                        <!-- col16 =                                                     -->
+                        <!-- col30 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                         <!--    'column_alias': 'listing__ds__day'}                      -->
-                        <!-- col17 =                                               -->
+                        <!-- col31 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                         <!--    'column_alias': 'listing__ds__week'}               -->
-                        <!-- col18 =                                               -->
+                        <!-- col32 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                         <!--    'column_alias': 'listing__ds__month'}              -->
-                        <!-- col19 =                                               -->
+                        <!-- col33 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                         <!--    'column_alias': 'listing__ds__quarter'}            -->
-                        <!-- col20 =                                               -->
+                        <!-- col34 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                         <!--    'column_alias': 'listing__ds__year'}               -->
-                        <!-- col21 =                                                     -->
+                        <!-- col35 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                        <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                        <!-- col36 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                        <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                        <!-- col37 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                        <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                        <!-- col38 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                        <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                        <!-- col39 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                        <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                        <!-- col40 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                        <!-- col41 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                        <!-- col42 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                         <!--    'column_alias': 'listing__created_at__day'}              -->
-                        <!-- col22 =                                               -->
+                        <!-- col43 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                         <!--    'column_alias': 'listing__created_at__week'}       -->
-                        <!-- col23 =                                               -->
+                        <!-- col44 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                         <!--    'column_alias': 'listing__created_at__month'}      -->
-                        <!-- col24 =                                               -->
+                        <!-- col45 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                         <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                        <!-- col25 =                                               -->
+                        <!-- col46 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                         <!--    'column_alias': 'listing__created_at__year'}       -->
-                        <!-- col26 =                                                     -->
+                        <!-- col47 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                        <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                        <!-- col48 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                        <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                        <!-- col49 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                        <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                        <!-- col50 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                        <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                        <!-- col51 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                        <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                        <!-- col52 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                        <!-- col53 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                        <!-- col54 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                         <!--    'column_alias': 'listing__country_latest'}               -->
-                        <!-- col27 =                                                     -->
+                        <!-- col55 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                         <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                        <!-- col28 =                                                     -->
+                        <!-- col56 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                         <!--    'column_alias': 'listing__capacity_latest'}              -->
-                        <!-- col29 =                                                     -->
+                        <!-- col57 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                         <!--    'column_alias': 'listing'}                               -->
-                        <!-- col30 =                                                     -->
+                        <!-- col58 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                         <!--    'column_alias': 'user'}                                  -->
-                        <!-- col31 =                                                     -->
+                        <!-- col59 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                         <!--    'column_alias': 'listing__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml
index 38b865d81f..9f5069ebd5 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml
@@ -92,27 +92,27 @@
                         <!--    'column_alias': 'instant_bookings'}                                                              -->
                         <!-- col2 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                         <!--    'column_alias': 'booking_value'}                         -->
                         <!-- col3 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                         <!--    'column_alias': 'max_booking_value'}                     -->
                         <!-- col4 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                         <!--    'column_alias': 'min_booking_value'}                     -->
                         <!-- col5 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                         <!--    'column_alias': 'bookers'}                               -->
                         <!-- col6 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                         <!--    'column_alias': 'average_booking_value'}                 -->
                         <!-- col7 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                         <!--    'column_alias': 'booking_payments'}                      -->
                         <!-- col8 =                                                                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -120,31 +120,31 @@
                         <!--    'column_alias': 'referred_bookings'}                                                                          -->
                         <!-- col9 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                         <!--    'column_alias': 'median_booking_value'}                  -->
                         <!-- col10 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                         <!--    'column_alias': 'booking_value_p99'}                     -->
                         <!-- col11 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                         <!-- col12 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                         <!-- col13 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- col14 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                         <!--    'column_alias': 'is_instant'}                            -->
                         <!-- col15 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                         <!--    'column_alias': 'ds__day'}                               -->
                         <!-- col16 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -162,133 +162,301 @@
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                         <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col20 =                                                     -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col25 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!-- col26 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                        <!-- col21 =                                               -->
+                        <!-- col28 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                         <!--    'column_alias': 'ds_partitioned__week'}            -->
-                        <!-- col22 =                                               -->
+                        <!-- col29 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                         <!--    'column_alias': 'ds_partitioned__month'}           -->
-                        <!-- col23 =                                               -->
+                        <!-- col30 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                        <!-- col24 =                                               -->
+                        <!-- col31 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                         <!--    'column_alias': 'ds_partitioned__year'}            -->
-                        <!-- col25 =                                                     -->
+                        <!-- col32 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                        <!-- col33 =                                                -->
+                        <!--   {'class': 'SqlSelectColumn',                         -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                        <!-- col34 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                        <!-- col35 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                        <!-- col36 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                        <!-- col37 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col38 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col39 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                         <!--    'column_alias': 'paid_at__day'}                          -->
-                        <!-- col26 =                                               -->
+                        <!-- col40 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                         <!--    'column_alias': 'paid_at__week'}                   -->
-                        <!-- col27 =                                               -->
+                        <!-- col41 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                         <!--    'column_alias': 'paid_at__month'}                  -->
-                        <!-- col28 =                                               -->
+                        <!-- col42 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                         <!--    'column_alias': 'paid_at__quarter'}                -->
-                        <!-- col29 =                                               -->
+                        <!-- col43 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                         <!--    'column_alias': 'paid_at__year'}                   -->
-                        <!-- col30 =                                                     -->
+                        <!-- col44 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}         -->
+                        <!-- col45 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                        <!-- col46 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}        -->
+                        <!-- col47 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}         -->
+                        <!-- col48 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}          -->
+                        <!-- col49 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                        <!-- col50 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                        <!-- col51 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                         <!--    'column_alias': 'booking__is_instant'}                   -->
-                        <!-- col31 =                                                     -->
+                        <!-- col52 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                         <!--    'column_alias': 'booking__ds__day'}                      -->
-                        <!-- col32 =                                               -->
+                        <!-- col53 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                         <!--    'column_alias': 'booking__ds__week'}               -->
-                        <!-- col33 =                                               -->
+                        <!-- col54 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                         <!--    'column_alias': 'booking__ds__month'}              -->
-                        <!-- col34 =                                               -->
+                        <!-- col55 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                         <!--    'column_alias': 'booking__ds__quarter'}            -->
-                        <!-- col35 =                                               -->
+                        <!-- col56 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                         <!--    'column_alias': 'booking__ds__year'}               -->
-                        <!-- col36 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                        <!-- col57 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                        <!-- col58 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                        <!-- col59 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                        <!-- col60 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                        <!-- col61 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                        <!-- col62 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                        <!-- col63 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                        <!-- col64 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                        <!-- col37 =                                               -->
+                        <!-- col65 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                        <!-- col38 =                                               -->
+                        <!-- col66 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                        <!-- col39 =                                                 -->
+                        <!-- col67 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                        <!-- col40 =                                               -->
+                        <!-- col68 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                        <!-- col41 =                                                     -->
-                        <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                        <!-- col69 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col70 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col71 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col72 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col73 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col74 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col75 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col76 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                         <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                        <!-- col42 =                                               -->
+                        <!-- col77 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                         <!--    'column_alias': 'booking__paid_at__week'}          -->
-                        <!-- col43 =                                               -->
+                        <!-- col78 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                         <!--    'column_alias': 'booking__paid_at__month'}         -->
-                        <!-- col44 =                                               -->
+                        <!-- col79 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                         <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                        <!-- col45 =                                               -->
+                        <!-- col80 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                         <!--    'column_alias': 'booking__paid_at__year'}          -->
-                        <!-- col46 =                                                     -->
+                        <!-- col81 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                        <!-- col82 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                        <!-- col83 =                                                -->
+                        <!--   {'class': 'SqlSelectColumn',                         -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                        <!-- col84 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                        <!-- col85 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                        <!-- col86 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col87 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col88 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                         <!--    'column_alias': 'listing'}                               -->
-                        <!-- col47 =                                                     -->
+                        <!-- col89 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                         <!--    'column_alias': 'guest'}                                 -->
-                        <!-- col48 =                                                     -->
+                        <!-- col90 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                         <!--    'column_alias': 'host'}                                  -->
-                        <!-- col49 =                                                     -->
+                        <!-- col91 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                         <!--    'column_alias': 'booking__listing'}                      -->
-                        <!-- col50 =                                                     -->
+                        <!-- col92 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                         <!--    'column_alias': 'booking__guest'}                        -->
-                        <!-- col51 =                                                     -->
+                        <!-- col93 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                         <!--    'column_alias': 'booking__host'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                         <!-- where = None -->
@@ -323,15 +491,15 @@
                         <!--    'column_alias': 'listings'}                                 -->
                         <!-- col1 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                         <!--    'column_alias': 'largest_listing'}                       -->
                         <!-- col2 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                         <!--    'column_alias': 'smallest_listing'}                      -->
                         <!-- col3 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                         <!--    'column_alias': 'ds__day'}                               -->
                         <!-- col4 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -349,101 +517,213 @@
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                         <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col8 =                                                      -->
+                        <!-- col8 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col9 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col10 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col11 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col12 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col13 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!-- col14 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!-- col15 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                         <!--    'column_alias': 'created_at__day'}                       -->
-                        <!-- col9 =                                                -->
+                        <!-- col16 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                         <!--    'column_alias': 'created_at__week'}                -->
-                        <!-- col10 =                                               -->
+                        <!-- col17 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                         <!--    'column_alias': 'created_at__month'}               -->
-                        <!-- col11 =                                               -->
+                        <!-- col18 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                         <!--    'column_alias': 'created_at__quarter'}             -->
-                        <!-- col12 =                                               -->
+                        <!-- col19 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                         <!--    'column_alias': 'created_at__year'}                -->
-                        <!-- col13 =                                                     -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                        <!--    'column_alias': 'created_at__extract_year'}      -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                        <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                        <!--    'column_alias': 'created_at__extract_month'}     -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                        <!--    'column_alias': 'created_at__extract_week'}      -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                        <!--    'column_alias': 'created_at__extract_day'}       -->
+                        <!-- col25 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                        <!-- col26 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                        <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                         <!--    'column_alias': 'country_latest'}                        -->
-                        <!-- col14 =                                                     -->
+                        <!-- col28 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                         <!--    'column_alias': 'is_lux_latest'}                         -->
-                        <!-- col15 =                                                     -->
+                        <!-- col29 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                         <!--    'column_alias': 'capacity_latest'}                       -->
-                        <!-- col16 =                                                     -->
+                        <!-- col30 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                         <!--    'column_alias': 'listing__ds__day'}                      -->
-                        <!-- col17 =                                               -->
+                        <!-- col31 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                         <!--    'column_alias': 'listing__ds__week'}               -->
-                        <!-- col18 =                                               -->
+                        <!-- col32 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                         <!--    'column_alias': 'listing__ds__month'}              -->
-                        <!-- col19 =                                               -->
+                        <!-- col33 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                         <!--    'column_alias': 'listing__ds__quarter'}            -->
-                        <!-- col20 =                                               -->
+                        <!-- col34 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                         <!--    'column_alias': 'listing__ds__year'}               -->
-                        <!-- col21 =                                                     -->
+                        <!-- col35 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                        <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                        <!-- col36 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                        <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                        <!-- col37 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                        <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                        <!-- col38 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                        <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                        <!-- col39 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                        <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                        <!-- col40 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                        <!-- col41 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                        <!-- col42 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                         <!--    'column_alias': 'listing__created_at__day'}              -->
-                        <!-- col22 =                                               -->
+                        <!-- col43 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                         <!--    'column_alias': 'listing__created_at__week'}       -->
-                        <!-- col23 =                                               -->
+                        <!-- col44 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                         <!--    'column_alias': 'listing__created_at__month'}      -->
-                        <!-- col24 =                                               -->
+                        <!-- col45 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                         <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                        <!-- col25 =                                               -->
+                        <!-- col46 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                         <!--    'column_alias': 'listing__created_at__year'}       -->
-                        <!-- col26 =                                                     -->
+                        <!-- col47 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                        <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                        <!-- col48 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                        <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                        <!-- col49 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                        <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                        <!-- col50 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                        <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                        <!-- col51 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                        <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                        <!-- col52 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                        <!-- col53 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                        <!-- col54 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                         <!--    'column_alias': 'listing__country_latest'}               -->
-                        <!-- col27 =                                                     -->
+                        <!-- col55 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                         <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                        <!-- col28 =                                                     -->
+                        <!-- col56 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                         <!--    'column_alias': 'listing__capacity_latest'}              -->
-                        <!-- col29 =                                                     -->
+                        <!-- col57 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                         <!--    'column_alias': 'listing'}                               -->
-                        <!-- col30 =                                                     -->
+                        <!-- col58 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                         <!--    'column_alias': 'user'}                                  -->
-                        <!-- col31 =                                                     -->
+                        <!-- col59 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                         <!--    'column_alias': 'listing__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml
index aec5366d3c..4dbe746624 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml
@@ -62,27 +62,27 @@
                     <!--    'column_alias': 'instant_bookings'}                                                              -->
                     <!-- col2 =                                                      -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                     <!--    'column_alias': 'booking_value'}                         -->
                     <!-- col3 =                                                      -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                     <!--    'column_alias': 'max_booking_value'}                     -->
                     <!-- col4 =                                                      -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                     <!--    'column_alias': 'min_booking_value'}                     -->
                     <!-- col5 =                                                      -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                     <!--    'column_alias': 'bookers'}                               -->
                     <!-- col6 =                                                      -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                     <!--    'column_alias': 'average_booking_value'}                 -->
                     <!-- col7 =                                                      -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                     <!--    'column_alias': 'booking_payments'}                      -->
                     <!-- col8 =                                                                                                           -->
                     <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -90,31 +90,31 @@
                     <!--    'column_alias': 'referred_bookings'}                                                                          -->
                     <!-- col9 =                                                      -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                     <!--    'column_alias': 'median_booking_value'}                  -->
                     <!-- col10 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                     <!--    'column_alias': 'booking_value_p99'}                     -->
                     <!-- col11 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                     <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                     <!-- col12 =                                                         -->
                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                     <!-- col13 =                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                     <!-- col14 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                     <!--    'column_alias': 'is_instant'}                            -->
                     <!-- col15 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                     <!--    'column_alias': 'ds__day'}                               -->
                     <!-- col16 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -132,133 +132,301 @@
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                     <!--    'column_alias': 'ds__year'}                        -->
-                    <!-- col20 =                                                     -->
+                    <!-- col20 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                    <!--    'column_alias': 'ds__extract_year'}              -->
+                    <!-- col21 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                    <!--    'column_alias': 'ds__extract_quarter'}           -->
+                    <!-- col22 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                    <!--    'column_alias': 'ds__extract_month'}             -->
+                    <!-- col23 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                    <!--    'column_alias': 'ds__extract_week'}              -->
+                    <!-- col24 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                    <!--    'column_alias': 'ds__extract_day'}               -->
+                    <!-- col25 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                    <!-- col26 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                    <!-- col27 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                     <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                    <!-- col21 =                                               -->
+                    <!-- col28 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                     <!--    'column_alias': 'ds_partitioned__week'}            -->
-                    <!-- col22 =                                               -->
+                    <!-- col29 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                     <!--    'column_alias': 'ds_partitioned__month'}           -->
-                    <!-- col23 =                                               -->
+                    <!-- col30 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                     <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                    <!-- col24 =                                               -->
+                    <!-- col31 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                     <!--    'column_alias': 'ds_partitioned__year'}            -->
-                    <!-- col25 =                                                     -->
+                    <!-- col32 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                    <!-- col33 =                                                -->
+                    <!--   {'class': 'SqlSelectColumn',                         -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                    <!-- col34 =                                              -->
+                    <!--   {'class': 'SqlSelectColumn',                       -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                    <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                    <!-- col35 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                    <!-- col36 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                    <!-- col37 =                                                  -->
+                    <!--   {'class': 'SqlSelectColumn',                           -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                    <!-- col38 =                                                  -->
+                    <!--   {'class': 'SqlSelectColumn',                           -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                    <!-- col39 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                     <!--    'column_alias': 'paid_at__day'}                          -->
-                    <!-- col26 =                                               -->
+                    <!-- col40 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                     <!--    'column_alias': 'paid_at__week'}                   -->
-                    <!-- col27 =                                               -->
+                    <!-- col41 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                     <!--    'column_alias': 'paid_at__month'}                  -->
-                    <!-- col28 =                                               -->
+                    <!-- col42 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                     <!--    'column_alias': 'paid_at__quarter'}                -->
-                    <!-- col29 =                                               -->
+                    <!-- col43 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                     <!--    'column_alias': 'paid_at__year'}                   -->
-                    <!-- col30 =                                                     -->
+                    <!-- col44 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                    <!--    'column_alias': 'paid_at__extract_year'}         -->
+                    <!-- col45 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                    <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                    <!-- col46 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                    <!--    'column_alias': 'paid_at__extract_month'}        -->
+                    <!-- col47 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                    <!--    'column_alias': 'paid_at__extract_week'}         -->
+                    <!-- col48 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                    <!--    'column_alias': 'paid_at__extract_day'}          -->
+                    <!-- col49 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                    <!-- col50 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                    <!-- col51 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                     <!--    'column_alias': 'booking__is_instant'}                   -->
-                    <!-- col31 =                                                     -->
+                    <!-- col52 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                     <!--    'column_alias': 'booking__ds__day'}                      -->
-                    <!-- col32 =                                               -->
+                    <!-- col53 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                     <!--    'column_alias': 'booking__ds__week'}               -->
-                    <!-- col33 =                                               -->
+                    <!-- col54 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                     <!--    'column_alias': 'booking__ds__month'}              -->
-                    <!-- col34 =                                               -->
+                    <!-- col55 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                     <!--    'column_alias': 'booking__ds__quarter'}            -->
-                    <!-- col35 =                                               -->
+                    <!-- col56 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                     <!--    'column_alias': 'booking__ds__year'}               -->
-                    <!-- col36 =                                                     -->
+                    <!-- col57 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                    <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                    <!-- col58 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                    <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                    <!-- col59 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                    <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                    <!-- col60 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                    <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                    <!-- col61 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                    <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                    <!-- col62 =                                               -->
+                    <!--   {'class': 'SqlSelectColumn',                        -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                    <!-- col63 =                                               -->
+                    <!--   {'class': 'SqlSelectColumn',                        -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                    <!-- col64 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                     <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                    <!-- col37 =                                               -->
+                    <!-- col65 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                     <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                    <!-- col38 =                                               -->
+                    <!-- col66 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                     <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                    <!-- col39 =                                                 -->
+                    <!-- col67 =                                                 -->
                     <!--   {'class': 'SqlSelectColumn',                          -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                    <!-- col40 =                                               -->
+                    <!-- col68 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                     <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                    <!-- col41 =                                                     -->
+                    <!-- col69 =                                                      -->
+                    <!--   {'class': 'SqlSelectColumn',                               -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                    <!-- col70 =                                                         -->
+                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                    <!-- col71 =                                                       -->
+                    <!--   {'class': 'SqlSelectColumn',                                -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                    <!-- col72 =                                                      -->
+                    <!--   {'class': 'SqlSelectColumn',                               -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                    <!-- col73 =                                                     -->
+                    <!--   {'class': 'SqlSelectColumn',                              -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                    <!-- col74 =                                                           -->
+                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                    <!-- col75 =                                                           -->
+                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                    <!-- col76 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                     <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                    <!-- col42 =                                               -->
+                    <!-- col77 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                     <!--    'column_alias': 'booking__paid_at__week'}          -->
-                    <!-- col43 =                                               -->
+                    <!-- col78 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                     <!--    'column_alias': 'booking__paid_at__month'}         -->
-                    <!-- col44 =                                               -->
+                    <!-- col79 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                     <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                    <!-- col45 =                                               -->
+                    <!-- col80 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                        -->
                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                     <!--    'column_alias': 'booking__paid_at__year'}          -->
-                    <!-- col46 =                                                     -->
+                    <!-- col81 =                                               -->
+                    <!--   {'class': 'SqlSelectColumn',                        -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                    <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                    <!-- col82 =                                                  -->
+                    <!--   {'class': 'SqlSelectColumn',                           -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                    <!-- col83 =                                                -->
+                    <!--   {'class': 'SqlSelectColumn',                         -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                    <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                    <!-- col84 =                                               -->
+                    <!--   {'class': 'SqlSelectColumn',                        -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                    <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                    <!-- col85 =                                              -->
+                    <!--   {'class': 'SqlSelectColumn',                       -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                    <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                    <!-- col86 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                             -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                    <!-- col87 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                             -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                    <!-- col88 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                     <!--    'column_alias': 'listing'}                               -->
-                    <!-- col47 =                                                     -->
+                    <!-- col89 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                     <!--    'column_alias': 'guest'}                                 -->
-                    <!-- col48 =                                                     -->
+                    <!-- col90 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                     <!--    'column_alias': 'host'}                                  -->
-                    <!-- col49 =                                                     -->
+                    <!-- col91 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                     <!--    'column_alias': 'booking__listing'}                      -->
-                    <!-- col50 =                                                     -->
+                    <!-- col92 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                     <!--    'column_alias': 'booking__guest'}                        -->
-                    <!-- col51 =                                                     -->
+                    <!-- col93 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                     <!--    'column_alias': 'booking__host'}                         -->
                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
index e821ae326f..767372469e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_10 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
         <!--    'column_alias': 'ds__month'}                           -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
         <!--    'column_alias': 'trailing_2_months_revenue'}           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_9 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_8 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
                 <!--    'column_alias': 'ds__month'}                           -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
@@ -49,75 +49,131 @@
                     <!-- node_id = ss_7 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                    <!--    'column_alias': 'company__ds__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                    <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                    <!--    'column_alias': 'company__ds__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                    <!--    'column_alias': 'company__ds__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                    <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
-                    <!--    'column_alias': 'company__ds__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                    <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
-                    <!--    'column_alias': 'company__ds__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                    <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),  -->
-                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),  -->
-                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                    <!--    'column_alias': 'company__ds__day'}                    -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                    <!--    'column_alias': 'company__ds__week'}                   -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
-                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                    <!--    'column_alias': 'company__ds__month'}                  -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                    <!--    'column_alias': 'company__ds__quarter'}                -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                    <!--    'column_alias': 'company__ds__year'}                   -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                    <!--    'column_alias': 'company__ds__extract_year'}           -->
+                    <!-- col18 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                    <!--    'column_alias': 'company__ds__extract_quarter'}        -->
+                    <!-- col19 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                    <!--    'column_alias': 'company__ds__extract_month'}          -->
+                    <!-- col20 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                    <!--    'column_alias': 'company__ds__extract_week'}           -->
+                    <!-- col21 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                    <!--    'column_alias': 'company__ds__extract_day'}            -->
+                    <!-- col22 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                    <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                    <!-- col23 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                    <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                    <!-- col24 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!-- col25 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!-- col26 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!-- col27 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!-- col28 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!-- col29 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                    <!--    'column_alias': 'user'}                                -->
+                    <!-- col30 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                    <!--    'column_alias': 'company__user'}                       -->
+                    <!-- col31 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                     <!-- where = None -->
@@ -126,11 +182,11 @@
                         <!-- node_id = ss_10006 -->
                         <!-- col0 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10132),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10068),  -->
                         <!--    'column_alias': 'txn_revenue'}                           -->
                         <!-- col1 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10133),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10069),  -->
                         <!--    'column_alias': 'ds__day'}                               -->
                         <!-- col2 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -148,33 +204,89 @@
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10067),  -->
                         <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col6 =                                                      -->
+                        <!-- col6 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10112),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col7 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10113),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col8 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10114),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col9 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10115),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col10 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10116),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col11 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10117),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!-- col12 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10118),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!-- col13 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10138),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10070),  -->
                         <!--    'column_alias': 'company__ds__day'}                      -->
-                        <!-- col7 =                                                -->
+                        <!-- col14 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10068),  -->
                         <!--    'column_alias': 'company__ds__week'}               -->
-                        <!-- col8 =                                                -->
+                        <!-- col15 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10069),  -->
                         <!--    'column_alias': 'company__ds__month'}              -->
-                        <!-- col9 =                                                -->
+                        <!-- col16 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10070),  -->
                         <!--    'column_alias': 'company__ds__quarter'}            -->
-                        <!-- col10 =                                               -->
+                        <!-- col17 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10071),  -->
                         <!--    'column_alias': 'company__ds__year'}               -->
-                        <!-- col11 =                                                     -->
+                        <!-- col18 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10119),  -->
+                        <!--    'column_alias': 'company__ds__extract_year'}     -->
+                        <!-- col19 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10120),  -->
+                        <!--    'column_alias': 'company__ds__extract_quarter'}  -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10121),  -->
+                        <!--    'column_alias': 'company__ds__extract_month'}    -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10122),  -->
+                        <!--    'column_alias': 'company__ds__extract_week'}     -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10123),  -->
+                        <!--    'column_alias': 'company__ds__extract_day'}      -->
+                        <!-- col23 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10124),    -->
+                        <!--    'column_alias': 'company__ds__extract_dayofweek'}  -->
+                        <!-- col24 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10125),    -->
+                        <!--    'column_alias': 'company__ds__extract_dayofyear'}  -->
+                        <!-- col25 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10143),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
                         <!--    'column_alias': 'user'}                                  -->
-                        <!-- col12 =                                                     -->
+                        <!-- col26 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10144),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10072),  -->
                         <!--    'column_alias': 'company__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
index e61cab14ff..0ee72e4356 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_10 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
         <!--    'column_alias': 'ds__month'}                           -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
         <!--    'column_alias': 'revenue_mtd'}                         -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_9 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_8 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
                 <!--    'column_alias': 'ds__month'}                           -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
@@ -49,75 +49,131 @@
                     <!-- node_id = ss_7 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                    <!--    'column_alias': 'company__ds__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                    <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                    <!--    'column_alias': 'company__ds__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                    <!--    'column_alias': 'company__ds__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                    <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
-                    <!--    'column_alias': 'company__ds__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                    <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
-                    <!--    'column_alias': 'company__ds__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                    <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),  -->
-                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),  -->
-                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                    <!--    'column_alias': 'company__ds__day'}                    -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                    <!--    'column_alias': 'company__ds__week'}                   -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
-                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                    <!--    'column_alias': 'company__ds__month'}                  -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                    <!--    'column_alias': 'company__ds__quarter'}                -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                    <!--    'column_alias': 'company__ds__year'}                   -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                    <!--    'column_alias': 'company__ds__extract_year'}           -->
+                    <!-- col18 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                    <!--    'column_alias': 'company__ds__extract_quarter'}        -->
+                    <!-- col19 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                    <!--    'column_alias': 'company__ds__extract_month'}          -->
+                    <!-- col20 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                    <!--    'column_alias': 'company__ds__extract_week'}           -->
+                    <!-- col21 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                    <!--    'column_alias': 'company__ds__extract_day'}            -->
+                    <!-- col22 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                    <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                    <!-- col23 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                    <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                    <!-- col24 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!-- col25 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!-- col26 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!-- col27 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!-- col28 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!-- col29 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                    <!--    'column_alias': 'user'}                                -->
+                    <!-- col30 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                    <!--    'column_alias': 'company__user'}                       -->
+                    <!-- col31 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                     <!-- where = None -->
@@ -126,11 +182,11 @@
                         <!-- node_id = ss_10006 -->
                         <!-- col0 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10132),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10068),  -->
                         <!--    'column_alias': 'txn_revenue'}                           -->
                         <!-- col1 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10133),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10069),  -->
                         <!--    'column_alias': 'ds__day'}                               -->
                         <!-- col2 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -148,33 +204,89 @@
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10067),  -->
                         <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col6 =                                                      -->
+                        <!-- col6 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10112),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col7 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10113),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col8 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10114),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col9 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10115),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col10 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10116),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col11 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10117),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!-- col12 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10118),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!-- col13 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10138),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10070),  -->
                         <!--    'column_alias': 'company__ds__day'}                      -->
-                        <!-- col7 =                                                -->
+                        <!-- col14 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10068),  -->
                         <!--    'column_alias': 'company__ds__week'}               -->
-                        <!-- col8 =                                                -->
+                        <!-- col15 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10069),  -->
                         <!--    'column_alias': 'company__ds__month'}              -->
-                        <!-- col9 =                                                -->
+                        <!-- col16 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10070),  -->
                         <!--    'column_alias': 'company__ds__quarter'}            -->
-                        <!-- col10 =                                               -->
+                        <!-- col17 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10071),  -->
                         <!--    'column_alias': 'company__ds__year'}               -->
-                        <!-- col11 =                                                     -->
+                        <!-- col18 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10119),  -->
+                        <!--    'column_alias': 'company__ds__extract_year'}     -->
+                        <!-- col19 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10120),  -->
+                        <!--    'column_alias': 'company__ds__extract_quarter'}  -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10121),  -->
+                        <!--    'column_alias': 'company__ds__extract_month'}    -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10122),  -->
+                        <!--    'column_alias': 'company__ds__extract_week'}     -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10123),  -->
+                        <!--    'column_alias': 'company__ds__extract_day'}      -->
+                        <!-- col23 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10124),    -->
+                        <!--    'column_alias': 'company__ds__extract_dayofweek'}  -->
+                        <!-- col24 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10125),    -->
+                        <!--    'column_alias': 'company__ds__extract_dayofyear'}  -->
+                        <!-- col25 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10143),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
                         <!--    'column_alias': 'user'}                                  -->
-                        <!-- col12 =                                                     -->
+                        <!-- col26 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10144),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10072),  -->
                         <!--    'column_alias': 'company__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
index 5c72bf678b..02d428e68a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_10 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
         <!--    'column_alias': 'trailing_2_months_revenue'}           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
@@ -24,7 +24,7 @@
                 <!-- node_id = ss_8 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
@@ -33,75 +33,131 @@
                     <!-- node_id = ss_7 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                    <!--    'column_alias': 'company__ds__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                    <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                    <!--    'column_alias': 'company__ds__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                    <!--    'column_alias': 'company__ds__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                    <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
-                    <!--    'column_alias': 'company__ds__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                    <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
-                    <!--    'column_alias': 'company__ds__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                    <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),  -->
-                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),  -->
-                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                    <!--    'column_alias': 'company__ds__day'}                    -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                    <!--    'column_alias': 'company__ds__week'}                   -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
-                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                    <!--    'column_alias': 'company__ds__month'}                  -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                    <!--    'column_alias': 'company__ds__quarter'}                -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                    <!--    'column_alias': 'company__ds__year'}                   -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                    <!--    'column_alias': 'company__ds__extract_year'}           -->
+                    <!-- col18 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                    <!--    'column_alias': 'company__ds__extract_quarter'}        -->
+                    <!-- col19 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                    <!--    'column_alias': 'company__ds__extract_month'}          -->
+                    <!-- col20 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                    <!--    'column_alias': 'company__ds__extract_week'}           -->
+                    <!-- col21 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                    <!--    'column_alias': 'company__ds__extract_day'}            -->
+                    <!-- col22 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                    <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                    <!-- col23 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                    <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                    <!-- col24 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!-- col25 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!-- col26 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!-- col27 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!-- col28 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!-- col29 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                    <!--    'column_alias': 'user'}                                -->
+                    <!-- col30 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                    <!--    'column_alias': 'company__user'}                       -->
+                    <!-- col31 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                     <!-- where = None -->
@@ -110,11 +166,11 @@
                         <!-- node_id = ss_10006 -->
                         <!-- col0 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10132),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10068),  -->
                         <!--    'column_alias': 'txn_revenue'}                           -->
                         <!-- col1 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10133),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10069),  -->
                         <!--    'column_alias': 'ds__day'}                               -->
                         <!-- col2 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -132,33 +188,89 @@
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10067),  -->
                         <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col6 =                                                      -->
+                        <!-- col6 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10112),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col7 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10113),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col8 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10114),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col9 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10115),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col10 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10116),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col11 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10117),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!-- col12 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10118),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!-- col13 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10138),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10070),  -->
                         <!--    'column_alias': 'company__ds__day'}                      -->
-                        <!-- col7 =                                                -->
+                        <!-- col14 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10068),  -->
                         <!--    'column_alias': 'company__ds__week'}               -->
-                        <!-- col8 =                                                -->
+                        <!-- col15 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10069),  -->
                         <!--    'column_alias': 'company__ds__month'}              -->
-                        <!-- col9 =                                                -->
+                        <!-- col16 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10070),  -->
                         <!--    'column_alias': 'company__ds__quarter'}            -->
-                        <!-- col10 =                                               -->
+                        <!-- col17 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10071),  -->
                         <!--    'column_alias': 'company__ds__year'}               -->
-                        <!-- col11 =                                                     -->
+                        <!-- col18 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10119),  -->
+                        <!--    'column_alias': 'company__ds__extract_year'}     -->
+                        <!-- col19 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10120),  -->
+                        <!--    'column_alias': 'company__ds__extract_quarter'}  -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10121),  -->
+                        <!--    'column_alias': 'company__ds__extract_month'}    -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10122),  -->
+                        <!--    'column_alias': 'company__ds__extract_week'}     -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10123),  -->
+                        <!--    'column_alias': 'company__ds__extract_day'}      -->
+                        <!-- col23 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10124),    -->
+                        <!--    'column_alias': 'company__ds__extract_dayofweek'}  -->
+                        <!-- col24 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10125),    -->
+                        <!--    'column_alias': 'company__ds__extract_dayofyear'}  -->
+                        <!-- col25 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10143),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
                         <!--    'column_alias': 'user'}                                  -->
-                        <!-- col12 =                                                     -->
+                        <!-- col26 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10144),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10072),  -->
                         <!--    'column_alias': 'company__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
index 2d6d46464a..a5c78af24a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_10 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
         <!--    'column_alias': 'ds__month'}                           -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
         <!--    'column_alias': 'revenue_all_time'}                    -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_9 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_8 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
                 <!--    'column_alias': 'ds__month'}                           -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
@@ -49,75 +49,131 @@
                     <!-- node_id = ss_7 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                    <!--    'column_alias': 'company__ds__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                    <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                    <!--    'column_alias': 'company__ds__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                    <!--    'column_alias': 'company__ds__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                    <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
-                    <!--    'column_alias': 'company__ds__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                    <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
-                    <!--    'column_alias': 'company__ds__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                    <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),  -->
-                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),  -->
-                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                    <!--    'column_alias': 'company__ds__day'}                    -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                    <!--    'column_alias': 'company__ds__week'}                   -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
-                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                    <!--    'column_alias': 'company__ds__month'}                  -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                    <!--    'column_alias': 'company__ds__quarter'}                -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                    <!--    'column_alias': 'company__ds__year'}                   -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                    <!--    'column_alias': 'company__ds__extract_year'}           -->
+                    <!-- col18 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                    <!--    'column_alias': 'company__ds__extract_quarter'}        -->
+                    <!-- col19 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                    <!--    'column_alias': 'company__ds__extract_month'}          -->
+                    <!-- col20 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                    <!--    'column_alias': 'company__ds__extract_week'}           -->
+                    <!-- col21 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                    <!--    'column_alias': 'company__ds__extract_day'}            -->
+                    <!-- col22 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                    <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                    <!-- col23 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                    <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                    <!-- col24 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!-- col25 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!-- col26 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!-- col27 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!-- col28 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!-- col29 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                    <!--    'column_alias': 'user'}                                -->
+                    <!-- col30 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                    <!--    'column_alias': 'company__user'}                       -->
+                    <!-- col31 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                     <!-- where = None -->
@@ -126,11 +182,11 @@
                         <!-- node_id = ss_10006 -->
                         <!-- col0 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10132),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10068),  -->
                         <!--    'column_alias': 'txn_revenue'}                           -->
                         <!-- col1 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10133),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10069),  -->
                         <!--    'column_alias': 'ds__day'}                               -->
                         <!-- col2 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -148,33 +204,89 @@
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10067),  -->
                         <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col6 =                                                      -->
+                        <!-- col6 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10112),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col7 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10113),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col8 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10114),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col9 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10115),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col10 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10116),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col11 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10117),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!-- col12 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10118),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!-- col13 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10138),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10070),  -->
                         <!--    'column_alias': 'company__ds__day'}                      -->
-                        <!-- col7 =                                                -->
+                        <!-- col14 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10068),  -->
                         <!--    'column_alias': 'company__ds__week'}               -->
-                        <!-- col8 =                                                -->
+                        <!-- col15 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10069),  -->
                         <!--    'column_alias': 'company__ds__month'}              -->
-                        <!-- col9 =                                                -->
+                        <!-- col16 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10070),  -->
                         <!--    'column_alias': 'company__ds__quarter'}            -->
-                        <!-- col10 =                                               -->
+                        <!-- col17 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10071),  -->
                         <!--    'column_alias': 'company__ds__year'}               -->
-                        <!-- col11 =                                                     -->
+                        <!-- col18 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10119),  -->
+                        <!--    'column_alias': 'company__ds__extract_year'}     -->
+                        <!-- col19 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10120),  -->
+                        <!--    'column_alias': 'company__ds__extract_quarter'}  -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10121),  -->
+                        <!--    'column_alias': 'company__ds__extract_month'}    -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10122),  -->
+                        <!--    'column_alias': 'company__ds__extract_week'}     -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10123),  -->
+                        <!--    'column_alias': 'company__ds__extract_day'}      -->
+                        <!-- col23 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10124),    -->
+                        <!--    'column_alias': 'company__ds__extract_dayofweek'}  -->
+                        <!-- col24 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10125),    -->
+                        <!--    'column_alias': 'company__ds__extract_dayofyear'}  -->
+                        <!-- col25 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10143),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
                         <!--    'column_alias': 'user'}                                  -->
-                        <!-- col12 =                                                     -->
+                        <!-- col26 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10144),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10072),  -->
                         <!--    'column_alias': 'company__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
index 397208997e..836bc1a09c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_13 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
         <!--    'column_alias': 'ds__month'}                           -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
         <!--    'column_alias': 'revenue_all_time'}                    -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_12 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_11 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                 <!--    'column_alias': 'ds__month'}                           -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                 <!-- where = None -->
@@ -50,75 +50,131 @@
                     <!-- node_id = ss_10 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                    <!--    'column_alias': 'company__ds__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                    <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                    <!--    'column_alias': 'company__ds__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                    <!--    'column_alias': 'company__ds__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                    <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                    <!--    'column_alias': 'company__ds__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                    <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                    <!--    'column_alias': 'company__ds__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                    <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
-                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                    <!--    'column_alias': 'company__ds__day'}                    -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
-                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                    <!--    'column_alias': 'company__ds__week'}                   -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
-                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                    <!--    'column_alias': 'company__ds__month'}                  -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                    <!--    'column_alias': 'company__ds__quarter'}                -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                    <!--    'column_alias': 'company__ds__year'}                   -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                    <!--    'column_alias': 'company__ds__extract_year'}           -->
+                    <!-- col18 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                    <!--    'column_alias': 'company__ds__extract_quarter'}        -->
+                    <!-- col19 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                    <!--    'column_alias': 'company__ds__extract_month'}          -->
+                    <!-- col20 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                    <!--    'column_alias': 'company__ds__extract_week'}           -->
+                    <!-- col21 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                    <!--    'column_alias': 'company__ds__extract_day'}            -->
+                    <!-- col22 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                    <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                    <!-- col23 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                    <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                    <!-- col24 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!-- col25 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!-- col26 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!-- col27 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!-- col28 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!-- col29 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                    <!--    'column_alias': 'user'}                                -->
+                    <!-- col30 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                    <!--    'column_alias': 'company__user'}                       -->
+                    <!-- col31 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                     <!-- where = SqlBetweenExpression(node_id=betw_1) -->
@@ -127,75 +183,131 @@
                         <!-- node_id = ss_9 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                        <!--    'column_alias': 'company__ds__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
+                        <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                        <!--    'column_alias': 'company__ds__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                        <!--    'column_alias': 'company__ds__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
+                        <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                        <!--    'column_alias': 'company__ds__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
+                        <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                        <!--    'column_alias': 'company__ds__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                        <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                        <!--    'column_alias': 'company__ds__day'}                    -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                        <!--    'column_alias': 'company__ds__week'}                   -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                        <!--    'column_alias': 'company__ds__month'}                  -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                        <!--    'column_alias': 'user'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                        <!--    'column_alias': 'company__ds__quarter'}                -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                        <!--    'column_alias': 'company__user'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                        <!--    'column_alias': 'company__ds__year'}                   -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                        <!--    'column_alias': 'company__ds__extract_year'}           -->
+                        <!-- col18 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                        <!--    'column_alias': 'company__ds__extract_quarter'}        -->
+                        <!-- col19 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
+                        <!--    'column_alias': 'company__ds__extract_month'}          -->
+                        <!-- col20 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
+                        <!--    'column_alias': 'company__ds__extract_week'}           -->
+                        <!-- col21 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                        <!--    'column_alias': 'company__ds__extract_day'}            -->
+                        <!-- col22 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                        <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                        <!-- col23 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                        <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                        <!-- col24 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!-- col25 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!-- col26 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!-- col27 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!-- col28 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!-- col29 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                        <!--    'column_alias': 'user'}                                -->
+                        <!-- col30 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                        <!--    'column_alias': 'company__user'}                       -->
+                        <!-- col31 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                         <!--    'column_alias': 'txn_revenue'}                         -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                         <!-- where = None -->
@@ -204,11 +316,11 @@
                             <!-- node_id = ss_10006 -->
                             <!-- col0 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10132),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10068),  -->
                             <!--    'column_alias': 'txn_revenue'}                           -->
                             <!-- col1 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10133),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10069),  -->
                             <!--    'column_alias': 'ds__day'}                               -->
                             <!-- col2 =                                                -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -226,33 +338,89 @@
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10067),  -->
                             <!--    'column_alias': 'ds__year'}                        -->
-                            <!-- col6 =                                                      -->
+                            <!-- col6 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10112),  -->
+                            <!--    'column_alias': 'ds__extract_year'}              -->
+                            <!-- col7 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10113),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}           -->
+                            <!-- col8 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10114),  -->
+                            <!--    'column_alias': 'ds__extract_month'}             -->
+                            <!-- col9 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10115),  -->
+                            <!--    'column_alias': 'ds__extract_week'}              -->
+                            <!-- col10 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10116),  -->
+                            <!--    'column_alias': 'ds__extract_day'}               -->
+                            <!-- col11 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10117),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!-- col12 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10118),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!-- col13 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10138),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10070),  -->
                             <!--    'column_alias': 'company__ds__day'}                      -->
-                            <!-- col7 =                                                -->
+                            <!-- col14 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10068),  -->
                             <!--    'column_alias': 'company__ds__week'}               -->
-                            <!-- col8 =                                                -->
+                            <!-- col15 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10069),  -->
                             <!--    'column_alias': 'company__ds__month'}              -->
-                            <!-- col9 =                                                -->
+                            <!-- col16 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10070),  -->
                             <!--    'column_alias': 'company__ds__quarter'}            -->
-                            <!-- col10 =                                               -->
+                            <!-- col17 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10071),  -->
                             <!--    'column_alias': 'company__ds__year'}               -->
-                            <!-- col11 =                                                     -->
+                            <!-- col18 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10119),  -->
+                            <!--    'column_alias': 'company__ds__extract_year'}     -->
+                            <!-- col19 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10120),  -->
+                            <!--    'column_alias': 'company__ds__extract_quarter'}  -->
+                            <!-- col20 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10121),  -->
+                            <!--    'column_alias': 'company__ds__extract_month'}    -->
+                            <!-- col21 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10122),  -->
+                            <!--    'column_alias': 'company__ds__extract_week'}     -->
+                            <!-- col22 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10123),  -->
+                            <!--    'column_alias': 'company__ds__extract_day'}      -->
+                            <!-- col23 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10124),    -->
+                            <!--    'column_alias': 'company__ds__extract_dayofweek'}  -->
+                            <!-- col24 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10125),    -->
+                            <!--    'column_alias': 'company__ds__extract_dayofyear'}  -->
+                            <!-- col25 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10143),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
                             <!--    'column_alias': 'user'}                                  -->
-                            <!-- col12 =                                                     -->
+                            <!-- col26 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10144),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10072),  -->
                             <!--    'column_alias': 'company__user'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
index 5ecd845045..db9917690c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_13 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
         <!--    'column_alias': 'ds__month'}                           -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
         <!--    'column_alias': 'trailing_2_months_revenue'}           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_12 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_11 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                 <!--    'column_alias': 'ds__month'}                           -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                 <!-- where = None -->
@@ -50,75 +50,131 @@
                     <!-- node_id = ss_10 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                    <!--    'column_alias': 'company__ds__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                    <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                    <!--    'column_alias': 'company__ds__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                    <!--    'column_alias': 'company__ds__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                    <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                    <!--    'column_alias': 'company__ds__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                    <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                    <!--    'column_alias': 'company__ds__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                    <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
-                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                    <!--    'column_alias': 'company__ds__day'}                    -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
-                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                    <!--    'column_alias': 'company__ds__week'}                   -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
-                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                    <!--    'column_alias': 'company__ds__month'}                  -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                    <!--    'column_alias': 'company__ds__quarter'}                -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                    <!--    'column_alias': 'company__ds__year'}                   -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                    <!--    'column_alias': 'company__ds__extract_year'}           -->
+                    <!-- col18 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                    <!--    'column_alias': 'company__ds__extract_quarter'}        -->
+                    <!-- col19 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                    <!--    'column_alias': 'company__ds__extract_month'}          -->
+                    <!-- col20 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                    <!--    'column_alias': 'company__ds__extract_week'}           -->
+                    <!-- col21 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                    <!--    'column_alias': 'company__ds__extract_day'}            -->
+                    <!-- col22 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                    <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                    <!-- col23 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                    <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                    <!-- col24 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!-- col25 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!-- col26 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!-- col27 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!-- col28 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!-- col29 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                    <!--    'column_alias': 'user'}                                -->
+                    <!-- col30 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                    <!--    'column_alias': 'company__user'}                       -->
+                    <!-- col31 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                     <!-- where = SqlBetweenExpression(node_id=betw_1) -->
@@ -127,75 +183,131 @@
                         <!-- node_id = ss_9 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                        <!--    'column_alias': 'company__ds__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
+                        <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                        <!--    'column_alias': 'company__ds__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                        <!--    'column_alias': 'company__ds__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
+                        <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                        <!--    'column_alias': 'company__ds__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
+                        <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                        <!--    'column_alias': 'company__ds__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                        <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                        <!--    'column_alias': 'company__ds__day'}                    -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                        <!--    'column_alias': 'company__ds__week'}                   -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                        <!--    'column_alias': 'company__ds__month'}                  -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                        <!--    'column_alias': 'user'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                        <!--    'column_alias': 'company__ds__quarter'}                -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                        <!--    'column_alias': 'company__user'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                        <!--    'column_alias': 'company__ds__year'}                   -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                        <!--    'column_alias': 'company__ds__extract_year'}           -->
+                        <!-- col18 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                        <!--    'column_alias': 'company__ds__extract_quarter'}        -->
+                        <!-- col19 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
+                        <!--    'column_alias': 'company__ds__extract_month'}          -->
+                        <!-- col20 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
+                        <!--    'column_alias': 'company__ds__extract_week'}           -->
+                        <!-- col21 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                        <!--    'column_alias': 'company__ds__extract_day'}            -->
+                        <!-- col22 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                        <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                        <!-- col23 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                        <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                        <!-- col24 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!-- col25 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!-- col26 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!-- col27 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!-- col28 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!-- col29 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                        <!--    'column_alias': 'user'}                                -->
+                        <!-- col30 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                        <!--    'column_alias': 'company__user'}                       -->
+                        <!-- col31 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                         <!--    'column_alias': 'txn_revenue'}                         -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                         <!-- where = None -->
@@ -204,11 +316,11 @@
                             <!-- node_id = ss_10006 -->
                             <!-- col0 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10132),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10068),  -->
                             <!--    'column_alias': 'txn_revenue'}                           -->
                             <!-- col1 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10133),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10069),  -->
                             <!--    'column_alias': 'ds__day'}                               -->
                             <!-- col2 =                                                -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -226,33 +338,89 @@
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10067),  -->
                             <!--    'column_alias': 'ds__year'}                        -->
-                            <!-- col6 =                                                      -->
+                            <!-- col6 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10112),  -->
+                            <!--    'column_alias': 'ds__extract_year'}              -->
+                            <!-- col7 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10113),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}           -->
+                            <!-- col8 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10114),  -->
+                            <!--    'column_alias': 'ds__extract_month'}             -->
+                            <!-- col9 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10115),  -->
+                            <!--    'column_alias': 'ds__extract_week'}              -->
+                            <!-- col10 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10116),  -->
+                            <!--    'column_alias': 'ds__extract_day'}               -->
+                            <!-- col11 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10117),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!-- col12 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10118),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!-- col13 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10138),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10070),  -->
                             <!--    'column_alias': 'company__ds__day'}                      -->
-                            <!-- col7 =                                                -->
+                            <!-- col14 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10068),  -->
                             <!--    'column_alias': 'company__ds__week'}               -->
-                            <!-- col8 =                                                -->
+                            <!-- col15 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10069),  -->
                             <!--    'column_alias': 'company__ds__month'}              -->
-                            <!-- col9 =                                                -->
+                            <!-- col16 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10070),  -->
                             <!--    'column_alias': 'company__ds__quarter'}            -->
-                            <!-- col10 =                                               -->
+                            <!-- col17 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10071),  -->
                             <!--    'column_alias': 'company__ds__year'}               -->
-                            <!-- col11 =                                                     -->
+                            <!-- col18 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10119),  -->
+                            <!--    'column_alias': 'company__ds__extract_year'}     -->
+                            <!-- col19 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10120),  -->
+                            <!--    'column_alias': 'company__ds__extract_quarter'}  -->
+                            <!-- col20 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10121),  -->
+                            <!--    'column_alias': 'company__ds__extract_month'}    -->
+                            <!-- col21 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10122),  -->
+                            <!--    'column_alias': 'company__ds__extract_week'}     -->
+                            <!-- col22 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10123),  -->
+                            <!--    'column_alias': 'company__ds__extract_day'}      -->
+                            <!-- col23 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10124),    -->
+                            <!--    'column_alias': 'company__ds__extract_dayofweek'}  -->
+                            <!-- col24 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10125),    -->
+                            <!--    'column_alias': 'company__ds__extract_dayofyear'}  -->
+                            <!-- col25 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10143),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
                             <!--    'column_alias': 'user'}                                  -->
-                            <!-- col12 =                                                     -->
+                            <!-- col26 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10144),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10072),  -->
                             <!--    'column_alias': 'company__user'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10006) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml
index e1fff36d2d..47028f82c6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_16 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                                              -->
         <!--   {'class': 'SqlSelectColumn',                                                                      -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
             <!--    'column_alias': 'ref_bookings'}                        -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                 <!--    'column_alias': 'ref_bookings'}                        -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_9 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                         <!--    'column_alias': 'referred_bookings'}                   -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -85,227 +85,395 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col53 =                                                   -->
+                            <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -322,27 +490,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col8 =                                                                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -350,31 +518,31 @@
                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                 <!-- col9 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                 <!-- col12 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                 <!-- col13 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -392,133 +560,301 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col20 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col21 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col22 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col23 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col24 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col25 =                                                     -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col38 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col26 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col27 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col28 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col29 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col30 =                                                     -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col31 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col32 =                                               -->
+                                <!-- col53 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col33 =                                               -->
+                                <!-- col54 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col34 =                                               -->
+                                <!-- col55 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col35 =                                               -->
+                                <!-- col56 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col36 =                                                     -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col63 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col37 =                                               -->
+                                <!-- col65 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col38 =                                               -->
+                                <!-- col66 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col39 =                                                 -->
+                                <!-- col67 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col40 =                                               -->
+                                <!-- col68 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col41 =                                                     -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col75 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col42 =                                               -->
+                                <!-- col77 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col43 =                                               -->
+                                <!-- col78 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col44 =                                               -->
+                                <!-- col79 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col45 =                                               -->
+                                <!-- col80 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col46 =                                                     -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col87 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col47 =                                                     -->
+                                <!-- col89 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col48 =                                                     -->
+                                <!-- col90 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col49 =                                                     -->
+                                <!-- col91 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col50 =                                                     -->
+                                <!-- col92 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col51 =                                                     -->
+                                <!-- col93 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
@@ -537,11 +873,11 @@
                 <!-- node_id = ss_14 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
@@ -550,7 +886,7 @@
                     <!-- node_id = ss_13 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -559,7 +895,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -569,11 +905,11 @@
                         <!-- node_id = ss_12 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_357),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
@@ -582,227 +918,395 @@
                             <!-- node_id = ss_11 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col53 =                                                   -->
+                            <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -819,27 +1323,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col8 =                                                                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -847,31 +1351,31 @@
                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                 <!-- col9 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                 <!-- col12 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                 <!-- col13 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -889,133 +1393,301 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col20 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col21 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col22 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col23 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col24 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col25 =                                                     -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col38 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col26 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col27 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col28 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col29 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col30 =                                                     -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col31 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col32 =                                               -->
+                                <!-- col53 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col33 =                                               -->
+                                <!-- col54 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col34 =                                               -->
+                                <!-- col55 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col35 =                                               -->
+                                <!-- col56 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col36 =                                                     -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col63 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col37 =                                               -->
+                                <!-- col65 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col38 =                                               -->
+                                <!-- col66 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col39 =                                                 -->
+                                <!-- col67 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col40 =                                               -->
+                                <!-- col68 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col41 =                                                     -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col75 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col42 =                                               -->
+                                <!-- col77 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col43 =                                               -->
+                                <!-- col78 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col44 =                                               -->
+                                <!-- col79 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col45 =                                               -->
+                                <!-- col80 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col46 =                                                     -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col87 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col47 =                                                     -->
+                                <!-- col89 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col48 =                                                     -->
+                                <!-- col90 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col49 =                                                     -->
+                                <!-- col91 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col50 =                                                     -->
+                                <!-- col92 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col51 =                                                     -->
+                                <!-- col93 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml
index b79bb65ee4..9b112de652 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_18 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_423),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                                         -->
         <!--   {'class': 'SqlSelectColumn',                                                                 -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_419),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_420),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
             <!--    'column_alias': 'bookings_at_start_of_month'}          -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_9 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -85,227 +85,395 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col53 =                                                   -->
+                            <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -322,27 +490,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col8 =                                                                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -350,31 +518,31 @@
                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                 <!-- col9 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                 <!-- col12 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                 <!-- col13 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -392,133 +560,301 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col20 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col21 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col22 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col23 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col24 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col25 =                                                     -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col38 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col26 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col27 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col28 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col29 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col30 =                                                     -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col31 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col32 =                                               -->
+                                <!-- col53 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col33 =                                               -->
+                                <!-- col54 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col34 =                                               -->
+                                <!-- col55 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col35 =                                               -->
+                                <!-- col56 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col36 =                                                     -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col63 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col37 =                                               -->
+                                <!-- col65 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col38 =                                               -->
+                                <!-- col66 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col39 =                                                 -->
+                                <!-- col67 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col40 =                                               -->
+                                <!-- col68 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col41 =                                                     -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col75 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col42 =                                               -->
+                                <!-- col77 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col43 =                                               -->
+                                <!-- col78 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col44 =                                               -->
+                                <!-- col79 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col45 =                                               -->
+                                <!-- col80 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col46 =                                                     -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col87 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col47 =                                                     -->
+                                <!-- col89 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col48 =                                                     -->
+                                <!-- col90 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col49 =                                                     -->
+                                <!-- col91 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col50 =                                                     -->
+                                <!-- col92 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col51 =                                                     -->
+                                <!-- col93 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
@@ -537,11 +873,11 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_416),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                 <!--    'column_alias': 'bookings_at_start_of_month'}          -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -550,7 +886,7 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -559,7 +895,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -569,11 +905,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_412),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -582,211 +918,379 @@
                             <!-- node_id = ss_13 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_410),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_375),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_376),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_377),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_378),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_379),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_407),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_408),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_372),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_373),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_362),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_363),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_367),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_369),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!-- col50 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!-- col51 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!-- col52 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!-- col53 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col54 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col55 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col56 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col57 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col60 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col72 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col50 =                                                         -->
+                            <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col51 =                                                       -->
+                            <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                             <!-- join_0 =                                                    -->
@@ -801,7 +1305,7 @@
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -816,227 +1320,395 @@
                                 <!-- node_id = ss_11 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                                <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                                <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                                <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                                <!--    'column_alias': 'paid_at__day'}                        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                                <!--    'column_alias': 'paid_at__week'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                                <!--    'column_alias': 'paid_at__month'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                                <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                                <!--    'column_alias': 'paid_at__year'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                                <!--    'column_alias': 'booking__ds__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                                <!--    'column_alias': 'booking__ds__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                                <!--    'column_alias': 'booking__ds__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                                <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
-                                <!--    'column_alias': 'booking__ds__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
-                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
-                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
-                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
-                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
-                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
-                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
-                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
-                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
-                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
-                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                                <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!-- col53 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col54 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col55 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col56 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col57 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col58 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col59 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col60 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!-- col61 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!-- col62 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!-- col63 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!-- col64 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!-- col65 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                <!-- col66 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                <!-- col67 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                <!-- col68 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                <!-- col69 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                <!-- col70 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col71 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col72 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!-- col73 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!-- col74 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!-- col75 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!-- col76 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!-- col77 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                                <!--    'column_alias': 'listing'}                             -->
+                                <!-- col78 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
+                                <!--    'column_alias': 'guest'}                               -->
+                                <!-- col79 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                                <!--    'column_alias': 'host'}                                -->
+                                <!-- col80 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!-- col81 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!-- col82 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!-- col83 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!-- col84 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!-- col85 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
+                                <!-- col86 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!-- col87 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!-- col88 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col89 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col90 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col91 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col92 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col93 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col94 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                   -->
-                                <!-- col53 =                                                   -->
+                                <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col54 =                                                         -->
+                                <!-- col96 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col55 =                                                       -->
+                                <!-- col97 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
@@ -1053,27 +1725,27 @@
                                     <!--    'column_alias': 'instant_bookings'}                                                              -->
                                     <!-- col2 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                     <!--    'column_alias': 'booking_value'}                         -->
                                     <!-- col3 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                     <!--    'column_alias': 'max_booking_value'}                     -->
                                     <!-- col4 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                     <!--    'column_alias': 'min_booking_value'}                     -->
                                     <!-- col5 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                     <!--    'column_alias': 'bookers'}                               -->
                                     <!-- col6 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                     <!--    'column_alias': 'average_booking_value'}                 -->
                                     <!-- col7 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                     <!--    'column_alias': 'booking_payments'}                      -->
                                     <!-- col8 =                                                                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -1081,31 +1753,31 @@
                                     <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                     <!-- col9 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                     <!--    'column_alias': 'median_booking_value'}                  -->
                                     <!-- col10 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                     -->
                                     <!-- col11 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                     <!-- col12 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                     <!-- col13 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- col14 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                     <!--    'column_alias': 'is_instant'}                            -->
                                     <!-- col15 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                     <!--    'column_alias': 'ds__day'}                               -->
                                     <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -1123,133 +1795,301 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                     <!--    'column_alias': 'ds__year'}                        -->
-                                    <!-- col20 =                                                     -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}              -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}             -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}              -->
+                                    <!-- col24 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}               -->
+                                    <!-- col25 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!-- col26 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                    <!-- col21 =                                               -->
+                                    <!-- col28 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                    <!-- col22 =                                               -->
+                                    <!-- col29 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                    <!-- col23 =                                               -->
+                                    <!-- col30 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                    <!-- col24 =                                               -->
+                                    <!-- col31 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                    <!-- col25 =                                                     -->
+                                    <!-- col32 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                    <!-- col33 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                    <!-- col34 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                    <!-- col35 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                    <!-- col36 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                    <!-- col37 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col38 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                     <!--    'column_alias': 'paid_at__day'}                          -->
-                                    <!-- col26 =                                               -->
+                                    <!-- col40 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                     <!--    'column_alias': 'paid_at__week'}                   -->
-                                    <!-- col27 =                                               -->
+                                    <!-- col41 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                     <!--    'column_alias': 'paid_at__month'}                  -->
-                                    <!-- col28 =                                               -->
+                                    <!-- col42 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                -->
-                                    <!-- col29 =                                               -->
+                                    <!-- col43 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                     <!--    'column_alias': 'paid_at__year'}                   -->
-                                    <!-- col30 =                                                     -->
+                                    <!-- col44 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                    <!-- col45 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                    <!-- col46 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                    <!-- col47 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                    <!-- col48 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                    <!-- col49 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!-- col50 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                     <!--    'column_alias': 'booking__is_instant'}                   -->
-                                    <!-- col31 =                                                     -->
+                                    <!-- col52 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                      -->
-                                    <!-- col32 =                                               -->
+                                    <!-- col53 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                     <!--    'column_alias': 'booking__ds__week'}               -->
-                                    <!-- col33 =                                               -->
+                                    <!-- col54 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                     <!--    'column_alias': 'booking__ds__month'}              -->
-                                    <!-- col34 =                                               -->
+                                    <!-- col55 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                    <!-- col35 =                                               -->
+                                    <!-- col56 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                     <!--    'column_alias': 'booking__ds__year'}               -->
-                                    <!-- col36 =                                                     -->
+                                    <!-- col57 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                    <!-- col58 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                    <!-- col59 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                    <!-- col60 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                    <!-- col61 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                    <!-- col62 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                    <!-- col63 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                    <!-- col37 =                                               -->
+                                    <!-- col65 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                    <!-- col38 =                                               -->
+                                    <!-- col66 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                    <!-- col39 =                                                 -->
+                                    <!-- col67 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                    <!-- col40 =                                               -->
+                                    <!-- col68 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                    <!-- col41 =                                                     -->
+                                    <!-- col69 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col70 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col71 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col72 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col73 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col74 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col75 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                    <!-- col42 =                                               -->
+                                    <!-- col77 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                    <!-- col43 =                                               -->
+                                    <!-- col78 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                    <!-- col44 =                                               -->
+                                    <!-- col79 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                    <!-- col45 =                                               -->
+                                    <!-- col80 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                    <!-- col46 =                                                     -->
+                                    <!-- col81 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                    <!-- col82 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                    <!-- col83 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                    <!-- col84 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                    <!-- col85 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                    <!-- col86 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col87 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                     <!--    'column_alias': 'listing'}                               -->
-                                    <!-- col47 =                                                     -->
+                                    <!-- col89 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                     <!--    'column_alias': 'guest'}                                 -->
-                                    <!-- col48 =                                                     -->
+                                    <!-- col90 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                     <!--    'column_alias': 'host'}                                  -->
-                                    <!-- col49 =                                                     -->
+                                    <!-- col91 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                     <!--    'column_alias': 'booking__listing'}                      -->
-                                    <!-- col50 =                                                     -->
+                                    <!-- col92 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                     <!--    'column_alias': 'booking__guest'}                        -->
-                                    <!-- col51 =                                                     -->
+                                    <!-- col93 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml
index d83dd52e3e..50437f494c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_18 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_423),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
         <!--    'column_alias': 'metric_time__week'}                   -->
         <!-- col1 =                                                                                         -->
         <!--   {'class': 'SqlSelectColumn',                                                                 -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__week'}                                           -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_419),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_420),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
             <!--    'column_alias': 'bookings_at_start_of_month'}          -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                 <!--    'column_alias': 'metric_time__week'}                   -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_9 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                         <!--    'column_alias': 'metric_time__week'}                   -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -85,227 +85,395 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col53 =                                                   -->
+                            <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -322,27 +490,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col8 =                                                                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -350,31 +518,31 @@
                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                 <!-- col9 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                 <!-- col12 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                 <!-- col13 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -392,133 +560,301 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col20 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col21 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col22 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col23 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col24 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col25 =                                                     -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col38 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col26 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col27 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col28 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col29 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col30 =                                                     -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col31 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col32 =                                               -->
+                                <!-- col53 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col33 =                                               -->
+                                <!-- col54 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col34 =                                               -->
+                                <!-- col55 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col35 =                                               -->
+                                <!-- col56 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col36 =                                                     -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col63 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col37 =                                               -->
+                                <!-- col65 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col38 =                                               -->
+                                <!-- col66 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col39 =                                                 -->
+                                <!-- col67 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col40 =                                               -->
+                                <!-- col68 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col41 =                                                     -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col75 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col42 =                                               -->
+                                <!-- col77 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col43 =                                               -->
+                                <!-- col78 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col44 =                                               -->
+                                <!-- col79 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col45 =                                               -->
+                                <!-- col80 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col46 =                                                     -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col87 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col47 =                                                     -->
+                                <!-- col89 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col48 =                                                     -->
+                                <!-- col90 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col49 =                                                     -->
+                                <!-- col91 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col50 =                                                     -->
+                                <!-- col92 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col51 =                                                     -->
+                                <!-- col93 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
@@ -537,11 +873,11 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                 <!--    'column_alias': 'metric_time__week'}                   -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_416),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                 <!--    'column_alias': 'bookings_at_start_of_month'}          -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -550,7 +886,7 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -559,7 +895,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -569,11 +905,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_412),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                         <!--    'column_alias': 'metric_time__week'}                   -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -586,207 +922,375 @@
                             <!--    'column_alias': 'metric_time__week'}           -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_375),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_376),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_377),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_378),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_379),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_407),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_408),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_372),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_373),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_362),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_363),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_367),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_369),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!-- col50 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!-- col51 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!-- col52 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!-- col53 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col54 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col55 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col56 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col57 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col60 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col72 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col50 =                                                         -->
+                            <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col51 =                                                       -->
+                            <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                             <!-- join_0 =                                                    -->
@@ -801,7 +1305,7 @@
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -816,227 +1320,395 @@
                                 <!-- node_id = ss_11 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                                <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                                <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                                <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                                <!--    'column_alias': 'paid_at__day'}                        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                                <!--    'column_alias': 'paid_at__week'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                                <!--    'column_alias': 'paid_at__month'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                                <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                                <!--    'column_alias': 'paid_at__year'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                                <!--    'column_alias': 'booking__ds__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                                <!--    'column_alias': 'booking__ds__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                                <!--    'column_alias': 'booking__ds__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                                <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
-                                <!--    'column_alias': 'booking__ds__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
-                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
-                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
-                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
-                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
-                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
-                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
-                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
-                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
-                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
-                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                                <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!-- col53 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col54 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col55 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col56 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col57 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col58 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col59 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col60 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!-- col61 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!-- col62 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!-- col63 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!-- col64 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!-- col65 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                <!-- col66 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                <!-- col67 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                <!-- col68 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                <!-- col69 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                <!-- col70 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col71 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col72 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!-- col73 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!-- col74 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!-- col75 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!-- col76 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!-- col77 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                                <!--    'column_alias': 'listing'}                             -->
+                                <!-- col78 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
+                                <!--    'column_alias': 'guest'}                               -->
+                                <!-- col79 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                                <!--    'column_alias': 'host'}                                -->
+                                <!-- col80 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!-- col81 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!-- col82 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!-- col83 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!-- col84 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!-- col85 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
+                                <!-- col86 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!-- col87 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!-- col88 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col89 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col90 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col91 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col92 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col93 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col94 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                   -->
-                                <!-- col53 =                                                   -->
+                                <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col54 =                                                         -->
+                                <!-- col96 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col55 =                                                       -->
+                                <!-- col97 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
@@ -1053,27 +1725,27 @@
                                     <!--    'column_alias': 'instant_bookings'}                                                              -->
                                     <!-- col2 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                     <!--    'column_alias': 'booking_value'}                         -->
                                     <!-- col3 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                     <!--    'column_alias': 'max_booking_value'}                     -->
                                     <!-- col4 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                     <!--    'column_alias': 'min_booking_value'}                     -->
                                     <!-- col5 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                     <!--    'column_alias': 'bookers'}                               -->
                                     <!-- col6 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                     <!--    'column_alias': 'average_booking_value'}                 -->
                                     <!-- col7 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                     <!--    'column_alias': 'booking_payments'}                      -->
                                     <!-- col8 =                                                                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -1081,31 +1753,31 @@
                                     <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                     <!-- col9 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                     <!--    'column_alias': 'median_booking_value'}                  -->
                                     <!-- col10 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                     -->
                                     <!-- col11 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                     <!-- col12 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                     <!-- col13 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- col14 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                     <!--    'column_alias': 'is_instant'}                            -->
                                     <!-- col15 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                     <!--    'column_alias': 'ds__day'}                               -->
                                     <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -1123,133 +1795,301 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                     <!--    'column_alias': 'ds__year'}                        -->
-                                    <!-- col20 =                                                     -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}              -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}             -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}              -->
+                                    <!-- col24 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}               -->
+                                    <!-- col25 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!-- col26 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                    <!-- col21 =                                               -->
+                                    <!-- col28 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                    <!-- col22 =                                               -->
+                                    <!-- col29 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                    <!-- col23 =                                               -->
+                                    <!-- col30 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                    <!-- col24 =                                               -->
+                                    <!-- col31 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                    <!-- col25 =                                                     -->
+                                    <!-- col32 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                    <!-- col33 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                    <!-- col34 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                    <!-- col35 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                    <!-- col36 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                    <!-- col37 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col38 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                     <!--    'column_alias': 'paid_at__day'}                          -->
-                                    <!-- col26 =                                               -->
+                                    <!-- col40 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                     <!--    'column_alias': 'paid_at__week'}                   -->
-                                    <!-- col27 =                                               -->
+                                    <!-- col41 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                     <!--    'column_alias': 'paid_at__month'}                  -->
-                                    <!-- col28 =                                               -->
+                                    <!-- col42 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                -->
-                                    <!-- col29 =                                               -->
+                                    <!-- col43 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                     <!--    'column_alias': 'paid_at__year'}                   -->
-                                    <!-- col30 =                                                     -->
+                                    <!-- col44 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                    <!-- col45 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                    <!-- col46 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                    <!-- col47 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                    <!-- col48 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                    <!-- col49 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!-- col50 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                     <!--    'column_alias': 'booking__is_instant'}                   -->
-                                    <!-- col31 =                                                     -->
+                                    <!-- col52 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                      -->
-                                    <!-- col32 =                                               -->
+                                    <!-- col53 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                     <!--    'column_alias': 'booking__ds__week'}               -->
-                                    <!-- col33 =                                               -->
+                                    <!-- col54 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                     <!--    'column_alias': 'booking__ds__month'}              -->
-                                    <!-- col34 =                                               -->
+                                    <!-- col55 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                    <!-- col35 =                                               -->
+                                    <!-- col56 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                     <!--    'column_alias': 'booking__ds__year'}               -->
-                                    <!-- col36 =                                                     -->
+                                    <!-- col57 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                    <!-- col58 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                    <!-- col59 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                    <!-- col60 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                    <!-- col61 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                    <!-- col62 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                    <!-- col63 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                    <!-- col37 =                                               -->
+                                    <!-- col65 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                    <!-- col38 =                                               -->
+                                    <!-- col66 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                    <!-- col39 =                                                 -->
+                                    <!-- col67 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                    <!-- col40 =                                               -->
+                                    <!-- col68 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                    <!-- col41 =                                                     -->
+                                    <!-- col69 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col70 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col71 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col72 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col73 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col74 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col75 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                    <!-- col42 =                                               -->
+                                    <!-- col77 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                    <!-- col43 =                                               -->
+                                    <!-- col78 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                    <!-- col44 =                                               -->
+                                    <!-- col79 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                    <!-- col45 =                                               -->
+                                    <!-- col80 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                    <!-- col46 =                                                     -->
+                                    <!-- col81 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                    <!-- col82 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                    <!-- col83 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                    <!-- col84 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                    <!-- col85 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                    <!-- col86 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col87 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                     <!--    'column_alias': 'listing'}                               -->
-                                    <!-- col47 =                                                     -->
+                                    <!-- col89 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                     <!--    'column_alias': 'guest'}                                 -->
-                                    <!-- col48 =                                                     -->
+                                    <!-- col90 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                     <!--    'column_alias': 'host'}                                  -->
-                                    <!-- col49 =                                                     -->
+                                    <!-- col91 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                     <!--    'column_alias': 'booking__listing'}                      -->
-                                    <!-- col50 =                                                     -->
+                                    <!-- col92 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                     <!--    'column_alias': 'booking__guest'}                        -->
-                                    <!-- col51 =                                                     -->
+                                    <!-- col93 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml
index aaebb9841d..c61572cec8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_18 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_423),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                                   -->
         <!--   {'class': 'SqlSelectColumn',                                                           -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_419),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_420),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
             <!--    'column_alias': 'bookings_2_weeks_ago'}                -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_9 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -85,227 +85,395 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col53 =                                                   -->
+                            <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -322,27 +490,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col8 =                                                                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -350,31 +518,31 @@
                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                 <!-- col9 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                 <!-- col12 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                 <!-- col13 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -392,133 +560,301 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col20 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col21 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col22 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col23 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col24 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col25 =                                                     -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col38 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col26 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col27 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col28 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col29 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col30 =                                                     -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col31 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col32 =                                               -->
+                                <!-- col53 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col33 =                                               -->
+                                <!-- col54 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col34 =                                               -->
+                                <!-- col55 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col35 =                                               -->
+                                <!-- col56 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col36 =                                                     -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col63 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col37 =                                               -->
+                                <!-- col65 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col38 =                                               -->
+                                <!-- col66 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col39 =                                                 -->
+                                <!-- col67 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col40 =                                               -->
+                                <!-- col68 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col41 =                                                     -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col75 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col42 =                                               -->
+                                <!-- col77 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col43 =                                               -->
+                                <!-- col78 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col44 =                                               -->
+                                <!-- col79 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col45 =                                               -->
+                                <!-- col80 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col46 =                                                     -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col87 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col47 =                                                     -->
+                                <!-- col89 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col48 =                                                     -->
+                                <!-- col90 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col49 =                                                     -->
+                                <!-- col91 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col50 =                                                     -->
+                                <!-- col92 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col51 =                                                     -->
+                                <!-- col93 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
@@ -537,11 +873,11 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_416),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                 <!--    'column_alias': 'bookings_2_weeks_ago'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -550,7 +886,7 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -559,7 +895,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -569,11 +905,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_412),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -582,211 +918,379 @@
                             <!-- node_id = ss_13 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_410),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_375),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_376),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_377),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_378),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_379),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_407),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_408),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_372),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_373),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_362),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_363),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_367),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_369),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!-- col50 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!-- col51 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!-- col52 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!-- col53 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col54 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col55 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col56 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col57 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col60 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col72 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col50 =                                                         -->
+                            <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col51 =                                                       -->
+                            <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                             <!-- join_0 =                                                    -->
@@ -801,7 +1305,7 @@
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -816,227 +1320,395 @@
                                 <!-- node_id = ss_11 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                                <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                                <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                                <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                                <!--    'column_alias': 'paid_at__day'}                        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                                <!--    'column_alias': 'paid_at__week'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                                <!--    'column_alias': 'paid_at__month'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                                <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                                <!--    'column_alias': 'paid_at__year'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                                <!--    'column_alias': 'booking__ds__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                                <!--    'column_alias': 'booking__ds__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                                <!--    'column_alias': 'booking__ds__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                                <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
-                                <!--    'column_alias': 'booking__ds__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
-                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
-                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
-                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
-                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
-                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
-                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
-                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
-                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
-                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
-                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                                <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!-- col53 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col54 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col55 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col56 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col57 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col58 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col59 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col60 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!-- col61 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!-- col62 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!-- col63 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!-- col64 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!-- col65 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                <!-- col66 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                <!-- col67 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                <!-- col68 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                <!-- col69 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                <!-- col70 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col71 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col72 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!-- col73 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!-- col74 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!-- col75 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!-- col76 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!-- col77 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                                <!--    'column_alias': 'listing'}                             -->
+                                <!-- col78 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
+                                <!--    'column_alias': 'guest'}                               -->
+                                <!-- col79 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                                <!--    'column_alias': 'host'}                                -->
+                                <!-- col80 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!-- col81 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!-- col82 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!-- col83 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!-- col84 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!-- col85 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
+                                <!-- col86 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!-- col87 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!-- col88 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col89 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col90 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col91 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col92 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col93 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col94 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                   -->
-                                <!-- col53 =                                                   -->
+                                <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col54 =                                                         -->
+                                <!-- col96 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col55 =                                                       -->
+                                <!-- col97 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
@@ -1053,27 +1725,27 @@
                                     <!--    'column_alias': 'instant_bookings'}                                                              -->
                                     <!-- col2 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                     <!--    'column_alias': 'booking_value'}                         -->
                                     <!-- col3 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                     <!--    'column_alias': 'max_booking_value'}                     -->
                                     <!-- col4 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                     <!--    'column_alias': 'min_booking_value'}                     -->
                                     <!-- col5 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                     <!--    'column_alias': 'bookers'}                               -->
                                     <!-- col6 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                     <!--    'column_alias': 'average_booking_value'}                 -->
                                     <!-- col7 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                     <!--    'column_alias': 'booking_payments'}                      -->
                                     <!-- col8 =                                                                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -1081,31 +1753,31 @@
                                     <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                     <!-- col9 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                     <!--    'column_alias': 'median_booking_value'}                  -->
                                     <!-- col10 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                     -->
                                     <!-- col11 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                     <!-- col12 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                     <!-- col13 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- col14 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                     <!--    'column_alias': 'is_instant'}                            -->
                                     <!-- col15 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                     <!--    'column_alias': 'ds__day'}                               -->
                                     <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -1123,133 +1795,301 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                     <!--    'column_alias': 'ds__year'}                        -->
-                                    <!-- col20 =                                                     -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}              -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}             -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}              -->
+                                    <!-- col24 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}               -->
+                                    <!-- col25 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!-- col26 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                    <!-- col21 =                                               -->
+                                    <!-- col28 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                    <!-- col22 =                                               -->
+                                    <!-- col29 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                    <!-- col23 =                                               -->
+                                    <!-- col30 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                    <!-- col24 =                                               -->
+                                    <!-- col31 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                    <!-- col25 =                                                     -->
+                                    <!-- col32 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                    <!-- col33 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                    <!-- col34 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                    <!-- col35 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                    <!-- col36 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                    <!-- col37 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col38 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                     <!--    'column_alias': 'paid_at__day'}                          -->
-                                    <!-- col26 =                                               -->
+                                    <!-- col40 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                     <!--    'column_alias': 'paid_at__week'}                   -->
-                                    <!-- col27 =                                               -->
+                                    <!-- col41 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                     <!--    'column_alias': 'paid_at__month'}                  -->
-                                    <!-- col28 =                                               -->
+                                    <!-- col42 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                -->
-                                    <!-- col29 =                                               -->
+                                    <!-- col43 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                     <!--    'column_alias': 'paid_at__year'}                   -->
-                                    <!-- col30 =                                                     -->
+                                    <!-- col44 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                    <!-- col45 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                    <!-- col46 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                    <!-- col47 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                    <!-- col48 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                    <!-- col49 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!-- col50 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                     <!--    'column_alias': 'booking__is_instant'}                   -->
-                                    <!-- col31 =                                                     -->
+                                    <!-- col52 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                      -->
-                                    <!-- col32 =                                               -->
+                                    <!-- col53 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                     <!--    'column_alias': 'booking__ds__week'}               -->
-                                    <!-- col33 =                                               -->
+                                    <!-- col54 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                     <!--    'column_alias': 'booking__ds__month'}              -->
-                                    <!-- col34 =                                               -->
+                                    <!-- col55 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                    <!-- col35 =                                               -->
+                                    <!-- col56 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                     <!--    'column_alias': 'booking__ds__year'}               -->
-                                    <!-- col36 =                                                     -->
+                                    <!-- col57 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                    <!-- col58 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                    <!-- col59 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                    <!-- col60 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                    <!-- col61 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                    <!-- col62 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                    <!-- col63 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                    <!-- col37 =                                               -->
+                                    <!-- col65 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                    <!-- col38 =                                               -->
+                                    <!-- col66 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                    <!-- col39 =                                                 -->
+                                    <!-- col67 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                    <!-- col40 =                                               -->
+                                    <!-- col68 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                    <!-- col41 =                                                     -->
+                                    <!-- col69 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col70 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col71 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col72 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col73 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col74 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col75 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                    <!-- col42 =                                               -->
+                                    <!-- col77 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                    <!-- col43 =                                               -->
+                                    <!-- col78 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                    <!-- col44 =                                               -->
+                                    <!-- col79 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                    <!-- col45 =                                               -->
+                                    <!-- col80 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                    <!-- col46 =                                                     -->
+                                    <!-- col81 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                    <!-- col82 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                    <!-- col83 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                    <!-- col84 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                    <!-- col85 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                    <!-- col86 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col87 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                     <!--    'column_alias': 'listing'}                               -->
-                                    <!-- col47 =                                                     -->
+                                    <!-- col89 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                     <!--    'column_alias': 'guest'}                                 -->
-                                    <!-- col48 =                                                     -->
+                                    <!-- col90 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                     <!--    'column_alias': 'host'}                                  -->
-                                    <!-- col49 =                                                     -->
+                                    <!-- col91 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                     <!--    'column_alias': 'booking__listing'}                      -->
-                                    <!-- col50 =                                                     -->
+                                    <!-- col92 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                     <!--    'column_alias': 'booking__guest'}                        -->
-                                    <!-- col51 =                                                     -->
+                                    <!-- col93 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml
index 3d9f926162..ab7df49f61 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_18 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_423),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
         <!--    'column_alias': 'metric_time__quarter'}                -->
         <!-- col1 =                                                                                   -->
         <!--   {'class': 'SqlSelectColumn',                                                           -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__quarter'}                                        -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_419),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_420),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
             <!--    'column_alias': 'bookings_2_weeks_ago'}                -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                 <!--    'column_alias': 'metric_time__quarter'}                -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_9 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                         <!--    'column_alias': 'metric_time__quarter'}                -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -85,227 +85,395 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col53 =                                                   -->
+                            <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -322,27 +490,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col8 =                                                                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -350,31 +518,31 @@
                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                 <!-- col9 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                 <!-- col12 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                 <!-- col13 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -392,133 +560,301 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col20 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col21 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col22 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col23 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col24 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col25 =                                                     -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col38 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col26 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col27 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col28 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col29 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col30 =                                                     -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col31 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col32 =                                               -->
+                                <!-- col53 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col33 =                                               -->
+                                <!-- col54 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col34 =                                               -->
+                                <!-- col55 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col35 =                                               -->
+                                <!-- col56 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col36 =                                                     -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col63 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col37 =                                               -->
+                                <!-- col65 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col38 =                                               -->
+                                <!-- col66 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col39 =                                                 -->
+                                <!-- col67 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col40 =                                               -->
+                                <!-- col68 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col41 =                                                     -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col75 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col42 =                                               -->
+                                <!-- col77 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col43 =                                               -->
+                                <!-- col78 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col44 =                                               -->
+                                <!-- col79 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col45 =                                               -->
+                                <!-- col80 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col46 =                                                     -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col87 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col47 =                                                     -->
+                                <!-- col89 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col48 =                                                     -->
+                                <!-- col90 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col49 =                                                     -->
+                                <!-- col91 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col50 =                                                     -->
+                                <!-- col92 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col51 =                                                     -->
+                                <!-- col93 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
@@ -537,11 +873,11 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                 <!--    'column_alias': 'metric_time__quarter'}                -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_416),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                 <!--    'column_alias': 'bookings_2_weeks_ago'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -550,7 +886,7 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -559,7 +895,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -569,11 +905,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_412),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                         <!--    'column_alias': 'metric_time__quarter'}                -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -586,207 +922,375 @@
                             <!--    'column_alias': 'metric_time__quarter'}        -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_375),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_376),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_377),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_378),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_379),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_407),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_408),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_372),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_373),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_362),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_363),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_367),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_369),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!-- col50 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!-- col51 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!-- col52 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!-- col53 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col54 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col55 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col56 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col57 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col60 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col72 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col50 =                                                         -->
+                            <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col51 =                                                       -->
+                            <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                             <!-- join_0 =                                                    -->
@@ -801,7 +1305,7 @@
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -816,227 +1320,395 @@
                                 <!-- node_id = ss_11 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                                <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                                <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                                <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                                <!--    'column_alias': 'paid_at__day'}                        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                                <!--    'column_alias': 'paid_at__week'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                                <!--    'column_alias': 'paid_at__month'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                                <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                                <!--    'column_alias': 'paid_at__year'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                                <!--    'column_alias': 'booking__ds__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                                <!--    'column_alias': 'booking__ds__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                                <!--    'column_alias': 'booking__ds__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                                <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
-                                <!--    'column_alias': 'booking__ds__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
-                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
-                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
-                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
-                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
-                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
-                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
-                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
-                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
-                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
-                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                                <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!-- col53 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col54 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col55 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col56 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col57 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col58 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col59 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col60 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!-- col61 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!-- col62 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!-- col63 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!-- col64 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!-- col65 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                <!-- col66 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                <!-- col67 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                <!-- col68 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                <!-- col69 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                <!-- col70 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col71 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col72 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!-- col73 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!-- col74 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!-- col75 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!-- col76 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!-- col77 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                                <!--    'column_alias': 'listing'}                             -->
+                                <!-- col78 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
+                                <!--    'column_alias': 'guest'}                               -->
+                                <!-- col79 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                                <!--    'column_alias': 'host'}                                -->
+                                <!-- col80 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!-- col81 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!-- col82 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!-- col83 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!-- col84 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!-- col85 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
+                                <!-- col86 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!-- col87 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!-- col88 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col89 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col90 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col91 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col92 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col93 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col94 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                   -->
-                                <!-- col53 =                                                   -->
+                                <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col54 =                                                         -->
+                                <!-- col96 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col55 =                                                       -->
+                                <!-- col97 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
@@ -1053,27 +1725,27 @@
                                     <!--    'column_alias': 'instant_bookings'}                                                              -->
                                     <!-- col2 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                     <!--    'column_alias': 'booking_value'}                         -->
                                     <!-- col3 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                     <!--    'column_alias': 'max_booking_value'}                     -->
                                     <!-- col4 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                     <!--    'column_alias': 'min_booking_value'}                     -->
                                     <!-- col5 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                     <!--    'column_alias': 'bookers'}                               -->
                                     <!-- col6 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                     <!--    'column_alias': 'average_booking_value'}                 -->
                                     <!-- col7 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                     <!--    'column_alias': 'booking_payments'}                      -->
                                     <!-- col8 =                                                                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -1081,31 +1753,31 @@
                                     <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                     <!-- col9 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                     <!--    'column_alias': 'median_booking_value'}                  -->
                                     <!-- col10 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                     -->
                                     <!-- col11 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                     <!-- col12 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                     <!-- col13 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- col14 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                     <!--    'column_alias': 'is_instant'}                            -->
                                     <!-- col15 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                     <!--    'column_alias': 'ds__day'}                               -->
                                     <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -1123,133 +1795,301 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                     <!--    'column_alias': 'ds__year'}                        -->
-                                    <!-- col20 =                                                     -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}              -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}             -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}              -->
+                                    <!-- col24 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}               -->
+                                    <!-- col25 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!-- col26 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                    <!-- col21 =                                               -->
+                                    <!-- col28 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                    <!-- col22 =                                               -->
+                                    <!-- col29 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                    <!-- col23 =                                               -->
+                                    <!-- col30 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                    <!-- col24 =                                               -->
+                                    <!-- col31 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                    <!-- col25 =                                                     -->
+                                    <!-- col32 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                    <!-- col33 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                    <!-- col34 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                    <!-- col35 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                    <!-- col36 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                    <!-- col37 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col38 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                     <!--    'column_alias': 'paid_at__day'}                          -->
-                                    <!-- col26 =                                               -->
+                                    <!-- col40 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                     <!--    'column_alias': 'paid_at__week'}                   -->
-                                    <!-- col27 =                                               -->
+                                    <!-- col41 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                     <!--    'column_alias': 'paid_at__month'}                  -->
-                                    <!-- col28 =                                               -->
+                                    <!-- col42 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                -->
-                                    <!-- col29 =                                               -->
+                                    <!-- col43 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                     <!--    'column_alias': 'paid_at__year'}                   -->
-                                    <!-- col30 =                                                     -->
+                                    <!-- col44 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                    <!-- col45 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                    <!-- col46 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                    <!-- col47 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                    <!-- col48 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                    <!-- col49 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!-- col50 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                     <!--    'column_alias': 'booking__is_instant'}                   -->
-                                    <!-- col31 =                                                     -->
+                                    <!-- col52 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                      -->
-                                    <!-- col32 =                                               -->
+                                    <!-- col53 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                     <!--    'column_alias': 'booking__ds__week'}               -->
-                                    <!-- col33 =                                               -->
+                                    <!-- col54 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                     <!--    'column_alias': 'booking__ds__month'}              -->
-                                    <!-- col34 =                                               -->
+                                    <!-- col55 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                    <!-- col35 =                                               -->
+                                    <!-- col56 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                     <!--    'column_alias': 'booking__ds__year'}               -->
-                                    <!-- col36 =                                                     -->
+                                    <!-- col57 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                    <!-- col58 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                    <!-- col59 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                    <!-- col60 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                    <!-- col61 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                    <!-- col62 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                    <!-- col63 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                    <!-- col37 =                                               -->
+                                    <!-- col65 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                    <!-- col38 =                                               -->
+                                    <!-- col66 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                    <!-- col39 =                                                 -->
+                                    <!-- col67 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                    <!-- col40 =                                               -->
+                                    <!-- col68 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                    <!-- col41 =                                                     -->
+                                    <!-- col69 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col70 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col71 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col72 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col73 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col74 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col75 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                    <!-- col42 =                                               -->
+                                    <!-- col77 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                    <!-- col43 =                                               -->
+                                    <!-- col78 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                    <!-- col44 =                                               -->
+                                    <!-- col79 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                    <!-- col45 =                                               -->
+                                    <!-- col80 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                    <!-- col46 =                                                     -->
+                                    <!-- col81 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                    <!-- col82 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                    <!-- col83 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                    <!-- col84 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                    <!-- col85 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                    <!-- col86 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col87 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                     <!--    'column_alias': 'listing'}                               -->
-                                    <!-- col47 =                                                     -->
+                                    <!-- col89 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                     <!--    'column_alias': 'guest'}                                 -->
-                                    <!-- col48 =                                                     -->
+                                    <!-- col90 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                     <!--    'column_alias': 'host'}                                  -->
-                                    <!-- col49 =                                                     -->
+                                    <!-- col91 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                     <!--    'column_alias': 'booking__listing'}                      -->
-                                    <!-- col50 =                                                     -->
+                                    <!-- col92 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                     <!--    'column_alias': 'booking__guest'}                        -->
-                                    <!-- col51 =                                                     -->
+                                    <!-- col93 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml
index d5bb60eb4f..964ca40404 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_20 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                                               -->
         <!--   {'class': 'SqlSelectColumn',                                                                       -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
             <!--    'column_alias': 'month_start_bookings'}                -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
             <!--    'column_alias': 'bookings_1_month_ago'}                -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_12 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                 <!--    'column_alias': 'month_start_bookings'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_11 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_10 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                         <!-- where = None -->
@@ -85,211 +85,379 @@
                             <!-- node_id = ss_9 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!-- col50 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!-- col51 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!-- col52 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!-- col53 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col54 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col55 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col56 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col57 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col60 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col72 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col50 =                                                         -->
+                            <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col51 =                                                       -->
+                            <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- join_0 =                                                    -->
@@ -304,7 +472,7 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -319,227 +487,395 @@
                                 <!-- node_id = ss_7 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                                <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                                <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                                <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                                <!--    'column_alias': 'paid_at__day'}                        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                                <!--    'column_alias': 'paid_at__week'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                                <!--    'column_alias': 'paid_at__month'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                                <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                                <!--    'column_alias': 'paid_at__year'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                                <!--    'column_alias': 'booking__ds__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                                <!--    'column_alias': 'booking__ds__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                                <!--    'column_alias': 'booking__ds__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                                <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                                <!--    'column_alias': 'booking__ds__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!-- col53 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col54 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col55 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col56 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col57 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col58 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col59 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col60 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!-- col61 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!-- col62 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!-- col63 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!-- col64 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!-- col65 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                <!-- col66 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                <!-- col67 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                <!-- col68 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                <!-- col69 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                <!-- col70 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col71 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col72 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!-- col73 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!-- col74 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!-- col75 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!-- col76 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!-- col77 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                                <!--    'column_alias': 'listing'}                             -->
+                                <!-- col78 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                                <!--    'column_alias': 'guest'}                               -->
+                                <!-- col79 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                                <!--    'column_alias': 'host'}                                -->
+                                <!-- col80 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!-- col81 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!-- col82 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!-- col83 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!-- col84 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!-- col85 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
+                                <!-- col86 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!-- col87 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!-- col88 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col89 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col90 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col91 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col92 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col93 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col94 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                   -->
-                                <!-- col53 =                                                   -->
+                                <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col54 =                                                         -->
+                                <!-- col96 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col55 =                                                       -->
+                                <!-- col97 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
@@ -556,27 +892,27 @@
                                     <!--    'column_alias': 'instant_bookings'}                                                              -->
                                     <!-- col2 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                     <!--    'column_alias': 'booking_value'}                         -->
                                     <!-- col3 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                     <!--    'column_alias': 'max_booking_value'}                     -->
                                     <!-- col4 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                     <!--    'column_alias': 'min_booking_value'}                     -->
                                     <!-- col5 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                     <!--    'column_alias': 'bookers'}                               -->
                                     <!-- col6 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                     <!--    'column_alias': 'average_booking_value'}                 -->
                                     <!-- col7 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                     <!--    'column_alias': 'booking_payments'}                      -->
                                     <!-- col8 =                                                                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -584,31 +920,31 @@
                                     <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                     <!-- col9 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                     <!--    'column_alias': 'median_booking_value'}                  -->
                                     <!-- col10 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                     -->
                                     <!-- col11 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                     <!-- col12 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                     <!-- col13 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- col14 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                     <!--    'column_alias': 'is_instant'}                            -->
                                     <!-- col15 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                     <!--    'column_alias': 'ds__day'}                               -->
                                     <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -626,133 +962,301 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                     <!--    'column_alias': 'ds__year'}                        -->
-                                    <!-- col20 =                                                     -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}              -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}             -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}              -->
+                                    <!-- col24 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}               -->
+                                    <!-- col25 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!-- col26 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                    <!-- col21 =                                               -->
+                                    <!-- col28 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                    <!-- col22 =                                               -->
+                                    <!-- col29 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                    <!-- col23 =                                               -->
+                                    <!-- col30 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                    <!-- col24 =                                               -->
+                                    <!-- col31 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                    <!-- col25 =                                                     -->
+                                    <!-- col32 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                    <!-- col33 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                    <!-- col34 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                    <!-- col35 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                    <!-- col36 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                    <!-- col37 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col38 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                     <!--    'column_alias': 'paid_at__day'}                          -->
-                                    <!-- col26 =                                               -->
+                                    <!-- col40 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                     <!--    'column_alias': 'paid_at__week'}                   -->
-                                    <!-- col27 =                                               -->
+                                    <!-- col41 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                     <!--    'column_alias': 'paid_at__month'}                  -->
-                                    <!-- col28 =                                               -->
+                                    <!-- col42 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                -->
-                                    <!-- col29 =                                               -->
+                                    <!-- col43 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                     <!--    'column_alias': 'paid_at__year'}                   -->
-                                    <!-- col30 =                                                     -->
+                                    <!-- col44 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                    <!-- col45 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                    <!-- col46 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                    <!-- col47 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                    <!-- col48 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                    <!-- col49 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!-- col50 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                     <!--    'column_alias': 'booking__is_instant'}                   -->
-                                    <!-- col31 =                                                     -->
+                                    <!-- col52 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                      -->
-                                    <!-- col32 =                                               -->
+                                    <!-- col53 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                     <!--    'column_alias': 'booking__ds__week'}               -->
-                                    <!-- col33 =                                               -->
+                                    <!-- col54 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                     <!--    'column_alias': 'booking__ds__month'}              -->
-                                    <!-- col34 =                                               -->
+                                    <!-- col55 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                    <!-- col35 =                                               -->
+                                    <!-- col56 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                     <!--    'column_alias': 'booking__ds__year'}               -->
-                                    <!-- col36 =                                                     -->
+                                    <!-- col57 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                    <!-- col58 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                    <!-- col59 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                    <!-- col60 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                    <!-- col61 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                    <!-- col62 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                    <!-- col63 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                    <!-- col37 =                                               -->
+                                    <!-- col65 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                    <!-- col38 =                                               -->
+                                    <!-- col66 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                    <!-- col39 =                                                 -->
+                                    <!-- col67 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                    <!-- col40 =                                               -->
+                                    <!-- col68 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                    <!-- col41 =                                                     -->
+                                    <!-- col69 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col70 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col71 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col72 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col73 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col74 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col75 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                    <!-- col42 =                                               -->
+                                    <!-- col77 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                    <!-- col43 =                                               -->
+                                    <!-- col78 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                    <!-- col44 =                                               -->
+                                    <!-- col79 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                    <!-- col45 =                                               -->
+                                    <!-- col80 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                    <!-- col46 =                                                     -->
+                                    <!-- col81 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                    <!-- col82 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                    <!-- col83 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                    <!-- col84 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                    <!-- col85 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                    <!-- col86 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col87 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                     <!--    'column_alias': 'listing'}                               -->
-                                    <!-- col47 =                                                     -->
+                                    <!-- col89 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                     <!--    'column_alias': 'guest'}                                 -->
-                                    <!-- col48 =                                                     -->
+                                    <!-- col90 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                     <!--    'column_alias': 'host'}                                  -->
-                                    <!-- col49 =                                                     -->
+                                    <!-- col91 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                     <!--    'column_alias': 'booking__listing'}                      -->
-                                    <!-- col50 =                                                     -->
+                                    <!-- col92 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                     <!--    'column_alias': 'booking__guest'}                        -->
-                                    <!-- col51 =                                                     -->
+                                    <!-- col93 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
@@ -772,11 +1276,11 @@
                 <!-- node_id = ss_18 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
                 <!--    'column_alias': 'bookings_1_month_ago'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                 <!-- where = None -->
@@ -785,7 +1289,7 @@
                     <!-- node_id = ss_17 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -794,7 +1298,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -804,11 +1308,11 @@
                         <!-- node_id = ss_16 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                         <!-- where = None -->
@@ -817,211 +1321,379 @@
                             <!-- node_id = ss_15 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_429),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_430),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_431),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_432),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_433),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
-                            <!-- col8 =                                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
+                            <!-- col8 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
+                            <!-- col9 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
+                            <!-- col10 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
+                            <!-- col11 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!-- col12 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!-- col13 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!-- col14 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!-- col15 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!-- col16 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!-- col17 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!-- col18 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
+                            <!-- col19 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
+                            <!-- col20 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
+                            <!-- col21 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
+                            <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
-                            <!-- col9 =                                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
+                            <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
-                            <!-- col10 =                                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
-                            <!-- col11 =                                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
-                            <!-- col12 =                                                   -->
+                            <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
-                            <!-- col13 =                                                   -->
+                            <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
-                            <!-- col14 =                                                   -->
+                            <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
-                            <!-- col15 =                                                   -->
+                            <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
-                            <!-- col16 =                                                   -->
+                            <!-- col30 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
+                            <!-- col31 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
+                            <!-- col32 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
+                            <!-- col33 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
+                            <!-- col34 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
+                            <!-- col35 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!-- col36 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
-                            <!-- col17 =                                                   -->
+                            <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
-                            <!-- col18 =                                                   -->
+                            <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
-                            <!-- col19 =                                                   -->
+                            <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
-                            <!-- col20 =                                                   -->
+                            <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
-                            <!-- col21 =                                                   -->
+                            <!-- col42 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
+                            <!-- col43 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
+                            <!-- col44 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
+                            <!-- col45 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
+                            <!-- col46 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
+                            <!-- col47 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!-- col48 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
-                            <!-- col22 =                                                   -->
+                            <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
-                            <!-- col23 =                                                   -->
+                            <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
-                            <!-- col24 =                                                   -->
+                            <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
-                            <!-- col25 =                                                   -->
+                            <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
-                            <!-- col26 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!-- col54 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col55 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col56 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col57 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col60 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
-                            <!-- col27 =                                                   -->
+                            <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
-                            <!-- col28 =                                                   -->
+                            <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
-                            <!-- col29 =                                                   -->
+                            <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
-                            <!-- col30 =                                                   -->
+                            <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
-                            <!-- col31 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col72 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
                             <!--    'column_alias': 'listing'}                             -->
-                            <!-- col32 =                                                   -->
+                            <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
                             <!--    'column_alias': 'guest'}                               -->
-                            <!-- col33 =                                                   -->
+                            <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
                             <!--    'column_alias': 'host'}                                -->
-                            <!-- col34 =                                                   -->
+                            <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
                             <!--    'column_alias': 'booking__listing'}                    -->
-                            <!-- col35 =                                                   -->
+                            <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
                             <!--    'column_alias': 'booking__guest'}                      -->
-                            <!-- col36 =                                                   -->
+                            <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
                             <!--    'column_alias': 'booking__host'}                       -->
-                            <!-- col37 =                                                   -->
+                            <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_427),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
                             <!--    'column_alias': 'is_instant'}                          -->
-                            <!-- col38 =                                                   -->
+                            <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_428),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
-                            <!-- col39 =                                                   -->
+                            <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                             <!--    'column_alias': 'bookings'}                            -->
-                            <!-- col40 =                                                   -->
+                            <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                             <!--    'column_alias': 'instant_bookings'}                    -->
-                            <!-- col41 =                                                   -->
+                            <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_416),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                             <!--    'column_alias': 'booking_value'}                       -->
-                            <!-- col42 =                                                   -->
+                            <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_417),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
                             <!--    'column_alias': 'max_booking_value'}                   -->
-                            <!-- col43 =                                                   -->
+                            <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_418),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
                             <!--    'column_alias': 'min_booking_value'}                   -->
-                            <!-- col44 =                                                   -->
+                            <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_419),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
                             <!--    'column_alias': 'bookers'}                             -->
-                            <!-- col45 =                                                   -->
+                            <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_420),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
-                            <!-- col46 =                                                   -->
+                            <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_421),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
                             <!--    'column_alias': 'referred_bookings'}                   -->
-                            <!-- col47 =                                                   -->
+                            <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_422),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                             <!--    'column_alias': 'median_booking_value'}                -->
-                            <!-- col48 =                                                   -->
+                            <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_423),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col49 =                                                   -->
+                            <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_424),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col50 =                                                         -->
+                            <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_425),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col51 =                                                       -->
+                            <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_426),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                             <!-- join_0 =                                                    -->
@@ -1036,7 +1708,7 @@
                                 <!-- node_id = ss_14 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_1) -->
                                 <!-- where = None -->
@@ -1051,227 +1723,395 @@
                                 <!-- node_id = ss_13 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_372),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_373),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_375),  -->
-                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                                <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_376),  -->
-                                <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_377),  -->
-                                <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                                <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_378),  -->
-                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                                <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_379),  -->
-                                <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                                <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),  -->
-                                <!--    'column_alias': 'paid_at__day'}                        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),  -->
-                                <!--    'column_alias': 'paid_at__week'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
-                                <!--    'column_alias': 'paid_at__month'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
-                                <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                                <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
-                                <!--    'column_alias': 'paid_at__year'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                                <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
-                                <!--    'column_alias': 'booking__ds__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
-                                <!--    'column_alias': 'booking__ds__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                                <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),  -->
-                                <!--    'column_alias': 'booking__ds__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),  -->
-                                <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),  -->
-                                <!--    'column_alias': 'booking__ds__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                                <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
-                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                                <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
-                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                                <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
-                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                                <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
-                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                                <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),  -->
-                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),  -->
-                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),  -->
-                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),  -->
-                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),  -->
-                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),  -->
-                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_407),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_408),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                                <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                                <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_410),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                                <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_369),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_357),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_358),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_362),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_363),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!-- col53 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col54 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),        -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col55 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),      -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col56 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col57 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col58 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col59 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col60 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
+                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!-- col61 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
+                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!-- col62 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
+                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!-- col63 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
+                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!-- col64 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!-- col65 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                <!-- col66 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                <!-- col67 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                <!-- col68 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                <!-- col69 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                <!-- col70 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col71 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col72 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!-- col73 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!-- col74 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
+                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!-- col75 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
+                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!-- col76 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!-- col77 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                                <!--    'column_alias': 'listing'}                             -->
+                                <!-- col78 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                                <!--    'column_alias': 'guest'}                               -->
+                                <!-- col79 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                                <!--    'column_alias': 'host'}                                -->
+                                <!-- col80 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!-- col81 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!-- col82 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!-- col83 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!-- col84 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!-- col85 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
+                                <!-- col86 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!-- col87 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!-- col88 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col89 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col90 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col91 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col92 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col93 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col94 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                   -->
-                                <!-- col53 =                                                   -->
+                                <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col54 =                                                         -->
+                                <!-- col96 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col55 =                                                       -->
+                                <!-- col97 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_367),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
@@ -1288,27 +2128,27 @@
                                     <!--    'column_alias': 'instant_bookings'}                                                              -->
                                     <!-- col2 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                     <!--    'column_alias': 'booking_value'}                         -->
                                     <!-- col3 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                     <!--    'column_alias': 'max_booking_value'}                     -->
                                     <!-- col4 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                     <!--    'column_alias': 'min_booking_value'}                     -->
                                     <!-- col5 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                     <!--    'column_alias': 'bookers'}                               -->
                                     <!-- col6 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                     <!--    'column_alias': 'average_booking_value'}                 -->
                                     <!-- col7 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                     <!--    'column_alias': 'booking_payments'}                      -->
                                     <!-- col8 =                                                                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -1316,31 +2156,31 @@
                                     <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                     <!-- col9 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                     <!--    'column_alias': 'median_booking_value'}                  -->
                                     <!-- col10 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                     -->
                                     <!-- col11 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                     <!-- col12 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                     <!-- col13 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- col14 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                     <!--    'column_alias': 'is_instant'}                            -->
                                     <!-- col15 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                     <!--    'column_alias': 'ds__day'}                               -->
                                     <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -1358,133 +2198,301 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                     <!--    'column_alias': 'ds__year'}                        -->
-                                    <!-- col20 =                                                     -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}              -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}             -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}              -->
+                                    <!-- col24 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}               -->
+                                    <!-- col25 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!-- col26 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                    <!-- col21 =                                               -->
+                                    <!-- col28 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                    <!-- col22 =                                               -->
+                                    <!-- col29 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                    <!-- col23 =                                               -->
+                                    <!-- col30 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                    <!-- col24 =                                               -->
+                                    <!-- col31 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                    <!-- col25 =                                                     -->
+                                    <!-- col32 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                    <!-- col33 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                    <!-- col34 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                    <!-- col35 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                    <!-- col36 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                    <!-- col37 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col38 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                     <!--    'column_alias': 'paid_at__day'}                          -->
-                                    <!-- col26 =                                               -->
+                                    <!-- col40 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                     <!--    'column_alias': 'paid_at__week'}                   -->
-                                    <!-- col27 =                                               -->
+                                    <!-- col41 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                     <!--    'column_alias': 'paid_at__month'}                  -->
-                                    <!-- col28 =                                               -->
+                                    <!-- col42 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                -->
-                                    <!-- col29 =                                               -->
+                                    <!-- col43 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                     <!--    'column_alias': 'paid_at__year'}                   -->
-                                    <!-- col30 =                                                     -->
+                                    <!-- col44 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                    <!-- col45 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                    <!-- col46 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                    <!-- col47 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                    <!-- col48 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                    <!-- col49 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!-- col50 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                     <!--    'column_alias': 'booking__is_instant'}                   -->
-                                    <!-- col31 =                                                     -->
+                                    <!-- col52 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                      -->
-                                    <!-- col32 =                                               -->
+                                    <!-- col53 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                     <!--    'column_alias': 'booking__ds__week'}               -->
-                                    <!-- col33 =                                               -->
+                                    <!-- col54 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                     <!--    'column_alias': 'booking__ds__month'}              -->
-                                    <!-- col34 =                                               -->
+                                    <!-- col55 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                    <!-- col35 =                                               -->
+                                    <!-- col56 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                     <!--    'column_alias': 'booking__ds__year'}               -->
-                                    <!-- col36 =                                                     -->
+                                    <!-- col57 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                    <!-- col58 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                    <!-- col59 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                    <!-- col60 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                    <!-- col61 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                    <!-- col62 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                    <!-- col63 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                    <!-- col37 =                                               -->
+                                    <!-- col65 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                    <!-- col38 =                                               -->
+                                    <!-- col66 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                    <!-- col39 =                                                 -->
+                                    <!-- col67 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                    <!-- col40 =                                               -->
+                                    <!-- col68 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                    <!-- col41 =                                                     -->
+                                    <!-- col69 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col70 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col71 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col72 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col73 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col74 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col75 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col76 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                    <!-- col42 =                                               -->
+                                    <!-- col77 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                    <!-- col43 =                                               -->
+                                    <!-- col78 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                    <!-- col44 =                                               -->
+                                    <!-- col79 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                    <!-- col45 =                                               -->
+                                    <!-- col80 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                    <!-- col46 =                                                     -->
+                                    <!-- col81 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                    <!-- col82 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                    <!-- col83 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                    <!-- col84 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                    <!-- col85 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                    <!-- col86 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col87 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                     <!--    'column_alias': 'listing'}                               -->
-                                    <!-- col47 =                                                     -->
+                                    <!-- col89 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                     <!--    'column_alias': 'guest'}                                 -->
-                                    <!-- col48 =                                                     -->
+                                    <!-- col90 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                     <!--    'column_alias': 'host'}                                  -->
-                                    <!-- col49 =                                                     -->
+                                    <!-- col91 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                     <!--    'column_alias': 'booking__listing'}                      -->
-                                    <!-- col50 =                                                     -->
+                                    <!-- col92 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                     <!--    'column_alias': 'booking__guest'}                        -->
-                                    <!-- col51 =                                                     -->
+                                    <!-- col93 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml
index 5d76366353..bf2ebf93fd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_20 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
         <!--    'column_alias': 'metric_time__year'}                   -->
         <!-- col1 =                                                                                               -->
         <!--   {'class': 'SqlSelectColumn',                                                                       -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__year'}                                           -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
             <!--    'column_alias': 'month_start_bookings'}                -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
             <!--    'column_alias': 'bookings_1_month_ago'}                -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_12 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                 <!--    'column_alias': 'metric_time__year'}                   -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                 <!--    'column_alias': 'month_start_bookings'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_11 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_10 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                         <!--    'column_alias': 'metric_time__year'}                   -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                         <!-- where = None -->
@@ -89,207 +89,375 @@
                             <!--    'column_alias': 'metric_time__year'}           -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!-- col50 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!-- col51 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!-- col52 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!-- col53 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col54 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col55 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col56 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col57 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col60 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col72 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col50 =                                                         -->
+                            <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col51 =                                                       -->
+                            <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- join_0 =                                                    -->
@@ -304,7 +472,7 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -319,227 +487,395 @@
                                 <!-- node_id = ss_7 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                                <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                                <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                                <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                                <!--    'column_alias': 'paid_at__day'}                        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                                <!--    'column_alias': 'paid_at__week'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                                <!--    'column_alias': 'paid_at__month'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                                <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                                <!--    'column_alias': 'paid_at__year'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                                <!--    'column_alias': 'booking__ds__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                                <!--    'column_alias': 'booking__ds__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                                <!--    'column_alias': 'booking__ds__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                                <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                                <!--    'column_alias': 'booking__ds__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!-- col53 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col54 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col55 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col56 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col57 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col58 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col59 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col60 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!-- col61 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!-- col62 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!-- col63 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!-- col64 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!-- col65 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                <!-- col66 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                <!-- col67 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                <!-- col68 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                <!-- col69 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                <!-- col70 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col71 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col72 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!-- col73 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!-- col74 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!-- col75 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!-- col76 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!-- col77 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                                <!--    'column_alias': 'listing'}                             -->
+                                <!-- col78 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                                <!--    'column_alias': 'guest'}                               -->
+                                <!-- col79 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                                <!--    'column_alias': 'host'}                                -->
+                                <!-- col80 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!-- col81 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!-- col82 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!-- col83 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!-- col84 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!-- col85 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
+                                <!-- col86 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!-- col87 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!-- col88 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col89 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col90 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col91 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col92 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col93 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col94 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                   -->
-                                <!-- col53 =                                                   -->
+                                <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col54 =                                                         -->
+                                <!-- col96 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col55 =                                                       -->
+                                <!-- col97 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
@@ -556,27 +892,27 @@
                                     <!--    'column_alias': 'instant_bookings'}                                                              -->
                                     <!-- col2 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                     <!--    'column_alias': 'booking_value'}                         -->
                                     <!-- col3 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                     <!--    'column_alias': 'max_booking_value'}                     -->
                                     <!-- col4 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                     <!--    'column_alias': 'min_booking_value'}                     -->
                                     <!-- col5 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                     <!--    'column_alias': 'bookers'}                               -->
                                     <!-- col6 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                     <!--    'column_alias': 'average_booking_value'}                 -->
                                     <!-- col7 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                     <!--    'column_alias': 'booking_payments'}                      -->
                                     <!-- col8 =                                                                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -584,31 +920,31 @@
                                     <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                     <!-- col9 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                     <!--    'column_alias': 'median_booking_value'}                  -->
                                     <!-- col10 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                     -->
                                     <!-- col11 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                     <!-- col12 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                     <!-- col13 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- col14 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                     <!--    'column_alias': 'is_instant'}                            -->
                                     <!-- col15 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                     <!--    'column_alias': 'ds__day'}                               -->
                                     <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -626,133 +962,301 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                     <!--    'column_alias': 'ds__year'}                        -->
-                                    <!-- col20 =                                                     -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}              -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}             -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}              -->
+                                    <!-- col24 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}               -->
+                                    <!-- col25 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!-- col26 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                    <!-- col21 =                                               -->
+                                    <!-- col28 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                    <!-- col22 =                                               -->
+                                    <!-- col29 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                    <!-- col23 =                                               -->
+                                    <!-- col30 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                    <!-- col24 =                                               -->
+                                    <!-- col31 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                    <!-- col25 =                                                     -->
+                                    <!-- col32 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                    <!-- col33 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                    <!-- col34 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                    <!-- col35 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                    <!-- col36 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                    <!-- col37 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col38 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                     <!--    'column_alias': 'paid_at__day'}                          -->
-                                    <!-- col26 =                                               -->
+                                    <!-- col40 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                     <!--    'column_alias': 'paid_at__week'}                   -->
-                                    <!-- col27 =                                               -->
+                                    <!-- col41 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                     <!--    'column_alias': 'paid_at__month'}                  -->
-                                    <!-- col28 =                                               -->
+                                    <!-- col42 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                -->
-                                    <!-- col29 =                                               -->
+                                    <!-- col43 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                     <!--    'column_alias': 'paid_at__year'}                   -->
-                                    <!-- col30 =                                                     -->
+                                    <!-- col44 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                    <!-- col45 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                    <!-- col46 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                    <!-- col47 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                    <!-- col48 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                    <!-- col49 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!-- col50 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                     <!--    'column_alias': 'booking__is_instant'}                   -->
-                                    <!-- col31 =                                                     -->
+                                    <!-- col52 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                      -->
-                                    <!-- col32 =                                               -->
+                                    <!-- col53 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                     <!--    'column_alias': 'booking__ds__week'}               -->
-                                    <!-- col33 =                                               -->
+                                    <!-- col54 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                     <!--    'column_alias': 'booking__ds__month'}              -->
-                                    <!-- col34 =                                               -->
+                                    <!-- col55 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                    <!-- col35 =                                               -->
+                                    <!-- col56 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                     <!--    'column_alias': 'booking__ds__year'}               -->
-                                    <!-- col36 =                                                     -->
+                                    <!-- col57 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                    <!-- col58 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                    <!-- col59 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                    <!-- col60 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                    <!-- col61 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                    <!-- col62 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                    <!-- col63 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                    <!-- col37 =                                               -->
+                                    <!-- col65 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                    <!-- col38 =                                               -->
+                                    <!-- col66 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                    <!-- col39 =                                                 -->
+                                    <!-- col67 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                    <!-- col40 =                                               -->
+                                    <!-- col68 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                    <!-- col41 =                                                     -->
+                                    <!-- col69 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col70 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col71 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col72 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col73 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col74 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col75 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                    <!-- col42 =                                               -->
+                                    <!-- col77 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                    <!-- col43 =                                               -->
+                                    <!-- col78 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                    <!-- col44 =                                               -->
+                                    <!-- col79 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                    <!-- col45 =                                               -->
+                                    <!-- col80 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                    <!-- col46 =                                                     -->
+                                    <!-- col81 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                    <!-- col82 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                    <!-- col83 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                    <!-- col84 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                    <!-- col85 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                    <!-- col86 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col87 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                     <!--    'column_alias': 'listing'}                               -->
-                                    <!-- col47 =                                                     -->
+                                    <!-- col89 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                     <!--    'column_alias': 'guest'}                                 -->
-                                    <!-- col48 =                                                     -->
+                                    <!-- col90 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                     <!--    'column_alias': 'host'}                                  -->
-                                    <!-- col49 =                                                     -->
+                                    <!-- col91 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                     <!--    'column_alias': 'booking__listing'}                      -->
-                                    <!-- col50 =                                                     -->
+                                    <!-- col92 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                     <!--    'column_alias': 'booking__guest'}                        -->
-                                    <!-- col51 =                                                     -->
+                                    <!-- col93 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
@@ -772,11 +1276,11 @@
                 <!-- node_id = ss_18 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
                 <!--    'column_alias': 'metric_time__year'}                   -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
                 <!--    'column_alias': 'bookings_1_month_ago'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                 <!-- where = None -->
@@ -785,7 +1289,7 @@
                     <!-- node_id = ss_17 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -794,7 +1298,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -804,11 +1308,11 @@
                         <!-- node_id = ss_16 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
                         <!--    'column_alias': 'metric_time__year'}                   -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                         <!-- where = None -->
@@ -821,207 +1325,375 @@
                             <!--    'column_alias': 'metric_time__year'}           -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_429),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_430),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_431),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_432),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_433),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
-                            <!-- col8 =                                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
+                            <!-- col8 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
+                            <!-- col9 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
+                            <!-- col10 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
+                            <!-- col11 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!-- col12 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!-- col13 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!-- col14 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!-- col15 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!-- col16 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!-- col17 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!-- col18 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
+                            <!-- col19 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
+                            <!-- col20 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
+                            <!-- col21 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
+                            <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
-                            <!-- col9 =                                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
+                            <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
-                            <!-- col10 =                                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
-                            <!-- col11 =                                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
-                            <!-- col12 =                                                   -->
+                            <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
-                            <!-- col13 =                                                   -->
+                            <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
-                            <!-- col14 =                                                   -->
+                            <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
-                            <!-- col15 =                                                   -->
+                            <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
-                            <!-- col16 =                                                   -->
+                            <!-- col30 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
+                            <!-- col31 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
+                            <!-- col32 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
+                            <!-- col33 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
+                            <!-- col34 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
+                            <!-- col35 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!-- col36 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
-                            <!-- col17 =                                                   -->
+                            <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
-                            <!-- col18 =                                                   -->
+                            <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
-                            <!-- col19 =                                                   -->
+                            <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
-                            <!-- col20 =                                                   -->
+                            <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
-                            <!-- col21 =                                                   -->
+                            <!-- col42 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
+                            <!-- col43 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
+                            <!-- col44 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
+                            <!-- col45 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
+                            <!-- col46 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
+                            <!-- col47 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!-- col48 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
-                            <!-- col22 =                                                   -->
+                            <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
-                            <!-- col23 =                                                   -->
+                            <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
-                            <!-- col24 =                                                   -->
+                            <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
-                            <!-- col25 =                                                   -->
+                            <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
-                            <!-- col26 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!-- col54 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col55 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col56 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col57 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col60 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
-                            <!-- col27 =                                                   -->
+                            <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
-                            <!-- col28 =                                                   -->
+                            <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
-                            <!-- col29 =                                                   -->
+                            <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
-                            <!-- col30 =                                                   -->
+                            <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
-                            <!-- col31 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col72 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
                             <!--    'column_alias': 'listing'}                             -->
-                            <!-- col32 =                                                   -->
+                            <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
                             <!--    'column_alias': 'guest'}                               -->
-                            <!-- col33 =                                                   -->
+                            <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
                             <!--    'column_alias': 'host'}                                -->
-                            <!-- col34 =                                                   -->
+                            <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
                             <!--    'column_alias': 'booking__listing'}                    -->
-                            <!-- col35 =                                                   -->
+                            <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
                             <!--    'column_alias': 'booking__guest'}                      -->
-                            <!-- col36 =                                                   -->
+                            <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
                             <!--    'column_alias': 'booking__host'}                       -->
-                            <!-- col37 =                                                   -->
+                            <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_427),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
                             <!--    'column_alias': 'is_instant'}                          -->
-                            <!-- col38 =                                                   -->
+                            <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_428),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
-                            <!-- col39 =                                                   -->
+                            <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                             <!--    'column_alias': 'bookings'}                            -->
-                            <!-- col40 =                                                   -->
+                            <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                             <!--    'column_alias': 'instant_bookings'}                    -->
-                            <!-- col41 =                                                   -->
+                            <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_416),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                             <!--    'column_alias': 'booking_value'}                       -->
-                            <!-- col42 =                                                   -->
+                            <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_417),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
                             <!--    'column_alias': 'max_booking_value'}                   -->
-                            <!-- col43 =                                                   -->
+                            <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_418),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
                             <!--    'column_alias': 'min_booking_value'}                   -->
-                            <!-- col44 =                                                   -->
+                            <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_419),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
                             <!--    'column_alias': 'bookers'}                             -->
-                            <!-- col45 =                                                   -->
+                            <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_420),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
-                            <!-- col46 =                                                   -->
+                            <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_421),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
                             <!--    'column_alias': 'referred_bookings'}                   -->
-                            <!-- col47 =                                                   -->
+                            <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_422),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                             <!--    'column_alias': 'median_booking_value'}                -->
-                            <!-- col48 =                                                   -->
+                            <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_423),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col49 =                                                   -->
+                            <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_424),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col50 =                                                         -->
+                            <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_425),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col51 =                                                       -->
+                            <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_426),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                             <!-- join_0 =                                                    -->
@@ -1036,7 +1708,7 @@
                                 <!-- node_id = ss_14 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_1) -->
                                 <!-- where = None -->
@@ -1051,227 +1723,395 @@
                                 <!-- node_id = ss_13 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_372),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_373),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_375),  -->
-                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                                <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_376),  -->
-                                <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_377),  -->
-                                <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                                <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_378),  -->
-                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                                <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_379),  -->
-                                <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                                <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),  -->
-                                <!--    'column_alias': 'paid_at__day'}                        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),  -->
-                                <!--    'column_alias': 'paid_at__week'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
-                                <!--    'column_alias': 'paid_at__month'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
-                                <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                                <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
-                                <!--    'column_alias': 'paid_at__year'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                                <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
-                                <!--    'column_alias': 'booking__ds__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
-                                <!--    'column_alias': 'booking__ds__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                                <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),  -->
-                                <!--    'column_alias': 'booking__ds__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),  -->
-                                <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),  -->
-                                <!--    'column_alias': 'booking__ds__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                                <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
-                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                                <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
-                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                                <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
-                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                                <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
-                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                                <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),  -->
-                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),  -->
-                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),  -->
-                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),  -->
-                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),  -->
-                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),  -->
-                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_407),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_408),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                                <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                                <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_410),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                                <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_369),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_357),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_358),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_362),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_363),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!-- col53 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col54 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),        -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col55 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),      -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col56 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col57 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col58 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col59 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col60 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
+                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!-- col61 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
+                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!-- col62 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
+                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!-- col63 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
+                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!-- col64 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!-- col65 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                <!-- col66 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                <!-- col67 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                <!-- col68 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                <!-- col69 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                <!-- col70 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col71 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col72 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!-- col73 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!-- col74 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
+                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!-- col75 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
+                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!-- col76 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!-- col77 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                                <!--    'column_alias': 'listing'}                             -->
+                                <!-- col78 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                                <!--    'column_alias': 'guest'}                               -->
+                                <!-- col79 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                                <!--    'column_alias': 'host'}                                -->
+                                <!-- col80 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!-- col81 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!-- col82 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!-- col83 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!-- col84 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!-- col85 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
+                                <!-- col86 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!-- col87 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!-- col88 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col89 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col90 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col91 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col92 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col93 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col94 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                   -->
-                                <!-- col53 =                                                   -->
+                                <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col54 =                                                         -->
+                                <!-- col96 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col55 =                                                       -->
+                                <!-- col97 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_367),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
@@ -1288,27 +2128,27 @@
                                     <!--    'column_alias': 'instant_bookings'}                                                              -->
                                     <!-- col2 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                     <!--    'column_alias': 'booking_value'}                         -->
                                     <!-- col3 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                     <!--    'column_alias': 'max_booking_value'}                     -->
                                     <!-- col4 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                     <!--    'column_alias': 'min_booking_value'}                     -->
                                     <!-- col5 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                     <!--    'column_alias': 'bookers'}                               -->
                                     <!-- col6 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                     <!--    'column_alias': 'average_booking_value'}                 -->
                                     <!-- col7 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                     <!--    'column_alias': 'booking_payments'}                      -->
                                     <!-- col8 =                                                                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -1316,31 +2156,31 @@
                                     <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                     <!-- col9 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                     <!--    'column_alias': 'median_booking_value'}                  -->
                                     <!-- col10 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                     -->
                                     <!-- col11 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                     <!-- col12 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                     <!-- col13 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- col14 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                     <!--    'column_alias': 'is_instant'}                            -->
                                     <!-- col15 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                     <!--    'column_alias': 'ds__day'}                               -->
                                     <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -1358,133 +2198,301 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                     <!--    'column_alias': 'ds__year'}                        -->
-                                    <!-- col20 =                                                     -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}              -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}             -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}              -->
+                                    <!-- col24 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}               -->
+                                    <!-- col25 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!-- col26 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                    <!-- col21 =                                               -->
+                                    <!-- col28 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                    <!-- col22 =                                               -->
+                                    <!-- col29 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                    <!-- col23 =                                               -->
+                                    <!-- col30 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                    <!-- col24 =                                               -->
+                                    <!-- col31 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                    <!-- col25 =                                                     -->
+                                    <!-- col32 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                    <!-- col33 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                    <!-- col34 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                    <!-- col35 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                    <!-- col36 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                    <!-- col37 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col38 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                     <!--    'column_alias': 'paid_at__day'}                          -->
-                                    <!-- col26 =                                               -->
+                                    <!-- col40 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                     <!--    'column_alias': 'paid_at__week'}                   -->
-                                    <!-- col27 =                                               -->
+                                    <!-- col41 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                     <!--    'column_alias': 'paid_at__month'}                  -->
-                                    <!-- col28 =                                               -->
+                                    <!-- col42 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                -->
-                                    <!-- col29 =                                               -->
+                                    <!-- col43 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                     <!--    'column_alias': 'paid_at__year'}                   -->
-                                    <!-- col30 =                                                     -->
+                                    <!-- col44 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                    <!-- col45 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                    <!-- col46 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                    <!-- col47 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                    <!-- col48 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                    <!-- col49 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!-- col50 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                     <!--    'column_alias': 'booking__is_instant'}                   -->
-                                    <!-- col31 =                                                     -->
+                                    <!-- col52 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                      -->
-                                    <!-- col32 =                                               -->
+                                    <!-- col53 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                     <!--    'column_alias': 'booking__ds__week'}               -->
-                                    <!-- col33 =                                               -->
+                                    <!-- col54 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                     <!--    'column_alias': 'booking__ds__month'}              -->
-                                    <!-- col34 =                                               -->
+                                    <!-- col55 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                    <!-- col35 =                                               -->
+                                    <!-- col56 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                     <!--    'column_alias': 'booking__ds__year'}               -->
-                                    <!-- col36 =                                                     -->
+                                    <!-- col57 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                    <!-- col58 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                    <!-- col59 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                    <!-- col60 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                    <!-- col61 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                    <!-- col62 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                    <!-- col63 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                    <!-- col37 =                                               -->
+                                    <!-- col65 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                    <!-- col38 =                                               -->
+                                    <!-- col66 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                    <!-- col39 =                                                 -->
+                                    <!-- col67 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                    <!-- col40 =                                               -->
+                                    <!-- col68 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                    <!-- col41 =                                                     -->
+                                    <!-- col69 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col70 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col71 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col72 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col73 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col74 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col75 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col76 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                    <!-- col42 =                                               -->
+                                    <!-- col77 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                    <!-- col43 =                                               -->
+                                    <!-- col78 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                    <!-- col44 =                                               -->
+                                    <!-- col79 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                    <!-- col45 =                                               -->
+                                    <!-- col80 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                    <!-- col46 =                                                     -->
+                                    <!-- col81 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                    <!-- col82 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                    <!-- col83 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                    <!-- col84 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                    <!-- col85 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                    <!-- col86 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col87 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                     <!--    'column_alias': 'listing'}                               -->
-                                    <!-- col47 =                                                     -->
+                                    <!-- col89 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                     <!--    'column_alias': 'guest'}                                 -->
-                                    <!-- col48 =                                                     -->
+                                    <!-- col90 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                     <!--    'column_alias': 'host'}                                  -->
-                                    <!-- col49 =                                                     -->
+                                    <!-- col91 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                     <!--    'column_alias': 'booking__listing'}                      -->
-                                    <!-- col50 =                                                     -->
+                                    <!-- col92 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                     <!--    'column_alias': 'booking__guest'}                        -->
-                                    <!-- col51 =                                                     -->
+                                    <!-- col93 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml
index 835975e4c7..b4604d9a7a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_15 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                                   -->
         <!--   {'class': 'SqlSelectColumn',                                                           -->
@@ -17,11 +17,11 @@
             <!-- node_id = ss_14 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_412),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_413),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
             <!--    'column_alias': 'every_2_days_bookers_2_days_ago'}     -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
             <!-- where = None -->
@@ -30,7 +30,7 @@
                 <!-- node_id = ss_13 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                                  -->
                 <!--   {'class': 'SqlSelectColumn',                                                          -->
@@ -39,7 +39,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -49,11 +49,11 @@
                     <!-- node_id = ss_12 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_408),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
                     <!--    'column_alias': 'bookers'}                             -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                     <!-- where = None -->
@@ -62,211 +62,379 @@
                         <!-- node_id = ss_11 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_407),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_372),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_373),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_375),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_376),  -->
-                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                        <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_377),  -->
-                        <!--    'column_alias': 'ds_partitioned__week'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_378),  -->
-                        <!--    'column_alias': 'ds_partitioned__month'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                        <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_379),  -->
-                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                        <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),  -->
-                        <!--    'column_alias': 'ds_partitioned__year'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                        <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),  -->
-                        <!--    'column_alias': 'paid_at__day'}                        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
-                        <!--    'column_alias': 'paid_at__week'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
-                        <!--    'column_alias': 'paid_at__month'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
-                        <!--    'column_alias': 'paid_at__quarter'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                        <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
-                        <!--    'column_alias': 'paid_at__year'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                        <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
-                        <!--    'column_alias': 'booking__ds__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),  -->
-                        <!--    'column_alias': 'booking__ds__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                        <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),  -->
-                        <!--    'column_alias': 'booking__ds__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),  -->
-                        <!--    'column_alias': 'booking__ds__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),  -->
-                        <!--    'column_alias': 'booking__ds__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                        <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
-                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                        <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
-                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                        <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
-                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                        <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),  -->
-                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                        <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),  -->
-                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),  -->
-                        <!--    'column_alias': 'listing'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),  -->
-                        <!--    'column_alias': 'guest'}                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),  -->
-                        <!--    'column_alias': 'host'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_369),  -->
-                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                        <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),  -->
-                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                        <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
-                        <!--    'column_alias': 'bookings'}                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                        <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_357),  -->
-                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                        <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_358),  -->
-                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                        <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
-                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
-                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
-                        <!--    'column_alias': 'bookers'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_362),  -->
-                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_363),  -->
-                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
-                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
-                        <!--    'column_alias': 'booking_value_p99'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                        <!-- col50 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                        <!-- col51 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                        <!-- col52 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                        <!-- col53 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!-- col54 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col55 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),        -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col56 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col57 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col58 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col59 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col60 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col61 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!-- col62 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!-- col63 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!-- col64 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!-- col65 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!-- col66 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                        <!-- col67 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                        <!-- col68 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                        <!-- col69 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                        <!-- col70 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                        <!-- col71 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col72 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col73 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                        <!--    'column_alias': 'listing'}                             -->
+                        <!-- col74 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
+                        <!--    'column_alias': 'guest'}                               -->
+                        <!-- col75 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
+                        <!--    'column_alias': 'host'}                                -->
+                        <!-- col76 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!-- col77 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!-- col78 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!-- col79 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
+                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!-- col80 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!-- col81 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                        <!--    'column_alias': 'bookings'}                            -->
+                        <!-- col82 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!-- col83 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
+                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!-- col84 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!-- col85 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!-- col86 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                        <!--    'column_alias': 'bookers'}                             -->
+                        <!-- col87 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!-- col88 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!-- col89 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!-- col90 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                        <!--    'column_alias': 'booking_value_p99'}                   -->
+                        <!-- col91 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                        <!-- col50 =                                                         -->
+                        <!-- col92 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_367),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col51 =                                                       -->
+                        <!-- col93 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                         <!-- join_0 =                                                    -->
@@ -281,7 +449,7 @@
                             <!-- node_id = ss_10 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_1) -->
                             <!-- where = None -->
@@ -296,227 +464,395 @@
                             <!-- node_id = ss_9 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col54 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col55 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col56 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col57 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col60 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col72 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col95 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- join_0 =                                                  -->
@@ -531,7 +867,7 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -546,227 +882,395 @@
                                 <!-- node_id = ss_7 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                                <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                                <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                                <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                                <!--    'column_alias': 'paid_at__day'}                        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                                <!--    'column_alias': 'paid_at__week'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                                <!--    'column_alias': 'paid_at__month'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                                <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                                <!--    'column_alias': 'paid_at__year'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                                <!--    'column_alias': 'booking__ds__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                                <!--    'column_alias': 'booking__ds__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                                <!--    'column_alias': 'booking__ds__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                                <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                                <!--    'column_alias': 'booking__ds__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!-- col53 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col54 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col55 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col56 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col57 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col58 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col59 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col60 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!-- col61 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!-- col62 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!-- col63 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!-- col64 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!-- col65 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                <!-- col66 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                <!-- col67 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                <!-- col68 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                <!-- col69 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                <!-- col70 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col71 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col72 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!-- col73 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!-- col74 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!-- col75 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!-- col76 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!-- col77 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                                <!--    'column_alias': 'listing'}                             -->
+                                <!-- col78 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                                <!--    'column_alias': 'guest'}                               -->
+                                <!-- col79 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                                <!--    'column_alias': 'host'}                                -->
+                                <!-- col80 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!-- col81 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!-- col82 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!-- col83 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!-- col84 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!-- col85 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
+                                <!-- col86 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!-- col87 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!-- col88 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col89 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col90 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col91 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col92 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col93 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col94 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                   -->
-                                <!-- col53 =                                                   -->
+                                <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col54 =                                                         -->
+                                <!-- col96 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col55 =                                                       -->
+                                <!-- col97 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
@@ -783,27 +1287,27 @@
                                     <!--    'column_alias': 'instant_bookings'}                                                              -->
                                     <!-- col2 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                     <!--    'column_alias': 'booking_value'}                         -->
                                     <!-- col3 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                     <!--    'column_alias': 'max_booking_value'}                     -->
                                     <!-- col4 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                     <!--    'column_alias': 'min_booking_value'}                     -->
                                     <!-- col5 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                     <!--    'column_alias': 'bookers'}                               -->
                                     <!-- col6 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                     <!--    'column_alias': 'average_booking_value'}                 -->
                                     <!-- col7 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                     <!--    'column_alias': 'booking_payments'}                      -->
                                     <!-- col8 =                                                                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -811,31 +1315,31 @@
                                     <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                     <!-- col9 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                     <!--    'column_alias': 'median_booking_value'}                  -->
                                     <!-- col10 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                     -->
                                     <!-- col11 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                     <!-- col12 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                     <!-- col13 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- col14 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                     <!--    'column_alias': 'is_instant'}                            -->
                                     <!-- col15 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                     <!--    'column_alias': 'ds__day'}                               -->
                                     <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -853,133 +1357,301 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                     <!--    'column_alias': 'ds__year'}                        -->
-                                    <!-- col20 =                                                     -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}              -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}             -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}              -->
+                                    <!-- col24 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}               -->
+                                    <!-- col25 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!-- col26 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                    <!-- col21 =                                               -->
+                                    <!-- col28 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                    <!-- col22 =                                               -->
+                                    <!-- col29 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                    <!-- col23 =                                               -->
+                                    <!-- col30 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                    <!-- col24 =                                               -->
+                                    <!-- col31 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                    <!-- col25 =                                                     -->
+                                    <!-- col32 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                    <!-- col33 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                    <!-- col34 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                    <!-- col35 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                    <!-- col36 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                    <!-- col37 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col38 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                     <!--    'column_alias': 'paid_at__day'}                          -->
-                                    <!-- col26 =                                               -->
+                                    <!-- col40 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                     <!--    'column_alias': 'paid_at__week'}                   -->
-                                    <!-- col27 =                                               -->
+                                    <!-- col41 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                     <!--    'column_alias': 'paid_at__month'}                  -->
-                                    <!-- col28 =                                               -->
+                                    <!-- col42 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                -->
-                                    <!-- col29 =                                               -->
+                                    <!-- col43 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                     <!--    'column_alias': 'paid_at__year'}                   -->
-                                    <!-- col30 =                                                     -->
+                                    <!-- col44 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                    <!-- col45 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                    <!-- col46 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                    <!-- col47 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                    <!-- col48 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                    <!-- col49 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!-- col50 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                     <!--    'column_alias': 'booking__is_instant'}                   -->
-                                    <!-- col31 =                                                     -->
+                                    <!-- col52 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                      -->
-                                    <!-- col32 =                                               -->
+                                    <!-- col53 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                     <!--    'column_alias': 'booking__ds__week'}               -->
-                                    <!-- col33 =                                               -->
+                                    <!-- col54 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                     <!--    'column_alias': 'booking__ds__month'}              -->
-                                    <!-- col34 =                                               -->
+                                    <!-- col55 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                    <!-- col35 =                                               -->
+                                    <!-- col56 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                     <!--    'column_alias': 'booking__ds__year'}               -->
-                                    <!-- col36 =                                                     -->
+                                    <!-- col57 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                    <!-- col58 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                    <!-- col59 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                    <!-- col60 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                    <!-- col61 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                    <!-- col62 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                    <!-- col63 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                    <!-- col37 =                                               -->
+                                    <!-- col65 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                    <!-- col38 =                                               -->
+                                    <!-- col66 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                    <!-- col39 =                                                 -->
+                                    <!-- col67 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                    <!-- col40 =                                               -->
+                                    <!-- col68 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                    <!-- col41 =                                                     -->
+                                    <!-- col69 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col70 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col71 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col72 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col73 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col74 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col75 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                    <!-- col42 =                                               -->
+                                    <!-- col77 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                    <!-- col43 =                                               -->
+                                    <!-- col78 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                    <!-- col44 =                                               -->
+                                    <!-- col79 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                    <!-- col45 =                                               -->
+                                    <!-- col80 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                    <!-- col46 =                                                     -->
+                                    <!-- col81 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                    <!-- col82 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                    <!-- col83 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                    <!-- col84 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                    <!-- col85 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                    <!-- col86 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col87 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                     <!--    'column_alias': 'listing'}                               -->
-                                    <!-- col47 =                                                     -->
+                                    <!-- col89 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                     <!--    'column_alias': 'guest'}                                 -->
-                                    <!-- col48 =                                                     -->
+                                    <!-- col90 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                     <!--    'column_alias': 'host'}                                  -->
-                                    <!-- col49 =                                                     -->
+                                    <!-- col91 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                     <!--    'column_alias': 'booking__listing'}                      -->
-                                    <!-- col50 =                                                     -->
+                                    <!-- col92 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                     <!--    'column_alias': 'booking__guest'}                        -->
-                                    <!-- col51 =                                                     -->
+                                    <!-- col93 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml
index 3cb4bc87d8..edcddda734 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_13 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                       -->
         <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -17,11 +17,11 @@
             <!-- node_id = ss_12 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
             <!--    'column_alias': 'bookings_5_days_ago'}                 -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
             <!-- where = None -->
@@ -30,7 +30,7 @@
                 <!-- node_id = ss_11 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -39,7 +39,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -49,11 +49,11 @@
                     <!-- node_id = ss_10 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                     <!-- where = None -->
@@ -62,211 +62,379 @@
                         <!-- node_id = ss_9 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
-                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                        <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
-                        <!--    'column_alias': 'ds_partitioned__week'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
-                        <!--    'column_alias': 'ds_partitioned__month'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                        <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                        <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                        <!--    'column_alias': 'ds_partitioned__year'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                        <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                        <!--    'column_alias': 'paid_at__day'}                        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                        <!--    'column_alias': 'paid_at__week'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                        <!--    'column_alias': 'paid_at__month'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                        <!--    'column_alias': 'paid_at__quarter'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                        <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                        <!--    'column_alias': 'paid_at__year'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                        <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                        <!--    'column_alias': 'booking__ds__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                        <!--    'column_alias': 'booking__ds__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                        <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                        <!--    'column_alias': 'booking__ds__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                        <!--    'column_alias': 'booking__ds__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                        <!--    'column_alias': 'booking__ds__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                        <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
-                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                        <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
-                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                        <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
-                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                        <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
-                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                        <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
-                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
-                        <!--    'column_alias': 'listing'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
-                        <!--    'column_alias': 'guest'}                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
-                        <!--    'column_alias': 'host'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
-                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                        <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
-                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                        <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
-                        <!--    'column_alias': 'bookings'}                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                        <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
-                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                        <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
-                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                        <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                        <!--    'column_alias': 'bookers'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                        <!--    'column_alias': 'booking_value_p99'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                        <!-- col50 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                        <!-- col51 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                        <!-- col52 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                        <!-- col53 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!-- col54 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col55 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),        -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col56 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col57 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col58 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col59 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col60 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col61 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!-- col62 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!-- col63 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!-- col64 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!-- col65 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!-- col66 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                        <!-- col67 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                        <!-- col68 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                        <!-- col69 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                        <!-- col70 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                        <!-- col71 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col72 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col73 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                        <!--    'column_alias': 'listing'}                             -->
+                        <!-- col74 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                        <!--    'column_alias': 'guest'}                               -->
+                        <!-- col75 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                        <!--    'column_alias': 'host'}                                -->
+                        <!-- col76 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!-- col77 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!-- col78 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!-- col79 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!-- col80 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!-- col81 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                        <!--    'column_alias': 'bookings'}                            -->
+                        <!-- col82 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!-- col83 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!-- col84 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!-- col85 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!-- col86 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                        <!--    'column_alias': 'bookers'}                             -->
+                        <!-- col87 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!-- col88 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!-- col89 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!-- col90 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                        <!--    'column_alias': 'booking_value_p99'}                   -->
+                        <!-- col91 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                        <!-- col50 =                                                         -->
+                        <!-- col92 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col51 =                                                       -->
+                        <!-- col93 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                         <!-- join_0 =                                                    -->
@@ -281,7 +449,7 @@
                             <!-- node_id = ss_8 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                             <!-- where = None -->
@@ -296,227 +464,395 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col53 =                                                   -->
+                            <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -533,27 +869,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col8 =                                                                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -561,31 +897,31 @@
                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                 <!-- col9 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                 <!-- col12 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                 <!-- col13 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -603,133 +939,301 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col20 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col21 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col22 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col23 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col24 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col25 =                                                     -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col38 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col26 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col27 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col28 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col29 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col30 =                                                     -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col31 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col32 =                                               -->
+                                <!-- col53 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col33 =                                               -->
+                                <!-- col54 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col34 =                                               -->
+                                <!-- col55 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col35 =                                               -->
+                                <!-- col56 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col36 =                                                     -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col63 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col37 =                                               -->
+                                <!-- col65 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col38 =                                               -->
+                                <!-- col66 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col39 =                                                 -->
+                                <!-- col67 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col40 =                                               -->
+                                <!-- col68 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col41 =                                                     -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col75 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col42 =                                               -->
+                                <!-- col77 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col43 =                                               -->
+                                <!-- col78 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col44 =                                               -->
+                                <!-- col79 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col45 =                                               -->
+                                <!-- col80 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col46 =                                                     -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col87 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col47 =                                                     -->
+                                <!-- col89 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col48 =                                                     -->
+                                <!-- col90 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col49 =                                                     -->
+                                <!-- col91 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col50 =                                                     -->
+                                <!-- col92 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col51 =                                                     -->
+                                <!-- col93 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml
index 0a98623c4d..07444a9b99 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml
@@ -4,13 +4,13 @@
         <!-- node_id = ss_16 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
         <!--    'column_alias': 'listing__country_latest'}             -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
         <!-- where = None -->
         <!-- order_by0 =                                               -->
         <!--   {'class': 'SqlOrderByDescription',                      -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
         <!--    'desc': False}                                         -->
         <SqlSelectStatementNode>
             <!-- description =                    -->
@@ -19,7 +19,7 @@
             <!-- node_id = ss_15 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
             <!--    'column_alias': 'listing__country_latest'}             -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
             <!-- where = None -->
@@ -28,11 +28,11 @@
                 <!-- node_id = ss_14 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                 <!--    'column_alias': 'listing__country_latest'}             -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
@@ -41,7 +41,7 @@
                     <!-- node_id = ss_13 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -50,7 +50,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -60,11 +60,11 @@
                         <!-- node_id = ss_12 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                         <!--    'column_alias': 'listing__country_latest'}             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
@@ -73,15 +73,15 @@
                             <!-- node_id = ss_11 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                             <!--    'column_alias': 'listing__country_latest'}             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- join_0 =                                                    -->
@@ -98,11 +98,11 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
@@ -111,227 +111,395 @@
                                     <!-- node_id = ss_7 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                                    <!--    'column_alias': 'paid_at__day'}                        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                                    <!--    'column_alias': 'paid_at__week'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                                    <!--    'column_alias': 'paid_at__month'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                                    <!--    'column_alias': 'paid_at__year'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                                    <!--    'column_alias': 'booking__ds__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                                    <!--    'column_alias': 'booking__ds__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                                    <!--    'column_alias': 'booking__ds__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                                    <!--    'column_alias': 'booking__ds__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                    <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                    <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                    <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                    <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!-- col53 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col54 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col55 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col56 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col57 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col58 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col59 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col60 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!-- col61 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!-- col62 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!-- col63 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!-- col64 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!-- col65 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                    <!-- col66 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                    <!-- col67 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                    <!-- col68 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                    <!-- col69 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                    <!-- col70 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col71 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col72 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!-- col73 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!-- col74 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!-- col75 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!-- col76 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!-- col77 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!-- col78 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!-- col79 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                                    <!--    'column_alias': 'host'}                                -->
+                                    <!-- col80 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!-- col81 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!-- col82 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!-- col83 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!-- col84 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!-- col85 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!-- col86 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!-- col87 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!-- col88 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!-- col89 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!-- col90 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col91 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!-- col92 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!-- col93 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!-- col94 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                   -->
-                                    <!-- col53 =                                                   -->
+                                    <!-- col95 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                    <!-- col54 =                                                         -->
+                                    <!-- col96 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                    <!-- col55 =                                                       -->
+                                    <!-- col97 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
@@ -348,27 +516,27 @@
                                         <!--    'column_alias': 'instant_bookings'}                                                              -->
                                         <!-- col2 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                         <!--    'column_alias': 'booking_value'}                         -->
                                         <!-- col3 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                         <!--    'column_alias': 'max_booking_value'}                     -->
                                         <!-- col4 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                         <!--    'column_alias': 'min_booking_value'}                     -->
                                         <!-- col5 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                         <!--    'column_alias': 'bookers'}                               -->
                                         <!-- col6 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                         <!--    'column_alias': 'average_booking_value'}                 -->
                                         <!-- col7 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                         <!--    'column_alias': 'booking_payments'}                      -->
                                         <!-- col8 =                                                                                                           -->
                                         <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -376,31 +544,31 @@
                                         <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                         <!-- col9 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                         <!--    'column_alias': 'median_booking_value'}                  -->
                                         <!-- col10 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                         <!--    'column_alias': 'booking_value_p99'}                     -->
                                         <!-- col11 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                         <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                         <!-- col12 =                                                         -->
                                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                         <!-- col13 =                                                       -->
                                         <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                         <!-- col14 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                         <!--    'column_alias': 'is_instant'}                            -->
                                         <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                         <!--    'column_alias': 'ds__day'}                               -->
                                         <!-- col16 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -418,133 +586,301 @@
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                         <!--    'column_alias': 'ds__year'}                        -->
-                                        <!-- col20 =                                                     -->
+                                        <!-- col20 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                        <!--    'column_alias': 'ds__extract_year'}              -->
+                                        <!-- col21 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                        <!-- col22 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                        <!--    'column_alias': 'ds__extract_month'}             -->
+                                        <!-- col23 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                        <!--    'column_alias': 'ds__extract_week'}              -->
+                                        <!-- col24 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                        <!--    'column_alias': 'ds__extract_day'}               -->
+                                        <!-- col25 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!-- col26 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                         <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                        <!-- col21 =                                               -->
+                                        <!-- col28 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                         <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                        <!-- col22 =                                               -->
+                                        <!-- col29 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                         <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                        <!-- col23 =                                               -->
+                                        <!-- col30 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                        <!-- col24 =                                               -->
+                                        <!-- col31 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                         <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                        <!-- col25 =                                                     -->
+                                        <!-- col32 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                        <!-- col33 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                        <!-- col34 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                        <!-- col35 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                        <!-- col36 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                        <!-- col37 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col38 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col39 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                         <!--    'column_alias': 'paid_at__day'}                          -->
-                                        <!-- col26 =                                               -->
+                                        <!-- col40 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                         <!--    'column_alias': 'paid_at__week'}                   -->
-                                        <!-- col27 =                                               -->
+                                        <!-- col41 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                         <!--    'column_alias': 'paid_at__month'}                  -->
-                                        <!-- col28 =                                               -->
+                                        <!-- col42 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                         <!--    'column_alias': 'paid_at__quarter'}                -->
-                                        <!-- col29 =                                               -->
+                                        <!-- col43 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                         <!--    'column_alias': 'paid_at__year'}                   -->
-                                        <!-- col30 =                                                     -->
+                                        <!-- col44 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                        <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                        <!-- col45 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                        <!-- col46 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                        <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                        <!-- col47 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                        <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                        <!-- col48 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                        <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                        <!-- col49 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!-- col50 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!-- col51 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                         <!--    'column_alias': 'booking__is_instant'}                   -->
-                                        <!-- col31 =                                                     -->
+                                        <!-- col52 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                         <!--    'column_alias': 'booking__ds__day'}                      -->
-                                        <!-- col32 =                                               -->
+                                        <!-- col53 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                         <!--    'column_alias': 'booking__ds__week'}               -->
-                                        <!-- col33 =                                               -->
+                                        <!-- col54 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                         <!--    'column_alias': 'booking__ds__month'}              -->
-                                        <!-- col34 =                                               -->
+                                        <!-- col55 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                         <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                        <!-- col35 =                                               -->
+                                        <!-- col56 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                         <!--    'column_alias': 'booking__ds__year'}               -->
-                                        <!-- col36 =                                                     -->
+                                        <!-- col57 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                        <!-- col58 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                        <!-- col59 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                        <!-- col60 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                        <!-- col61 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                        <!-- col62 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                        <!-- col63 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col64 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                        <!-- col37 =                                               -->
+                                        <!-- col65 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                        <!-- col38 =                                               -->
+                                        <!-- col66 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                        <!-- col39 =                                                 -->
+                                        <!-- col67 =                                                 -->
                                         <!--   {'class': 'SqlSelectColumn',                          -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                        <!-- col40 =                                               -->
+                                        <!-- col68 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                        <!-- col41 =                                                     -->
+                                        <!-- col69 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                        <!-- col70 =                                                         -->
+                                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                        <!-- col71 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                        <!-- col72 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                        <!-- col73 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                        <!-- col74 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col75 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col76 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                         <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                        <!-- col42 =                                               -->
+                                        <!-- col77 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                         <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                        <!-- col43 =                                               -->
+                                        <!-- col78 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                         <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                        <!-- col44 =                                               -->
+                                        <!-- col79 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                         <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                        <!-- col45 =                                               -->
+                                        <!-- col80 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                         <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                        <!-- col46 =                                                     -->
+                                        <!-- col81 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                        <!-- col82 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                        <!-- col83 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                        <!-- col84 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                        <!-- col85 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                        <!-- col86 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                        <!-- col87 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col88 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                         <!--    'column_alias': 'listing'}                               -->
-                                        <!-- col47 =                                                     -->
+                                        <!-- col89 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                         <!--    'column_alias': 'guest'}                                 -->
-                                        <!-- col48 =                                                     -->
+                                        <!-- col90 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                         <!--    'column_alias': 'host'}                                  -->
-                                        <!-- col49 =                                                     -->
+                                        <!-- col91 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                         <!--    'column_alias': 'booking__listing'}                      -->
-                                        <!-- col50 =                                                     -->
+                                        <!-- col92 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                         <!--    'column_alias': 'booking__guest'}                        -->
-                                        <!-- col51 =                                                     -->
+                                        <!-- col93 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                         <!--    'column_alias': 'booking__host'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                         <!-- where = None -->
@@ -563,11 +899,11 @@
                                 <!-- node_id = ss_10 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
                                 <!--    'column_alias': 'country_latest'}                      -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                                 <!-- where = None -->
@@ -576,151 +912,263 @@
                                     <!-- node_id = ss_9 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
-                                    <!--    'column_alias': 'created_at__day'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
-                                    <!--    'column_alias': 'created_at__week'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
-                                    <!--    'column_alias': 'created_at__month'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                                    <!--    'column_alias': 'created_at__quarter'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                                    <!--    'column_alias': 'created_at__year'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
-                                    <!--    'column_alias': 'listing__ds__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
-                                    <!--    'column_alias': 'listing__ds__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
-                                    <!--    'column_alias': 'listing__ds__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                                    <!--    'column_alias': 'created_at__day'}                     -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
-                                    <!--    'column_alias': 'listing__ds__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                                    <!--    'column_alias': 'created_at__week'}                    -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
-                                    <!--    'column_alias': 'listing__ds__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                                    <!--    'column_alias': 'created_at__month'}                   -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                                    <!--    'column_alias': 'listing__created_at__day'}            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                    <!--    'column_alias': 'created_at__quarter'}                 -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                                    <!--    'column_alias': 'listing__created_at__week'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                    <!--    'column_alias': 'created_at__year'}                    -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                                    <!--    'column_alias': 'listing__created_at__month'}          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                    <!--    'column_alias': 'created_at__extract_year'}            -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                                    <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                    <!--    'column_alias': 'created_at__extract_quarter'}         -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                                    <!--    'column_alias': 'listing__created_at__year'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                    <!--    'column_alias': 'created_at__extract_month'}           -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                    <!--    'column_alias': 'created_at__extract_week'}            -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                    <!--    'column_alias': 'created_at__extract_day'}             -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                    <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                    <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                    <!--    'column_alias': 'listing__ds__day'}                    -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                    <!--    'column_alias': 'listing__ds__week'}                   -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                                    <!--    'column_alias': 'user'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                    <!--    'column_alias': 'listing__ds__month'}                  -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                                    <!--    'column_alias': 'listing__user'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                    <!--    'column_alias': 'listing__ds__quarter'}                -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
-                                    <!--    'column_alias': 'country_latest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                    <!--    'column_alias': 'listing__ds__year'}                   -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_year'}           -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_month'}          -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_week'}           -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_day'}            -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
-                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
-                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                    <!--    'column_alias': 'listing__created_at__day'}            -->
+                                    <!-- col37 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                    <!--    'column_alias': 'listing__created_at__week'}           -->
+                                    <!-- col38 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                    <!--    'column_alias': 'listing__created_at__month'}          -->
+                                    <!-- col39 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                    <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                                    <!-- col40 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                    <!--    'column_alias': 'listing__created_at__year'}           -->
+                                    <!-- col41 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_year'}   -->
+                                    <!-- col42 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),    -->
+                                    <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                    <!-- col43 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                    <!-- col44 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_week'}   -->
+                                    <!-- col45 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_day'}    -->
+                                    <!-- col46 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),      -->
+                                    <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                    <!-- col47 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),      -->
+                                    <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                    <!-- col48 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!-- col49 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!-- col50 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!-- col51 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!-- col52 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!-- col53 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!-- col54 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                    <!--    'column_alias': 'user'}                                -->
+                                    <!-- col55 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                    <!--    'column_alias': 'listing__user'}                       -->
+                                    <!-- col56 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                                    <!--    'column_alias': 'country_latest'}                      -->
+                                    <!-- col57 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!-- col58 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!-- col59 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!-- col60 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!-- col61 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!-- col62 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
+                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!-- col63 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!-- col64 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                                     <!--    'column_alias': 'smallest_listing'}                    -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                     <!-- where = None -->
@@ -733,15 +1181,15 @@
                                         <!--    'column_alias': 'listings'}                                 -->
                                         <!-- col1 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                                         <!--    'column_alias': 'largest_listing'}                       -->
                                         <!-- col2 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                                         <!--    'column_alias': 'smallest_listing'}                      -->
                                         <!-- col3 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                                         <!--    'column_alias': 'ds__day'}                               -->
                                         <!-- col4 =                                                -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -759,101 +1207,213 @@
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                                         <!--    'column_alias': 'ds__year'}                        -->
-                                        <!-- col8 =                                                      -->
+                                        <!-- col8 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                                        <!--    'column_alias': 'ds__extract_year'}              -->
+                                        <!-- col9 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                        <!-- col10 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                                        <!--    'column_alias': 'ds__extract_month'}             -->
+                                        <!-- col11 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                                        <!--    'column_alias': 'ds__extract_week'}              -->
+                                        <!-- col12 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                                        <!--    'column_alias': 'ds__extract_day'}               -->
+                                        <!-- col13 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!-- col14 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                                         <!--    'column_alias': 'created_at__day'}                       -->
-                                        <!-- col9 =                                                -->
+                                        <!-- col16 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                                         <!--    'column_alias': 'created_at__week'}                -->
-                                        <!-- col10 =                                               -->
+                                        <!-- col17 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                                         <!--    'column_alias': 'created_at__month'}               -->
-                                        <!-- col11 =                                               -->
+                                        <!-- col18 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                                         <!--    'column_alias': 'created_at__quarter'}             -->
-                                        <!-- col12 =                                               -->
+                                        <!-- col19 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                                         <!--    'column_alias': 'created_at__year'}                -->
-                                        <!-- col13 =                                                     -->
+                                        <!-- col20 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                                        <!--    'column_alias': 'created_at__extract_year'}      -->
+                                        <!-- col21 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                                        <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                                        <!-- col22 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                                        <!--    'column_alias': 'created_at__extract_month'}     -->
+                                        <!-- col23 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                                        <!--    'column_alias': 'created_at__extract_week'}      -->
+                                        <!-- col24 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                                        <!--    'column_alias': 'created_at__extract_day'}       -->
+                                        <!-- col25 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                                        <!-- col26 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                        <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                                         <!--    'column_alias': 'country_latest'}                        -->
-                                        <!-- col14 =                                                     -->
+                                        <!-- col28 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                                         <!--    'column_alias': 'is_lux_latest'}                         -->
-                                        <!-- col15 =                                                     -->
+                                        <!-- col29 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                                         <!--    'column_alias': 'capacity_latest'}                       -->
-                                        <!-- col16 =                                                     -->
+                                        <!-- col30 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                                         <!--    'column_alias': 'listing__ds__day'}                      -->
-                                        <!-- col17 =                                               -->
+                                        <!-- col31 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                                         <!--    'column_alias': 'listing__ds__week'}               -->
-                                        <!-- col18 =                                               -->
+                                        <!-- col32 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                                         <!--    'column_alias': 'listing__ds__month'}              -->
-                                        <!-- col19 =                                               -->
+                                        <!-- col33 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                                         <!--    'column_alias': 'listing__ds__quarter'}            -->
-                                        <!-- col20 =                                               -->
+                                        <!-- col34 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                                         <!--    'column_alias': 'listing__ds__year'}               -->
-                                        <!-- col21 =                                                     -->
+                                        <!-- col35 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                                        <!-- col36 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                                        <!-- col37 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                                        <!-- col38 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                                        <!-- col39 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                                        <!-- col40 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                                        <!-- col41 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                        <!-- col42 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                                         <!--    'column_alias': 'listing__created_at__day'}              -->
-                                        <!-- col22 =                                               -->
+                                        <!-- col43 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                                         <!--    'column_alias': 'listing__created_at__week'}       -->
-                                        <!-- col23 =                                               -->
+                                        <!-- col44 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                                         <!--    'column_alias': 'listing__created_at__month'}      -->
-                                        <!-- col24 =                                               -->
+                                        <!-- col45 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                                         <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                                        <!-- col25 =                                               -->
+                                        <!-- col46 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                                         <!--    'column_alias': 'listing__created_at__year'}       -->
-                                        <!-- col26 =                                                     -->
+                                        <!-- col47 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                                        <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                                        <!-- col48 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                                        <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                        <!-- col49 =                                                   -->
+                                        <!--   {'class': 'SqlSelectColumn',                            -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                                        <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                        <!-- col50 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                                        <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                                        <!-- col51 =                                                 -->
+                                        <!--   {'class': 'SqlSelectColumn',                          -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                                        <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                                        <!-- col52 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                        <!-- col53 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                        <!-- col54 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                                         <!--    'column_alias': 'listing__country_latest'}               -->
-                                        <!-- col27 =                                                     -->
+                                        <!-- col55 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                                         <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                                        <!-- col28 =                                                     -->
+                                        <!-- col56 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                                         <!--    'column_alias': 'listing__capacity_latest'}              -->
-                                        <!-- col29 =                                                     -->
+                                        <!-- col57 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                                         <!--    'column_alias': 'listing'}                               -->
-                                        <!-- col30 =                                                     -->
+                                        <!-- col58 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                                         <!--    'column_alias': 'user'}                                  -->
-                                        <!-- col31 =                                                     -->
+                                        <!-- col59 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                                         <!--    'column_alias': 'listing__user'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml
index e6bdd09af0..fcfe3e55b0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml
@@ -23,27 +23,27 @@
             <!--    'column_alias': 'instant_bookings'}                                                              -->
             <!-- col2 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
             <!--    'column_alias': 'booking_value'}                         -->
             <!-- col3 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
             <!--    'column_alias': 'max_booking_value'}                     -->
             <!-- col4 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
             <!--    'column_alias': 'min_booking_value'}                     -->
             <!-- col5 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
             <!--    'column_alias': 'bookers'}                               -->
             <!-- col6 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
             <!--    'column_alias': 'average_booking_value'}                 -->
             <!-- col7 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
             <!--    'column_alias': 'booking_payments'}                      -->
             <!-- col8 =                                                                                                           -->
             <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -51,31 +51,31 @@
             <!--    'column_alias': 'referred_bookings'}                                                                          -->
             <!-- col9 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
             <!--    'column_alias': 'median_booking_value'}                  -->
             <!-- col10 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
             <!--    'column_alias': 'booking_value_p99'}                     -->
             <!-- col11 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
             <!--    'column_alias': 'discrete_booking_value_p99'}            -->
             <!-- col12 =                                                         -->
             <!--   {'class': 'SqlSelectColumn',                                  -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
             <!-- col13 =                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
             <!-- col14 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
             <!--    'column_alias': 'is_instant'}                            -->
             <!-- col15 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
             <!--    'column_alias': 'ds__day'}                               -->
             <!-- col16 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -93,133 +93,301 @@
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
             <!--    'column_alias': 'ds__year'}                        -->
-            <!-- col20 =                                                     -->
+            <!-- col20 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+            <!--    'column_alias': 'ds__extract_year'}              -->
+            <!-- col21 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+            <!--    'column_alias': 'ds__extract_quarter'}           -->
+            <!-- col22 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+            <!--    'column_alias': 'ds__extract_month'}             -->
+            <!-- col23 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+            <!--    'column_alias': 'ds__extract_week'}              -->
+            <!-- col24 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+            <!--    'column_alias': 'ds__extract_day'}               -->
+            <!-- col25 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+            <!-- col26 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+            <!-- col27 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
             <!--    'column_alias': 'ds_partitioned__day'}                   -->
-            <!-- col21 =                                               -->
+            <!-- col28 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
             <!--    'column_alias': 'ds_partitioned__week'}            -->
-            <!-- col22 =                                               -->
+            <!-- col29 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
             <!--    'column_alias': 'ds_partitioned__month'}           -->
-            <!-- col23 =                                               -->
+            <!-- col30 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
             <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-            <!-- col24 =                                               -->
+            <!-- col31 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
             <!--    'column_alias': 'ds_partitioned__year'}            -->
-            <!-- col25 =                                                     -->
+            <!-- col32 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+            <!-- col33 =                                                -->
+            <!--   {'class': 'SqlSelectColumn',                         -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+            <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+            <!-- col34 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                       -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+            <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+            <!-- col35 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+            <!-- col36 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+            <!-- col37 =                                                  -->
+            <!--   {'class': 'SqlSelectColumn',                           -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+            <!-- col38 =                                                  -->
+            <!--   {'class': 'SqlSelectColumn',                           -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+            <!-- col39 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
             <!--    'column_alias': 'paid_at__day'}                          -->
-            <!-- col26 =                                               -->
+            <!-- col40 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
             <!--    'column_alias': 'paid_at__week'}                   -->
-            <!-- col27 =                                               -->
+            <!-- col41 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
             <!--    'column_alias': 'paid_at__month'}                  -->
-            <!-- col28 =                                               -->
+            <!-- col42 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
             <!--    'column_alias': 'paid_at__quarter'}                -->
-            <!-- col29 =                                               -->
+            <!-- col43 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
             <!--    'column_alias': 'paid_at__year'}                   -->
-            <!-- col30 =                                                     -->
+            <!-- col44 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+            <!--    'column_alias': 'paid_at__extract_year'}         -->
+            <!-- col45 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+            <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+            <!-- col46 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+            <!--    'column_alias': 'paid_at__extract_month'}        -->
+            <!-- col47 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+            <!--    'column_alias': 'paid_at__extract_week'}         -->
+            <!-- col48 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+            <!--    'column_alias': 'paid_at__extract_day'}          -->
+            <!-- col49 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+            <!-- col50 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+            <!-- col51 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
             <!--    'column_alias': 'booking__is_instant'}                   -->
-            <!-- col31 =                                                     -->
+            <!-- col52 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
             <!--    'column_alias': 'booking__ds__day'}                      -->
-            <!-- col32 =                                               -->
+            <!-- col53 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
             <!--    'column_alias': 'booking__ds__week'}               -->
-            <!-- col33 =                                               -->
+            <!-- col54 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
             <!--    'column_alias': 'booking__ds__month'}              -->
-            <!-- col34 =                                               -->
+            <!-- col55 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
             <!--    'column_alias': 'booking__ds__quarter'}            -->
-            <!-- col35 =                                               -->
+            <!-- col56 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
             <!--    'column_alias': 'booking__ds__year'}               -->
-            <!-- col36 =                                                     -->
+            <!-- col57 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+            <!--    'column_alias': 'booking__ds__extract_year'}     -->
+            <!-- col58 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+            <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+            <!-- col59 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+            <!--    'column_alias': 'booking__ds__extract_month'}    -->
+            <!-- col60 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+            <!--    'column_alias': 'booking__ds__extract_week'}     -->
+            <!-- col61 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+            <!--    'column_alias': 'booking__ds__extract_day'}      -->
+            <!-- col62 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+            <!-- col63 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+            <!-- col64 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
             <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-            <!-- col37 =                                               -->
+            <!-- col65 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
             <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-            <!-- col38 =                                               -->
+            <!-- col66 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
             <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-            <!-- col39 =                                                 -->
+            <!-- col67 =                                                 -->
             <!--   {'class': 'SqlSelectColumn',                          -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
             <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-            <!-- col40 =                                               -->
+            <!-- col68 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
             <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-            <!-- col41 =                                                     -->
+            <!-- col69 =                                                      -->
+            <!--   {'class': 'SqlSelectColumn',                               -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+            <!-- col70 =                                                         -->
+            <!--   {'class': 'SqlSelectColumn',                                  -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+            <!-- col71 =                                                       -->
+            <!--   {'class': 'SqlSelectColumn',                                -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+            <!-- col72 =                                                      -->
+            <!--   {'class': 'SqlSelectColumn',                               -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+            <!-- col73 =                                                     -->
+            <!--   {'class': 'SqlSelectColumn',                              -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+            <!-- col74 =                                                           -->
+            <!--   {'class': 'SqlSelectColumn',                                    -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+            <!-- col75 =                                                           -->
+            <!--   {'class': 'SqlSelectColumn',                                    -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+            <!-- col76 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
             <!--    'column_alias': 'booking__paid_at__day'}                 -->
-            <!-- col42 =                                               -->
+            <!-- col77 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
             <!--    'column_alias': 'booking__paid_at__week'}          -->
-            <!-- col43 =                                               -->
+            <!-- col78 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
             <!--    'column_alias': 'booking__paid_at__month'}         -->
-            <!-- col44 =                                               -->
+            <!-- col79 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
             <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-            <!-- col45 =                                               -->
+            <!-- col80 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
             <!--    'column_alias': 'booking__paid_at__year'}          -->
-            <!-- col46 =                                                     -->
+            <!-- col81 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+            <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+            <!-- col82 =                                                  -->
+            <!--   {'class': 'SqlSelectColumn',                           -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+            <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+            <!-- col83 =                                                -->
+            <!--   {'class': 'SqlSelectColumn',                         -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+            <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+            <!-- col84 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+            <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+            <!-- col85 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                       -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+            <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+            <!-- col86 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                             -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+            <!-- col87 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                             -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+            <!-- col88 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
             <!--    'column_alias': 'listing'}                               -->
-            <!-- col47 =                                                     -->
+            <!-- col89 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
             <!--    'column_alias': 'guest'}                                 -->
-            <!-- col48 =                                                     -->
+            <!-- col90 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
             <!--    'column_alias': 'host'}                                  -->
-            <!-- col49 =                                                     -->
+            <!-- col91 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
             <!--    'column_alias': 'booking__listing'}                      -->
-            <!-- col50 =                                                     -->
+            <!-- col92 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
             <!--    'column_alias': 'booking__guest'}                        -->
-            <!-- col51 =                                                     -->
+            <!-- col93 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
             <!--    'column_alias': 'booking__host'}                         -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml
index be8b76158e..3588eccfef 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml
@@ -41,27 +41,27 @@
                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                 <!-- col2 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                 <!--    'column_alias': 'booking_value'}                         -->
                 <!-- col3 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                 <!--    'column_alias': 'max_booking_value'}                     -->
                 <!-- col4 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                 <!--    'column_alias': 'min_booking_value'}                     -->
                 <!-- col5 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                 <!--    'column_alias': 'bookers'}                               -->
                 <!-- col6 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                 <!--    'column_alias': 'average_booking_value'}                 -->
                 <!-- col7 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                 <!--    'column_alias': 'booking_payments'}                      -->
                 <!-- col8 =                                                                                                           -->
                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -69,31 +69,31 @@
                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                 <!-- col9 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                 <!--    'column_alias': 'median_booking_value'}                  -->
                 <!-- col10 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                 <!--    'column_alias': 'booking_value_p99'}                     -->
                 <!-- col11 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                 <!-- col12 =                                                         -->
                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                 <!-- col13 =                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                 <!-- col14 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                 <!--    'column_alias': 'is_instant'}                            -->
                 <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                 <!--    'column_alias': 'ds__day'}                               -->
                 <!-- col16 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -111,133 +111,301 @@
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                 <!--    'column_alias': 'ds__year'}                        -->
-                <!-- col20 =                                                     -->
+                <!-- col20 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                <!--    'column_alias': 'ds__extract_year'}              -->
+                <!-- col21 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                <!-- col22 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                <!--    'column_alias': 'ds__extract_month'}             -->
+                <!-- col23 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                <!--    'column_alias': 'ds__extract_week'}              -->
+                <!-- col24 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                <!--    'column_alias': 'ds__extract_day'}               -->
+                <!-- col25 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!-- col26 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                <!-- col21 =                                               -->
+                <!-- col28 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                <!-- col22 =                                               -->
+                <!-- col29 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                <!-- col23 =                                               -->
+                <!-- col30 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                <!-- col24 =                                               -->
+                <!-- col31 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                <!-- col25 =                                                     -->
+                <!-- col32 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                <!-- col33 =                                                -->
+                <!--   {'class': 'SqlSelectColumn',                         -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                <!-- col34 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                <!-- col35 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                <!-- col36 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                <!-- col37 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                <!-- col38 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                <!-- col39 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                 <!--    'column_alias': 'paid_at__day'}                          -->
-                <!-- col26 =                                               -->
+                <!-- col40 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                 <!--    'column_alias': 'paid_at__week'}                   -->
-                <!-- col27 =                                               -->
+                <!-- col41 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                 <!--    'column_alias': 'paid_at__month'}                  -->
-                <!-- col28 =                                               -->
+                <!-- col42 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                <!-- col29 =                                               -->
+                <!-- col43 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                 <!--    'column_alias': 'paid_at__year'}                   -->
-                <!-- col30 =                                                     -->
+                <!-- col44 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                <!-- col45 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                <!-- col46 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                <!-- col47 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                <!-- col48 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                <!-- col49 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                <!-- col50 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                <!-- col51 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                <!-- col31 =                                                     -->
+                <!-- col52 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                <!-- col32 =                                               -->
+                <!-- col53 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                 <!--    'column_alias': 'booking__ds__week'}               -->
-                <!-- col33 =                                               -->
+                <!-- col54 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                 <!--    'column_alias': 'booking__ds__month'}              -->
-                <!-- col34 =                                               -->
+                <!-- col55 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                <!-- col35 =                                               -->
+                <!-- col56 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                 <!--    'column_alias': 'booking__ds__year'}               -->
-                <!-- col36 =                                                     -->
+                <!-- col57 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                <!-- col58 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                <!-- col59 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                <!-- col60 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                <!-- col61 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                <!-- col62 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                <!-- col63 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                <!-- col64 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                <!-- col37 =                                               -->
+                <!-- col65 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                <!-- col38 =                                               -->
+                <!-- col66 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                <!-- col39 =                                                 -->
+                <!-- col67 =                                                 -->
                 <!--   {'class': 'SqlSelectColumn',                          -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                <!-- col40 =                                               -->
+                <!-- col68 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                <!-- col41 =                                                     -->
+                <!-- col69 =                                                      -->
+                <!--   {'class': 'SqlSelectColumn',                               -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                <!-- col70 =                                                         -->
+                <!--   {'class': 'SqlSelectColumn',                                  -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                <!-- col71 =                                                       -->
+                <!--   {'class': 'SqlSelectColumn',                                -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                <!-- col72 =                                                      -->
+                <!--   {'class': 'SqlSelectColumn',                               -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                <!-- col73 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                <!-- col74 =                                                           -->
+                <!--   {'class': 'SqlSelectColumn',                                    -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                <!-- col75 =                                                           -->
+                <!--   {'class': 'SqlSelectColumn',                                    -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                <!-- col76 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                <!-- col42 =                                               -->
+                <!-- col77 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                <!-- col43 =                                               -->
+                <!-- col78 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                <!-- col44 =                                               -->
+                <!-- col79 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                <!-- col45 =                                               -->
+                <!-- col80 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                <!-- col46 =                                                     -->
+                <!-- col81 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                <!-- col82 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                <!-- col83 =                                                -->
+                <!--   {'class': 'SqlSelectColumn',                         -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                <!-- col84 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                <!-- col85 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                <!-- col86 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                             -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                <!-- col87 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                             -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                <!-- col88 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                 <!--    'column_alias': 'listing'}                               -->
-                <!-- col47 =                                                     -->
+                <!-- col89 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                 <!--    'column_alias': 'guest'}                                 -->
-                <!-- col48 =                                                     -->
+                <!-- col90 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                 <!--    'column_alias': 'host'}                                  -->
-                <!-- col49 =                                                     -->
+                <!-- col91 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                 <!--    'column_alias': 'booking__listing'}                      -->
-                <!-- col50 =                                                     -->
+                <!-- col92 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                 <!--    'column_alias': 'booking__guest'}                        -->
-                <!-- col51 =                                                     -->
+                <!-- col93 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                 <!--    'column_alias': 'booking__host'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml
index 5cfd7e07dd..38e7f01169 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_16 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
         <!--    'column_alias': 'is_instant'}                          -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_15 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
             <!--    'column_alias': 'is_instant'}                          -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
             <!--    'column_alias': 'is_instant'}                          -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_14 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                 <!--    'column_alias': 'is_instant'}                          -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
@@ -49,15 +49,15 @@
                     <!-- node_id = ss_13 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                     <!--    'column_alias': 'is_instant'}                          -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                     <!-- where =                                                                       -->
@@ -69,15 +69,15 @@
                         <!-- node_id = ss_12 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                         <!--    'column_alias': 'is_instant'}                          -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                         <!--    'column_alias': 'listing__country_latest'}             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
@@ -86,19 +86,19 @@
                             <!-- node_id = ss_11 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                             <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                             <!--    'column_alias': 'listing__country_latest'}             -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- join_0 =                                                    -->
@@ -115,15 +115,15 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                 <!--    'column_alias': 'is_instant'}                          -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
@@ -132,227 +132,395 @@
                                     <!-- node_id = ss_7 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                                    <!--    'column_alias': 'paid_at__day'}                        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                                    <!--    'column_alias': 'paid_at__week'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                                    <!--    'column_alias': 'paid_at__month'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                                    <!--    'column_alias': 'paid_at__year'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                                    <!--    'column_alias': 'booking__ds__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                                    <!--    'column_alias': 'booking__ds__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                                    <!--    'column_alias': 'booking__ds__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                                    <!--    'column_alias': 'booking__ds__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                    <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                    <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                    <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                    <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!-- col53 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col54 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col55 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col56 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col57 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col58 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col59 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col60 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!-- col61 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!-- col62 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!-- col63 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!-- col64 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!-- col65 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                    <!-- col66 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                    <!-- col67 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                    <!-- col68 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                    <!-- col69 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                    <!-- col70 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col71 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col72 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!-- col73 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!-- col74 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!-- col75 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!-- col76 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!-- col77 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!-- col78 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!-- col79 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                                    <!--    'column_alias': 'host'}                                -->
+                                    <!-- col80 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!-- col81 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!-- col82 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!-- col83 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!-- col84 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!-- col85 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!-- col86 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!-- col87 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!-- col88 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!-- col89 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!-- col90 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col91 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!-- col92 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!-- col93 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!-- col94 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                   -->
-                                    <!-- col53 =                                                   -->
+                                    <!-- col95 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                    <!-- col54 =                                                         -->
+                                    <!-- col96 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                    <!-- col55 =                                                       -->
+                                    <!-- col97 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
@@ -369,27 +537,27 @@
                                         <!--    'column_alias': 'instant_bookings'}                                                              -->
                                         <!-- col2 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                         <!--    'column_alias': 'booking_value'}                         -->
                                         <!-- col3 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                         <!--    'column_alias': 'max_booking_value'}                     -->
                                         <!-- col4 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                         <!--    'column_alias': 'min_booking_value'}                     -->
                                         <!-- col5 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                         <!--    'column_alias': 'bookers'}                               -->
                                         <!-- col6 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                         <!--    'column_alias': 'average_booking_value'}                 -->
                                         <!-- col7 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                         <!--    'column_alias': 'booking_payments'}                      -->
                                         <!-- col8 =                                                                                                           -->
                                         <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -397,31 +565,31 @@
                                         <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                         <!-- col9 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                         <!--    'column_alias': 'median_booking_value'}                  -->
                                         <!-- col10 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                         <!--    'column_alias': 'booking_value_p99'}                     -->
                                         <!-- col11 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                         <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                         <!-- col12 =                                                         -->
                                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                         <!-- col13 =                                                       -->
                                         <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                         <!-- col14 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                         <!--    'column_alias': 'is_instant'}                            -->
                                         <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                         <!--    'column_alias': 'ds__day'}                               -->
                                         <!-- col16 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -439,133 +607,301 @@
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                         <!--    'column_alias': 'ds__year'}                        -->
-                                        <!-- col20 =                                                     -->
+                                        <!-- col20 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                        <!--    'column_alias': 'ds__extract_year'}              -->
+                                        <!-- col21 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                        <!-- col22 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                        <!--    'column_alias': 'ds__extract_month'}             -->
+                                        <!-- col23 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                        <!--    'column_alias': 'ds__extract_week'}              -->
+                                        <!-- col24 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                        <!--    'column_alias': 'ds__extract_day'}               -->
+                                        <!-- col25 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!-- col26 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                         <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                        <!-- col21 =                                               -->
+                                        <!-- col28 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                         <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                        <!-- col22 =                                               -->
+                                        <!-- col29 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                         <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                        <!-- col23 =                                               -->
+                                        <!-- col30 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                        <!-- col24 =                                               -->
+                                        <!-- col31 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                         <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                        <!-- col25 =                                                     -->
+                                        <!-- col32 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                        <!-- col33 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                        <!-- col34 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                        <!-- col35 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                        <!-- col36 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                        <!-- col37 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col38 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col39 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                         <!--    'column_alias': 'paid_at__day'}                          -->
-                                        <!-- col26 =                                               -->
+                                        <!-- col40 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                         <!--    'column_alias': 'paid_at__week'}                   -->
-                                        <!-- col27 =                                               -->
+                                        <!-- col41 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                         <!--    'column_alias': 'paid_at__month'}                  -->
-                                        <!-- col28 =                                               -->
+                                        <!-- col42 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                         <!--    'column_alias': 'paid_at__quarter'}                -->
-                                        <!-- col29 =                                               -->
+                                        <!-- col43 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                         <!--    'column_alias': 'paid_at__year'}                   -->
-                                        <!-- col30 =                                                     -->
+                                        <!-- col44 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                        <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                        <!-- col45 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                        <!-- col46 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                        <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                        <!-- col47 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                        <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                        <!-- col48 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                        <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                        <!-- col49 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!-- col50 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!-- col51 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                         <!--    'column_alias': 'booking__is_instant'}                   -->
-                                        <!-- col31 =                                                     -->
+                                        <!-- col52 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                         <!--    'column_alias': 'booking__ds__day'}                      -->
-                                        <!-- col32 =                                               -->
+                                        <!-- col53 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                         <!--    'column_alias': 'booking__ds__week'}               -->
-                                        <!-- col33 =                                               -->
+                                        <!-- col54 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                         <!--    'column_alias': 'booking__ds__month'}              -->
-                                        <!-- col34 =                                               -->
+                                        <!-- col55 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                         <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                        <!-- col35 =                                               -->
+                                        <!-- col56 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                         <!--    'column_alias': 'booking__ds__year'}               -->
-                                        <!-- col36 =                                                     -->
+                                        <!-- col57 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                        <!-- col58 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                        <!-- col59 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                        <!-- col60 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                        <!-- col61 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                        <!-- col62 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                        <!-- col63 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col64 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                        <!-- col37 =                                               -->
+                                        <!-- col65 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                        <!-- col38 =                                               -->
+                                        <!-- col66 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                        <!-- col39 =                                                 -->
+                                        <!-- col67 =                                                 -->
                                         <!--   {'class': 'SqlSelectColumn',                          -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                        <!-- col40 =                                               -->
+                                        <!-- col68 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                        <!-- col41 =                                                     -->
+                                        <!-- col69 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                        <!-- col70 =                                                         -->
+                                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                        <!-- col71 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                        <!-- col72 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                        <!-- col73 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                        <!-- col74 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col75 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col76 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                         <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                        <!-- col42 =                                               -->
+                                        <!-- col77 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                         <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                        <!-- col43 =                                               -->
+                                        <!-- col78 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                         <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                        <!-- col44 =                                               -->
+                                        <!-- col79 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                         <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                        <!-- col45 =                                               -->
+                                        <!-- col80 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                         <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                        <!-- col46 =                                                     -->
+                                        <!-- col81 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                        <!-- col82 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                        <!-- col83 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                        <!-- col84 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                        <!-- col85 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                        <!-- col86 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                        <!-- col87 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col88 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                         <!--    'column_alias': 'listing'}                               -->
-                                        <!-- col47 =                                                     -->
+                                        <!-- col89 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                         <!--    'column_alias': 'guest'}                                 -->
-                                        <!-- col48 =                                                     -->
+                                        <!-- col90 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                         <!--    'column_alias': 'host'}                                  -->
-                                        <!-- col49 =                                                     -->
+                                        <!-- col91 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                         <!--    'column_alias': 'booking__listing'}                      -->
-                                        <!-- col50 =                                                     -->
+                                        <!-- col92 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                         <!--    'column_alias': 'booking__guest'}                        -->
-                                        <!-- col51 =                                                     -->
+                                        <!-- col93 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                         <!--    'column_alias': 'booking__host'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                         <!-- where = None -->
@@ -584,11 +920,11 @@
                                 <!-- node_id = ss_10 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                                 <!--    'column_alias': 'country_latest'}                      -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                                 <!-- where = None -->
@@ -597,151 +933,263 @@
                                     <!-- node_id = ss_9 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
-                                    <!--    'column_alias': 'created_at__day'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
-                                    <!--    'column_alias': 'created_at__week'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                                    <!--    'column_alias': 'created_at__month'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                                    <!--    'column_alias': 'created_at__quarter'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
-                                    <!--    'column_alias': 'created_at__year'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
-                                    <!--    'column_alias': 'listing__ds__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
-                                    <!--    'column_alias': 'listing__ds__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
-                                    <!--    'column_alias': 'listing__ds__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                                    <!--    'column_alias': 'created_at__day'}                     -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
-                                    <!--    'column_alias': 'listing__ds__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                                    <!--    'column_alias': 'created_at__week'}                    -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                                    <!--    'column_alias': 'listing__ds__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                    <!--    'column_alias': 'created_at__month'}                   -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                                    <!--    'column_alias': 'listing__created_at__day'}            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                    <!--    'column_alias': 'created_at__quarter'}                 -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                                    <!--    'column_alias': 'listing__created_at__week'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                    <!--    'column_alias': 'created_at__year'}                    -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                                    <!--    'column_alias': 'listing__created_at__month'}          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                    <!--    'column_alias': 'created_at__extract_year'}            -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                                    <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                    <!--    'column_alias': 'created_at__extract_quarter'}         -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                                    <!--    'column_alias': 'listing__created_at__year'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                    <!--    'column_alias': 'created_at__extract_month'}           -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                    <!--    'column_alias': 'created_at__extract_week'}            -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                    <!--    'column_alias': 'created_at__extract_day'}             -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                    <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                    <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                    <!--    'column_alias': 'listing__ds__day'}                    -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                    <!--    'column_alias': 'listing__ds__week'}                   -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                                    <!--    'column_alias': 'user'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                    <!--    'column_alias': 'listing__ds__month'}                  -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                                    <!--    'column_alias': 'listing__user'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                    <!--    'column_alias': 'listing__ds__quarter'}                -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                                    <!--    'column_alias': 'country_latest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                    <!--    'column_alias': 'listing__ds__year'}                   -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_year'}           -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_month'}          -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_week'}           -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_day'}            -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
-                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
-                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                    <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                    <!--    'column_alias': 'listing__created_at__day'}            -->
+                                    <!-- col37 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                    <!--    'column_alias': 'listing__created_at__week'}           -->
+                                    <!-- col38 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                    <!--    'column_alias': 'listing__created_at__month'}          -->
+                                    <!-- col39 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                    <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                                    <!-- col40 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                    <!--    'column_alias': 'listing__created_at__year'}           -->
+                                    <!-- col41 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_year'}   -->
+                                    <!-- col42 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),    -->
+                                    <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                    <!-- col43 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                    <!-- col44 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_week'}   -->
+                                    <!-- col45 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_day'}    -->
+                                    <!-- col46 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),      -->
+                                    <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                    <!-- col47 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),      -->
+                                    <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                    <!-- col48 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!-- col49 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!-- col50 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!-- col51 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!-- col52 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!-- col53 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!-- col54 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                    <!--    'column_alias': 'user'}                                -->
+                                    <!-- col55 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                    <!--    'column_alias': 'listing__user'}                       -->
+                                    <!-- col56 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                                    <!--    'column_alias': 'country_latest'}                      -->
+                                    <!-- col57 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!-- col58 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!-- col59 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!-- col60 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!-- col61 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!-- col62 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!-- col63 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!-- col64 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                                     <!--    'column_alias': 'smallest_listing'}                    -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                     <!-- where = None -->
@@ -754,15 +1202,15 @@
                                         <!--    'column_alias': 'listings'}                                 -->
                                         <!-- col1 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                                         <!--    'column_alias': 'largest_listing'}                       -->
                                         <!-- col2 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                                         <!--    'column_alias': 'smallest_listing'}                      -->
                                         <!-- col3 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                                         <!--    'column_alias': 'ds__day'}                               -->
                                         <!-- col4 =                                                -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -780,101 +1228,213 @@
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                                         <!--    'column_alias': 'ds__year'}                        -->
-                                        <!-- col8 =                                                      -->
+                                        <!-- col8 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                                        <!--    'column_alias': 'ds__extract_year'}              -->
+                                        <!-- col9 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                        <!-- col10 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                                        <!--    'column_alias': 'ds__extract_month'}             -->
+                                        <!-- col11 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                                        <!--    'column_alias': 'ds__extract_week'}              -->
+                                        <!-- col12 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                                        <!--    'column_alias': 'ds__extract_day'}               -->
+                                        <!-- col13 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!-- col14 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                                         <!--    'column_alias': 'created_at__day'}                       -->
-                                        <!-- col9 =                                                -->
+                                        <!-- col16 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                                         <!--    'column_alias': 'created_at__week'}                -->
-                                        <!-- col10 =                                               -->
+                                        <!-- col17 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                                         <!--    'column_alias': 'created_at__month'}               -->
-                                        <!-- col11 =                                               -->
+                                        <!-- col18 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                                         <!--    'column_alias': 'created_at__quarter'}             -->
-                                        <!-- col12 =                                               -->
+                                        <!-- col19 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                                         <!--    'column_alias': 'created_at__year'}                -->
-                                        <!-- col13 =                                                     -->
+                                        <!-- col20 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                                        <!--    'column_alias': 'created_at__extract_year'}      -->
+                                        <!-- col21 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                                        <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                                        <!-- col22 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                                        <!--    'column_alias': 'created_at__extract_month'}     -->
+                                        <!-- col23 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                                        <!--    'column_alias': 'created_at__extract_week'}      -->
+                                        <!-- col24 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                                        <!--    'column_alias': 'created_at__extract_day'}       -->
+                                        <!-- col25 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                                        <!-- col26 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                        <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                                         <!--    'column_alias': 'country_latest'}                        -->
-                                        <!-- col14 =                                                     -->
+                                        <!-- col28 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                                         <!--    'column_alias': 'is_lux_latest'}                         -->
-                                        <!-- col15 =                                                     -->
+                                        <!-- col29 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                                         <!--    'column_alias': 'capacity_latest'}                       -->
-                                        <!-- col16 =                                                     -->
+                                        <!-- col30 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                                         <!--    'column_alias': 'listing__ds__day'}                      -->
-                                        <!-- col17 =                                               -->
+                                        <!-- col31 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                                         <!--    'column_alias': 'listing__ds__week'}               -->
-                                        <!-- col18 =                                               -->
+                                        <!-- col32 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                                         <!--    'column_alias': 'listing__ds__month'}              -->
-                                        <!-- col19 =                                               -->
+                                        <!-- col33 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                                         <!--    'column_alias': 'listing__ds__quarter'}            -->
-                                        <!-- col20 =                                               -->
+                                        <!-- col34 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                                         <!--    'column_alias': 'listing__ds__year'}               -->
-                                        <!-- col21 =                                                     -->
+                                        <!-- col35 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                                        <!-- col36 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                                        <!-- col37 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                                        <!-- col38 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                                        <!-- col39 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                                        <!-- col40 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                                        <!-- col41 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                        <!-- col42 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                                         <!--    'column_alias': 'listing__created_at__day'}              -->
-                                        <!-- col22 =                                               -->
+                                        <!-- col43 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                                         <!--    'column_alias': 'listing__created_at__week'}       -->
-                                        <!-- col23 =                                               -->
+                                        <!-- col44 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                                         <!--    'column_alias': 'listing__created_at__month'}      -->
-                                        <!-- col24 =                                               -->
+                                        <!-- col45 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                                         <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                                        <!-- col25 =                                               -->
+                                        <!-- col46 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                                         <!--    'column_alias': 'listing__created_at__year'}       -->
-                                        <!-- col26 =                                                     -->
+                                        <!-- col47 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                                        <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                                        <!-- col48 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                                        <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                        <!-- col49 =                                                   -->
+                                        <!--   {'class': 'SqlSelectColumn',                            -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                                        <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                        <!-- col50 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                                        <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                                        <!-- col51 =                                                 -->
+                                        <!--   {'class': 'SqlSelectColumn',                          -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                                        <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                                        <!-- col52 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                        <!-- col53 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                        <!-- col54 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                                         <!--    'column_alias': 'listing__country_latest'}               -->
-                                        <!-- col27 =                                                     -->
+                                        <!-- col55 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                                         <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                                        <!-- col28 =                                                     -->
+                                        <!-- col56 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                                         <!--    'column_alias': 'listing__capacity_latest'}              -->
-                                        <!-- col29 =                                                     -->
+                                        <!-- col57 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                                         <!--    'column_alias': 'listing'}                               -->
-                                        <!-- col30 =                                                     -->
+                                        <!-- col58 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                                         <!--    'column_alias': 'user'}                                  -->
-                                        <!-- col31 =                                                     -->
+                                        <!-- col59 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                                         <!--    'column_alias': 'listing__user'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
index 039becd5f3..bc1b1e86fe 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_10 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_174),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_175),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
         <!--    'column_alias': 'family_bookings'}                     -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_9 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_173),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_173),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_8 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_171),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_170),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
@@ -49,15 +49,15 @@
                     <!-- node_id = ss_7 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_169),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_168),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
                     <!--    'column_alias': 'listing__capacity'}                   -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_167),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_6) -->
                     <!-- where =                                                              -->
@@ -69,15 +69,15 @@
                         <!-- node_id = ss_6 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_166),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_165),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
                         <!--    'column_alias': 'listing__capacity'}                   -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_164),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_5) -->
                         <!-- where = None -->
@@ -86,27 +86,27 @@
                             <!-- node_id = ss_5 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_159),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
-                            <!-- col1 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_162),  -->
-                            <!--    'column_alias': 'listing__window_start__day'}          -->
+                            <!-- col1 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),   -->
+                            <!--    'column_alias': 'listing__window_start__extract_week'}  -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_163),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
                             <!--    'column_alias': 'listing__window_end__day'}            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_160),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_161),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
                             <!--    'column_alias': 'listing__capacity'}                   -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_158),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_3) -->
                             <!-- join_0 =                                                  -->
@@ -123,15 +123,15 @@
                                 <!-- node_id = ss_3 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_147),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_148),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_146),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_2) -->
                                 <!-- where = None -->
@@ -140,203 +140,371 @@
                                     <!-- node_id = ss_2 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_187),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_188),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_105),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_189),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_106),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_190),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_107),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_191),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_108),  -->
-                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_192),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_109),  -->
-                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_193),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
-                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_194),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_111),  -->
-                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_195),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_112),  -->
-                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_196),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_113),  -->
-                                    <!--    'column_alias': 'paid_at__day'}                        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_197),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_114),  -->
-                                    <!--    'column_alias': 'paid_at__week'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_198),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_115),  -->
-                                    <!--    'column_alias': 'paid_at__month'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_199),  -->
+                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_116),  -->
-                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_200),  -->
+                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_117),  -->
-                                    <!--    'column_alias': 'paid_at__year'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_201),  -->
+                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_118),  -->
-                                    <!--    'column_alias': 'booking__ds__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_202),  -->
+                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_119),  -->
-                                    <!--    'column_alias': 'booking__ds__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_203),  -->
+                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_120),  -->
-                                    <!--    'column_alias': 'booking__ds__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_204),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_121),  -->
-                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_205),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_122),  -->
-                                    <!--    'column_alias': 'booking__ds__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_206),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_123),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_207),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_124),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_208),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_125),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_209),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_126),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_210),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_127),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_211),  -->
+                                    <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_128),  -->
-                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_212),  -->
+                                    <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_129),  -->
-                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_213),  -->
+                                    <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_130),  -->
-                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_214),  -->
+                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_131),  -->
-                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_215),  -->
+                                    <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_132),  -->
-                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_216),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_133),  -->
-                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_217),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_134),  -->
-                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_218),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_135),  -->
-                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_219),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_136),  -->
-                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_220),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_137),  -->
-                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_221),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_138),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_222),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_139),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_223),  -->
+                                    <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_140),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_224),  -->
+                                    <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_141),  -->
-                                    <!--    'column_alias': 'user'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_225),  -->
+                                    <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_142),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_226),  -->
+                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_143),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_227),  -->
+                                    <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_144),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_228),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_145),  -->
-                                    <!--    'column_alias': 'booking__user'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_229),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_101),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_230),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
-                                    <!-- col45 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_96),  -->
-                                    <!--    'column_alias': 'bookings'}                           -->
-                                    <!-- col46 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                   -->
-                                    <!-- col47 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
-                                    <!--    'column_alias': 'booking_value'}                      -->
-                                    <!-- col48 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
-                                    <!--    'column_alias': 'bookers'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_231),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}           -->
+                                    <!-- col45 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_232),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}            -->
+                                    <!-- col46 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_233),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                    <!-- col47 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_234),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                    <!-- col48 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_235),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_236),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                    <!-- col50 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_237),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                    <!-- col51 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                    <!-- col52 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!-- col53 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col54 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),        -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col55 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),      -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col56 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col57 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col58 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col59 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col60 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!-- col61 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!-- col62 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),  -->
+                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!-- col63 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),  -->
+                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!-- col64 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
+                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!-- col65 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                    <!-- col66 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                    <!-- col67 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                    <!-- col68 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                    <!-- col69 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                    <!-- col70 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col71 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col72 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
+                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!-- col73 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
+                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!-- col74 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
+                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!-- col75 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
+                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!-- col76 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
+                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!-- col77 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!-- col78 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!-- col79 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
+                                    <!--    'column_alias': 'host'}                                -->
+                                    <!-- col80 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
+                                    <!--    'column_alias': 'user'}                                -->
+                                    <!-- col81 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!-- col82 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!-- col83 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!-- col84 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
+                                    <!--    'column_alias': 'booking__user'}                       -->
+                                    <!-- col85 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_185),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!-- col86 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_186),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!-- col87 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_180),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!-- col88 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_181),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!-- col89 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_182),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!-- col90 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_183),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col91 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_184),  -->
                                     <!--    'column_alias': 'average_booking_value'}               -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10015) -->
                                     <!-- where = None -->
@@ -353,27 +521,27 @@
                                         <!--    'column_alias': 'instant_bookings'}                                                              -->
                                         <!-- col2 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10279),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
                                         <!--    'column_alias': 'booking_value'}                         -->
                                         <!-- col3 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10280),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
                                         <!--    'column_alias': 'bookers'}                               -->
                                         <!-- col4 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10281),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10129),  -->
                                         <!--    'column_alias': 'average_booking_value'}                 -->
                                         <!-- col5 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10282),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10130),  -->
                                         <!--    'column_alias': 'booking_payments'}                      -->
                                         <!-- col6 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10283),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10131),  -->
                                         <!--    'column_alias': 'is_instant'}                            -->
                                         <!-- col7 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10284),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10132),  -->
                                         <!--    'column_alias': 'ds__day'}                               -->
                                         <!-- col8 =                                                -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -391,141 +559,309 @@
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10155),  -->
                                         <!--    'column_alias': 'ds__year'}                        -->
-                                        <!-- col12 =                                                     -->
+                                        <!-- col12 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10266),  -->
+                                        <!--    'column_alias': 'ds__extract_year'}              -->
+                                        <!-- col13 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10267),  -->
+                                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                        <!-- col14 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10268),  -->
+                                        <!--    'column_alias': 'ds__extract_month'}             -->
+                                        <!-- col15 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10269),  -->
+                                        <!--    'column_alias': 'ds__extract_week'}              -->
+                                        <!-- col16 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10270),  -->
+                                        <!--    'column_alias': 'ds__extract_day'}               -->
+                                        <!-- col17 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10271),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!-- col18 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10272),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!-- col19 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10289),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10133),  -->
                                         <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                        <!-- col13 =                                               -->
+                                        <!-- col20 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10156),  -->
                                         <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                        <!-- col14 =                                               -->
+                                        <!-- col21 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10157),  -->
                                         <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                        <!-- col15 =                                               -->
+                                        <!-- col22 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10158),  -->
                                         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                        <!-- col16 =                                               -->
+                                        <!-- col23 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10159),  -->
                                         <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                        <!-- col17 =                                                     -->
+                                        <!-- col24 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10273),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                        <!-- col25 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10274),     -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                        <!-- col26 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10275),   -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                        <!-- col27 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10276),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                        <!-- col28 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10277),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                        <!-- col29 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10278),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col30 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10279),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col31 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10294),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10134),  -->
                                         <!--    'column_alias': 'paid_at__day'}                          -->
-                                        <!-- col18 =                                               -->
+                                        <!-- col32 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10160),  -->
                                         <!--    'column_alias': 'paid_at__week'}                   -->
-                                        <!-- col19 =                                               -->
+                                        <!-- col33 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10161),  -->
                                         <!--    'column_alias': 'paid_at__month'}                  -->
-                                        <!-- col20 =                                               -->
+                                        <!-- col34 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10162),  -->
                                         <!--    'column_alias': 'paid_at__quarter'}                -->
-                                        <!-- col21 =                                               -->
+                                        <!-- col35 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10163),  -->
                                         <!--    'column_alias': 'paid_at__year'}                   -->
-                                        <!-- col22 =                                                     -->
+                                        <!-- col36 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10280),  -->
+                                        <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                        <!-- col37 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10281),  -->
+                                        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                        <!-- col38 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10282),  -->
+                                        <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                        <!-- col39 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10283),  -->
+                                        <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                        <!-- col40 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10284),  -->
+                                        <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                        <!-- col41 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10285),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!-- col42 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10286),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!-- col43 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10299),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10135),  -->
                                         <!--    'column_alias': 'booking__is_instant'}                   -->
-                                        <!-- col23 =                                                     -->
+                                        <!-- col44 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10300),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10136),  -->
                                         <!--    'column_alias': 'booking__ds__day'}                      -->
-                                        <!-- col24 =                                               -->
+                                        <!-- col45 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10164),  -->
                                         <!--    'column_alias': 'booking__ds__week'}               -->
-                                        <!-- col25 =                                               -->
+                                        <!-- col46 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10165),  -->
                                         <!--    'column_alias': 'booking__ds__month'}              -->
-                                        <!-- col26 =                                               -->
+                                        <!-- col47 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10166),  -->
                                         <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                        <!-- col27 =                                               -->
+                                        <!-- col48 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10167),  -->
                                         <!--    'column_alias': 'booking__ds__year'}               -->
-                                        <!-- col28 =                                                     -->
+                                        <!-- col49 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10287),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                        <!-- col50 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10288),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                        <!-- col51 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10289),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                        <!-- col52 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10290),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                        <!-- col53 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10291),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                        <!-- col54 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10292),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                        <!-- col55 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10293),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col56 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10305),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10137),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                        <!-- col29 =                                               -->
+                                        <!-- col57 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10168),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                        <!-- col30 =                                               -->
+                                        <!-- col58 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10169),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                        <!-- col31 =                                                 -->
+                                        <!-- col59 =                                                 -->
                                         <!--   {'class': 'SqlSelectColumn',                          -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10170),    -->
                                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                        <!-- col32 =                                               -->
+                                        <!-- col60 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10171),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                        <!-- col33 =                                                     -->
+                                        <!-- col61 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10294),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                        <!-- col62 =                                                         -->
+                                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10295),              -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                        <!-- col63 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10296),            -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                        <!-- col64 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10297),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                        <!-- col65 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10298),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                        <!-- col66 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10299),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col67 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10300),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col68 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10310),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10138),  -->
                                         <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                        <!-- col34 =                                               -->
+                                        <!-- col69 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10172),  -->
                                         <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                        <!-- col35 =                                               -->
+                                        <!-- col70 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10173),  -->
                                         <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                        <!-- col36 =                                               -->
+                                        <!-- col71 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10174),  -->
                                         <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                        <!-- col37 =                                               -->
+                                        <!-- col72 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10175),  -->
                                         <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                        <!-- col38 =                                                     -->
+                                        <!-- col73 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10301),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                        <!-- col74 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10302),       -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                        <!-- col75 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10303),     -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                        <!-- col76 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10304),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                        <!-- col77 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10305),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                        <!-- col78 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10306),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                        <!-- col79 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10307),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col80 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10315),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10139),  -->
                                         <!--    'column_alias': 'listing'}                               -->
-                                        <!-- col39 =                                                     -->
+                                        <!-- col81 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10316),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10140),  -->
                                         <!--    'column_alias': 'guest'}                                 -->
-                                        <!-- col40 =                                                     -->
+                                        <!-- col82 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10317),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10141),  -->
                                         <!--    'column_alias': 'host'}                                  -->
-                                        <!-- col41 =                                                     -->
+                                        <!-- col83 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10318),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10142),  -->
                                         <!--    'column_alias': 'user'}                                  -->
-                                        <!-- col42 =                                                     -->
+                                        <!-- col84 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10319),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10143),  -->
                                         <!--    'column_alias': 'booking__listing'}                      -->
-                                        <!-- col43 =                                                     -->
+                                        <!-- col85 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10320),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10144),  -->
                                         <!--    'column_alias': 'booking__guest'}                        -->
-                                        <!-- col44 =                                                     -->
+                                        <!-- col86 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10321),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10145),  -->
                                         <!--    'column_alias': 'booking__host'}                         -->
-                                        <!-- col45 =                                                     -->
+                                        <!-- col87 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10322),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10146),  -->
                                         <!--    'column_alias': 'booking__user'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10015) -->
                                         <!-- where = None -->
@@ -544,19 +880,19 @@
                                 <!-- node_id = ss_4 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_150),  -->
-                                <!--    'column_alias': 'window_start__day'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
+                                <!--    'column_alias': 'window_start__extract_week'}          -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_151),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
                                 <!--    'column_alias': 'window_end__day'}                     -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_152),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_149),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
                                 <!--    'column_alias': 'capacity'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10017) -->
                                 <!-- where = None -->
@@ -565,7 +901,7 @@
                                     <!-- node_id = ss_10017 -->
                                     <!-- col0 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10330),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10154),  -->
                                     <!--    'column_alias': 'window_start__day'}                     -->
                                     <!-- col1 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -583,101 +919,213 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10179),  -->
                                     <!--    'column_alias': 'window_start__year'}              -->
-                                    <!-- col5 =                                                      -->
+                                    <!-- col5 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10308),  -->
+                                    <!--    'column_alias': 'window_start__extract_year'}    -->
+                                    <!-- col6 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10309),   -->
+                                    <!--    'column_alias': 'window_start__extract_quarter'}  -->
+                                    <!-- col7 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10310),  -->
+                                    <!--    'column_alias': 'window_start__extract_month'}   -->
+                                    <!-- col8 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10311),  -->
+                                    <!--    'column_alias': 'window_start__extract_week'}    -->
+                                    <!-- col9 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10312),  -->
+                                    <!--    'column_alias': 'window_start__extract_day'}     -->
+                                    <!-- col10 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10313),     -->
+                                    <!--    'column_alias': 'window_start__extract_dayofweek'}  -->
+                                    <!-- col11 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10314),     -->
+                                    <!--    'column_alias': 'window_start__extract_dayofyear'}  -->
+                                    <!-- col12 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10335),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10155),  -->
                                     <!--    'column_alias': 'window_end__day'}                       -->
-                                    <!-- col6 =                                                -->
+                                    <!-- col13 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10180),  -->
                                     <!--    'column_alias': 'window_end__week'}                -->
-                                    <!-- col7 =                                                -->
+                                    <!-- col14 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10181),  -->
                                     <!--    'column_alias': 'window_end__month'}               -->
-                                    <!-- col8 =                                                -->
+                                    <!-- col15 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10182),  -->
                                     <!--    'column_alias': 'window_end__quarter'}             -->
-                                    <!-- col9 =                                                -->
+                                    <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10183),  -->
                                     <!--    'column_alias': 'window_end__year'}                -->
-                                    <!-- col10 =                                                     -->
+                                    <!-- col17 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10315),  -->
+                                    <!--    'column_alias': 'window_end__extract_year'}      -->
+                                    <!-- col18 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10316),  -->
+                                    <!--    'column_alias': 'window_end__extract_quarter'}   -->
+                                    <!-- col19 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10317),  -->
+                                    <!--    'column_alias': 'window_end__extract_month'}     -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10318),  -->
+                                    <!--    'column_alias': 'window_end__extract_week'}      -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10319),  -->
+                                    <!--    'column_alias': 'window_end__extract_day'}       -->
+                                    <!-- col22 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10320),   -->
+                                    <!--    'column_alias': 'window_end__extract_dayofweek'}  -->
+                                    <!-- col23 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10321),   -->
+                                    <!--    'column_alias': 'window_end__extract_dayofyear'}  -->
+                                    <!-- col24 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10340),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10156),  -->
                                     <!--    'column_alias': 'country'}                               -->
-                                    <!-- col11 =                                                     -->
+                                    <!-- col25 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10341),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10157),  -->
                                     <!--    'column_alias': 'is_lux'}                                -->
-                                    <!-- col12 =                                                     -->
+                                    <!-- col26 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10342),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10158),  -->
                                     <!--    'column_alias': 'capacity'}                              -->
-                                    <!-- col13 =                                                     -->
+                                    <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10343),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10159),  -->
                                     <!--    'column_alias': 'listing__window_start__day'}            -->
-                                    <!-- col14 =                                               -->
+                                    <!-- col28 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10184),  -->
                                     <!--    'column_alias': 'listing__window_start__week'}     -->
-                                    <!-- col15 =                                               -->
+                                    <!-- col29 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10185),  -->
                                     <!--    'column_alias': 'listing__window_start__month'}    -->
-                                    <!-- col16 =                                               -->
+                                    <!-- col30 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10186),  -->
                                     <!--    'column_alias': 'listing__window_start__quarter'}  -->
-                                    <!-- col17 =                                               -->
+                                    <!-- col31 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10187),  -->
                                     <!--    'column_alias': 'listing__window_start__year'}     -->
-                                    <!-- col18 =                                                     -->
+                                    <!-- col32 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10322),         -->
+                                    <!--    'column_alias': 'listing__window_start__extract_year'}  -->
+                                    <!-- col33 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10323),            -->
+                                    <!--    'column_alias': 'listing__window_start__extract_quarter'}  -->
+                                    <!-- col34 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10324),          -->
+                                    <!--    'column_alias': 'listing__window_start__extract_month'}  -->
+                                    <!-- col35 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10325),         -->
+                                    <!--    'column_alias': 'listing__window_start__extract_week'}  -->
+                                    <!-- col36 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10326),        -->
+                                    <!--    'column_alias': 'listing__window_start__extract_day'}  -->
+                                    <!-- col37 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10327),              -->
+                                    <!--    'column_alias': 'listing__window_start__extract_dayofweek'}  -->
+                                    <!-- col38 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10328),              -->
+                                    <!--    'column_alias': 'listing__window_start__extract_dayofyear'}  -->
+                                    <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10348),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10160),  -->
                                     <!--    'column_alias': 'listing__window_end__day'}              -->
-                                    <!-- col19 =                                               -->
+                                    <!-- col40 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10188),  -->
                                     <!--    'column_alias': 'listing__window_end__week'}       -->
-                                    <!-- col20 =                                               -->
+                                    <!-- col41 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10189),  -->
                                     <!--    'column_alias': 'listing__window_end__month'}      -->
-                                    <!-- col21 =                                               -->
+                                    <!-- col42 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10190),  -->
                                     <!--    'column_alias': 'listing__window_end__quarter'}    -->
-                                    <!-- col22 =                                               -->
+                                    <!-- col43 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10191),  -->
                                     <!--    'column_alias': 'listing__window_end__year'}       -->
-                                    <!-- col23 =                                                     -->
+                                    <!-- col44 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10329),       -->
+                                    <!--    'column_alias': 'listing__window_end__extract_year'}  -->
+                                    <!-- col45 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10330),          -->
+                                    <!--    'column_alias': 'listing__window_end__extract_quarter'}  -->
+                                    <!-- col46 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10331),        -->
+                                    <!--    'column_alias': 'listing__window_end__extract_month'}  -->
+                                    <!-- col47 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10332),       -->
+                                    <!--    'column_alias': 'listing__window_end__extract_week'}  -->
+                                    <!-- col48 =                                                 -->
+                                    <!--   {'class': 'SqlSelectColumn',                          -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10333),      -->
+                                    <!--    'column_alias': 'listing__window_end__extract_day'}  -->
+                                    <!-- col49 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10334),            -->
+                                    <!--    'column_alias': 'listing__window_end__extract_dayofweek'}  -->
+                                    <!-- col50 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10335),            -->
+                                    <!--    'column_alias': 'listing__window_end__extract_dayofyear'}  -->
+                                    <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10353),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10161),  -->
                                     <!--    'column_alias': 'listing__country'}                      -->
-                                    <!-- col24 =                                                     -->
+                                    <!-- col52 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10354),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10162),  -->
                                     <!--    'column_alias': 'listing__is_lux'}                       -->
-                                    <!-- col25 =                                                     -->
+                                    <!-- col53 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10355),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10163),  -->
                                     <!--    'column_alias': 'listing__capacity'}                     -->
-                                    <!-- col26 =                                                     -->
+                                    <!-- col54 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10356),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10164),  -->
                                     <!--    'column_alias': 'listing'}                               -->
-                                    <!-- col27 =                                                     -->
+                                    <!-- col55 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10357),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10165),  -->
                                     <!--    'column_alias': 'user'}                                  -->
-                                    <!-- col28 =                                                     -->
+                                    <!-- col56 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10358),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10166),  -->
                                     <!--    'column_alias': 'listing__user'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10017) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
index e97315791a..d707b51e98 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
@@ -2,18 +2,18 @@
     <SqlSelectStatementNode>
         <!-- description = Join to Time Spine Dataset -->
         <!-- node_id = ss_5 -->
-        <!-- col0 =                                                   -->
-        <!--   {'class': 'SqlSelectColumn',                           -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_70),  -->
-        <!--    'column_alias': 'metric_time__day'}                   -->
-        <!-- col1 =                                                   -->
-        <!--   {'class': 'SqlSelectColumn',                           -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_69),  -->
-        <!--    'column_alias': 'listing'}                            -->
-        <!-- col2 =                                                   -->
-        <!--   {'class': 'SqlSelectColumn',                           -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_68),  -->
-        <!--    'column_alias': 'booking_fees'}                       -->
+        <!-- col0 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_112),  -->
+        <!--    'column_alias': 'metric_time__day'}                    -->
+        <!-- col1 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_111),  -->
+        <!--    'column_alias': 'listing'}                             -->
+        <!-- col2 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
+        <!--    'column_alias': 'booking_fees'}                        -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_4) -->
         <!-- join_0 =                                                    -->
         <!--   {'class': 'SqlJoinDescription',                           -->
@@ -25,10 +25,10 @@
         <SqlSelectStatementNode>
             <!-- description = Date Spine -->
             <!-- node_id = ss_4 -->
-            <!-- col0 =                                                   -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_64),  -->
-            <!--    'column_alias': 'metric_time__day'}                   -->
+            <!-- col0 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_106),  -->
+            <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
             <!-- where = SqlBetweenExpression(node_id=betw_0) -->
             <SqlTableFromClauseNode>
@@ -40,14 +40,14 @@
         <SqlSelectStatementNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = ss_3 -->
-            <!-- col0 =                                                   -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),  -->
-            <!--    'column_alias': 'metric_time__day'}                   -->
-            <!-- col1 =                                                   -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_63),  -->
-            <!--    'column_alias': 'listing'}                            -->
+            <!-- col0 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+            <!--    'column_alias': 'metric_time__day'}                    -->
+            <!-- col1 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_105),  -->
+            <!--    'column_alias': 'listing'}                             -->
             <!-- col2 =                                                                        -->
             <!--   {'class': 'SqlSelectColumn',                                                -->
             <!--    'expr': SqlStringExpression(node_id=str_0 sql_expr=booking_value * 0.05),  -->
@@ -57,27 +57,27 @@
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_2 -->
-                <!-- col0 =                                                   -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_60),  -->
-                <!--    'column_alias': 'metric_time__day'}                   -->
-                <!-- col1 =                                                   -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
-                <!--    'column_alias': 'listing'}                            -->
+                <!-- col0 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                <!--    'column_alias': 'metric_time__day'}                    -->
+                <!-- col1 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                <!--    'column_alias': 'listing'}                             -->
                 <!-- col2 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
                 <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_0, sql_function=SUM),  -->
                 <!--    'column_alias': 'booking_value'}                                          -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_1) -->
-                <!-- group_by0 =                                              -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_60),  -->
-                <!--    'column_alias': 'metric_time__day'}                   -->
-                <!-- group_by1 =                                              -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
-                <!--    'column_alias': 'listing'}                            -->
+                <!-- group_by0 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                <!--    'column_alias': 'metric_time__day'}                    -->
+                <!-- group_by1 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                <!--    'column_alias': 'listing'}                             -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
                     <!-- description =                                         -->
@@ -86,15 +86,15 @@
                     <!-- node_id = ss_1 -->
                     <!-- col0 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_57),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
                     <!--    'column_alias': 'metric_time__day'}                   -->
-                    <!-- col1 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_58),  -->
-                    <!--    'column_alias': 'listing'}                            -->
+                    <!-- col1 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+                    <!--    'column_alias': 'listing'}                             -->
                     <!-- col2 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_56),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
                     <!--    'column_alias': 'booking_value'}                      -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_0) -->
                     <!-- where = None -->
@@ -124,204 +124,372 @@
                         <!-- col5 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_20),  -->
-                        <!--    'column_alias': 'ds_partitioned__day'}                -->
+                        <!--    'column_alias': 'ds__extract_year'}                   -->
                         <!-- col6 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_21),  -->
-                        <!--    'column_alias': 'ds_partitioned__week'}               -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                -->
                         <!-- col7 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_22),  -->
-                        <!--    'column_alias': 'ds_partitioned__month'}              -->
+                        <!--    'column_alias': 'ds__extract_month'}                  -->
                         <!-- col8 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_23),  -->
-                        <!--    'column_alias': 'ds_partitioned__quarter'}            -->
+                        <!--    'column_alias': 'ds__extract_week'}                   -->
                         <!-- col9 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_24),  -->
-                        <!--    'column_alias': 'ds_partitioned__year'}               -->
+                        <!--    'column_alias': 'ds__extract_day'}                    -->
                         <!-- col10 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_25),  -->
-                        <!--    'column_alias': 'paid_at__day'}                       -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
                         <!-- col11 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_26),  -->
-                        <!--    'column_alias': 'paid_at__week'}                      -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
                         <!-- col12 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_27),  -->
-                        <!--    'column_alias': 'paid_at__month'}                     -->
+                        <!--    'column_alias': 'ds_partitioned__day'}                -->
                         <!-- col13 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_28),  -->
-                        <!--    'column_alias': 'paid_at__quarter'}                   -->
+                        <!--    'column_alias': 'ds_partitioned__week'}               -->
                         <!-- col14 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_29),  -->
-                        <!--    'column_alias': 'paid_at__year'}                      -->
+                        <!--    'column_alias': 'ds_partitioned__month'}              -->
                         <!-- col15 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_30),  -->
-                        <!--    'column_alias': 'booking__ds__day'}                   -->
+                        <!--    'column_alias': 'ds_partitioned__quarter'}            -->
                         <!-- col16 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_31),  -->
-                        <!--    'column_alias': 'booking__ds__week'}                  -->
+                        <!--    'column_alias': 'ds_partitioned__year'}               -->
                         <!-- col17 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_32),  -->
-                        <!--    'column_alias': 'booking__ds__month'}                 -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}       -->
                         <!-- col18 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_33),  -->
-                        <!--    'column_alias': 'booking__ds__quarter'}               -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}    -->
                         <!-- col19 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_34),  -->
-                        <!--    'column_alias': 'booking__ds__year'}                  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}      -->
                         <!-- col20 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_35),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__day'}       -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}       -->
                         <!-- col21 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_36),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__week'}      -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}        -->
                         <!-- col22 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_37),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__month'}     -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
                         <!-- col23 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_38),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
                         <!-- col24 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_39),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__year'}      -->
+                        <!--    'column_alias': 'paid_at__day'}                       -->
                         <!-- col25 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_40),  -->
-                        <!--    'column_alias': 'booking__paid_at__day'}              -->
+                        <!--    'column_alias': 'paid_at__week'}                      -->
                         <!-- col26 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_41),  -->
-                        <!--    'column_alias': 'booking__paid_at__week'}             -->
+                        <!--    'column_alias': 'paid_at__month'}                     -->
                         <!-- col27 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_42),  -->
-                        <!--    'column_alias': 'booking__paid_at__month'}            -->
+                        <!--    'column_alias': 'paid_at__quarter'}                   -->
                         <!-- col28 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_43),  -->
-                        <!--    'column_alias': 'booking__paid_at__quarter'}          -->
+                        <!--    'column_alias': 'paid_at__year'}                      -->
                         <!-- col29 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_44),  -->
-                        <!--    'column_alias': 'booking__paid_at__year'}             -->
+                        <!--    'column_alias': 'paid_at__extract_year'}              -->
                         <!-- col30 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_45),  -->
-                        <!--    'column_alias': 'metric_time__day'}                   -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}           -->
                         <!-- col31 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_46),  -->
-                        <!--    'column_alias': 'metric_time__week'}                  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}             -->
                         <!-- col32 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_47),  -->
-                        <!--    'column_alias': 'metric_time__month'}                 -->
+                        <!--    'column_alias': 'paid_at__extract_week'}              -->
                         <!-- col33 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_48),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}               -->
+                        <!--    'column_alias': 'paid_at__extract_day'}               -->
                         <!-- col34 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_49),  -->
-                        <!--    'column_alias': 'metric_time__year'}                  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}         -->
                         <!-- col35 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_50),  -->
-                        <!--    'column_alias': 'listing'}                            -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}         -->
                         <!-- col36 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_51),  -->
-                        <!--    'column_alias': 'guest'}                              -->
+                        <!--    'column_alias': 'booking__ds__day'}                   -->
                         <!-- col37 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_52),  -->
-                        <!--    'column_alias': 'host'}                               -->
+                        <!--    'column_alias': 'booking__ds__week'}                  -->
                         <!-- col38 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_53),  -->
-                        <!--    'column_alias': 'booking__listing'}                   -->
+                        <!--    'column_alias': 'booking__ds__month'}                 -->
                         <!-- col39 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_54),  -->
-                        <!--    'column_alias': 'booking__guest'}                     -->
+                        <!--    'column_alias': 'booking__ds__quarter'}               -->
                         <!-- col40 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_55),  -->
-                        <!--    'column_alias': 'booking__host'}                      -->
+                        <!--    'column_alias': 'booking__ds__year'}                  -->
                         <!-- col41 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_56),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}          -->
+                        <!-- col42 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_57),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}       -->
+                        <!-- col43 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_58),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}         -->
+                        <!-- col44 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_59),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}          -->
+                        <!-- col45 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_60),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}           -->
+                        <!-- col46 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}     -->
+                        <!-- col47 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}     -->
+                        <!-- col48 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_63),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}       -->
+                        <!-- col49 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_64),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}      -->
+                        <!-- col50 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_65),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}     -->
+                        <!-- col51 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_66),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}   -->
+                        <!-- col52 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_67),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}      -->
+                        <!-- col53 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_68),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col54 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_69),         -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col55 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_70),       -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col56 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_71),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col57 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_72),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col58 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col59 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col60 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_75),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}              -->
+                        <!-- col61 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_76),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}             -->
+                        <!-- col62 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_77),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}            -->
+                        <!-- col63 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_78),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}          -->
+                        <!-- col64 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_79),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}             -->
+                        <!-- col65 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_80),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}     -->
+                        <!-- col66 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_81),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                        <!-- col67 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_82),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}    -->
+                        <!-- col68 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_83),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}     -->
+                        <!-- col69 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_84),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}      -->
+                        <!-- col70 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col71 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col72 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_87),  -->
+                        <!--    'column_alias': 'metric_time__day'}                   -->
+                        <!-- col73 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_88),  -->
+                        <!--    'column_alias': 'metric_time__week'}                  -->
+                        <!-- col74 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_89),  -->
+                        <!--    'column_alias': 'metric_time__month'}                 -->
+                        <!-- col75 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_90),  -->
+                        <!--    'column_alias': 'metric_time__quarter'}               -->
+                        <!-- col76 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_91),  -->
+                        <!--    'column_alias': 'metric_time__year'}                  -->
+                        <!-- col77 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_92),  -->
+                        <!--    'column_alias': 'listing'}                            -->
+                        <!-- col78 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_93),  -->
+                        <!--    'column_alias': 'guest'}                              -->
+                        <!-- col79 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_94),  -->
+                        <!--    'column_alias': 'host'}                               -->
+                        <!-- col80 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_95),  -->
+                        <!--    'column_alias': 'booking__listing'}                   -->
+                        <!-- col81 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_96),  -->
+                        <!--    'column_alias': 'booking__guest'}                     -->
+                        <!-- col82 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
+                        <!--    'column_alias': 'booking__host'}                      -->
+                        <!-- col83 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_13),  -->
                         <!--    'column_alias': 'is_instant'}                         -->
-                        <!-- col42 =                                                  -->
+                        <!-- col84 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_14),  -->
                         <!--    'column_alias': 'booking__is_instant'}                -->
-                        <!-- col43 =                                                 -->
+                        <!-- col85 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_0),  -->
                         <!--    'column_alias': 'bookings'}                          -->
-                        <!-- col44 =                                                 -->
+                        <!-- col86 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1),  -->
                         <!--    'column_alias': 'instant_bookings'}                  -->
-                        <!-- col45 =                                                 -->
+                        <!-- col87 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_2),  -->
                         <!--    'column_alias': 'booking_value'}                     -->
-                        <!-- col46 =                                                 -->
+                        <!-- col88 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_3),  -->
                         <!--    'column_alias': 'max_booking_value'}                 -->
-                        <!-- col47 =                                                 -->
+                        <!-- col89 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_4),  -->
                         <!--    'column_alias': 'min_booking_value'}                 -->
-                        <!-- col48 =                                                 -->
+                        <!-- col90 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_5),  -->
                         <!--    'column_alias': 'bookers'}                           -->
-                        <!-- col49 =                                                 -->
+                        <!-- col91 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_6),  -->
                         <!--    'column_alias': 'average_booking_value'}             -->
-                        <!-- col50 =                                                 -->
+                        <!-- col92 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_7),  -->
                         <!--    'column_alias': 'referred_bookings'}                 -->
-                        <!-- col51 =                                                 -->
+                        <!-- col93 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_8),  -->
                         <!--    'column_alias': 'median_booking_value'}              -->
-                        <!-- col52 =                                                 -->
+                        <!-- col94 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_9),  -->
                         <!--    'column_alias': 'booking_value_p99'}                 -->
-                        <!-- col53 =                                                  -->
+                        <!-- col95 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}         -->
-                        <!-- col54 =                                                         -->
+                        <!-- col96 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_11),         -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col55 =                                                       -->
+                        <!-- col97 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_12),       -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
@@ -340,27 +508,27 @@
                             <!--    'column_alias': 'instant_bookings'}                                                              -->
                             <!-- col2 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                             <!--    'column_alias': 'booking_value'}                         -->
                             <!-- col3 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                             <!--    'column_alias': 'max_booking_value'}                     -->
                             <!-- col4 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                             <!--    'column_alias': 'min_booking_value'}                     -->
                             <!-- col5 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                             <!--    'column_alias': 'bookers'}                               -->
                             <!-- col6 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                             <!--    'column_alias': 'average_booking_value'}                 -->
                             <!-- col7 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                             <!--    'column_alias': 'booking_payments'}                      -->
                             <!-- col8 =                                                                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -368,31 +536,31 @@
                             <!--    'column_alias': 'referred_bookings'}                                                                          -->
                             <!-- col9 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                             <!--    'column_alias': 'median_booking_value'}                  -->
                             <!-- col10 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                             <!--    'column_alias': 'booking_value_p99'}                     -->
                             <!-- col11 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                             <!-- col12 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col13 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- col14 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                             <!--    'column_alias': 'is_instant'}                            -->
                             <!-- col15 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                             <!--    'column_alias': 'ds__day'}                               -->
                             <!-- col16 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -410,133 +578,301 @@
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                             <!--    'column_alias': 'ds__year'}                        -->
-                            <!-- col20 =                                                     -->
+                            <!-- col20 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                            <!--    'column_alias': 'ds__extract_year'}              -->
+                            <!-- col21 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}           -->
+                            <!-- col22 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                            <!--    'column_alias': 'ds__extract_month'}             -->
+                            <!-- col23 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                            <!--    'column_alias': 'ds__extract_week'}              -->
+                            <!-- col24 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                            <!--    'column_alias': 'ds__extract_day'}               -->
+                            <!-- col25 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!-- col26 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                            <!-- col21 =                                               -->
+                            <!-- col28 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}            -->
-                            <!-- col22 =                                               -->
+                            <!-- col29 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}           -->
-                            <!-- col23 =                                               -->
+                            <!-- col30 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                            <!-- col24 =                                               -->
+                            <!-- col31 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}            -->
-                            <!-- col25 =                                                     -->
+                            <!-- col32 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                            <!-- col33 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                            <!-- col34 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                            <!-- col35 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                            <!-- col36 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                            <!-- col37 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col38 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                             <!--    'column_alias': 'paid_at__day'}                          -->
-                            <!-- col26 =                                               -->
+                            <!-- col40 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                             <!--    'column_alias': 'paid_at__week'}                   -->
-                            <!-- col27 =                                               -->
+                            <!-- col41 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                             <!--    'column_alias': 'paid_at__month'}                  -->
-                            <!-- col28 =                                               -->
+                            <!-- col42 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                -->
-                            <!-- col29 =                                               -->
+                            <!-- col43 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                             <!--    'column_alias': 'paid_at__year'}                   -->
-                            <!-- col30 =                                                     -->
+                            <!-- col44 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}         -->
+                            <!-- col45 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                            <!-- col46 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}        -->
+                            <!-- col47 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}         -->
+                            <!-- col48 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}          -->
+                            <!-- col49 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!-- col50 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                             <!--    'column_alias': 'booking__is_instant'}                   -->
-                            <!-- col31 =                                                     -->
+                            <!-- col52 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                             <!--    'column_alias': 'booking__ds__day'}                      -->
-                            <!-- col32 =                                               -->
+                            <!-- col53 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                             <!--    'column_alias': 'booking__ds__week'}               -->
-                            <!-- col33 =                                               -->
+                            <!-- col54 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                             <!--    'column_alias': 'booking__ds__month'}              -->
-                            <!-- col34 =                                               -->
+                            <!-- col55 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}            -->
-                            <!-- col35 =                                               -->
+                            <!-- col56 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                             <!--    'column_alias': 'booking__ds__year'}               -->
-                            <!-- col36 =                                                     -->
+                            <!-- col57 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                            <!-- col58 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                            <!-- col59 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                            <!-- col60 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                            <!-- col61 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                            <!-- col62 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                            <!-- col63 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                            <!-- col37 =                                               -->
+                            <!-- col65 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                            <!-- col38 =                                               -->
+                            <!-- col66 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                            <!-- col39 =                                                 -->
+                            <!-- col67 =                                                 -->
                             <!--   {'class': 'SqlSelectColumn',                          -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                            <!-- col40 =                                               -->
+                            <!-- col68 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                            <!-- col41 =                                                     -->
+                            <!-- col69 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col70 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col71 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col72 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col73 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col74 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col75 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                            <!-- col42 =                                               -->
+                            <!-- col77 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}          -->
-                            <!-- col43 =                                               -->
+                            <!-- col78 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}         -->
-                            <!-- col44 =                                               -->
+                            <!-- col79 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                            <!-- col45 =                                               -->
+                            <!-- col80 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}          -->
-                            <!-- col46 =                                                     -->
+                            <!-- col81 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                            <!-- col82 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                            <!-- col83 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                            <!-- col84 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                            <!-- col85 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                            <!-- col86 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col87 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                             <!--    'column_alias': 'listing'}                               -->
-                            <!-- col47 =                                                     -->
+                            <!-- col89 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                             <!--    'column_alias': 'guest'}                                 -->
-                            <!-- col48 =                                                     -->
+                            <!-- col90 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                             <!--    'column_alias': 'host'}                                  -->
-                            <!-- col49 =                                                     -->
+                            <!-- col91 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                             <!--    'column_alias': 'booking__listing'}                      -->
-                            <!-- col50 =                                                     -->
+                            <!-- col92 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                             <!--    'column_alias': 'booking__guest'}                        -->
-                            <!-- col51 =                                                     -->
+                            <!-- col93 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
index e97315791a..d707b51e98 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
@@ -2,18 +2,18 @@
     <SqlSelectStatementNode>
         <!-- description = Join to Time Spine Dataset -->
         <!-- node_id = ss_5 -->
-        <!-- col0 =                                                   -->
-        <!--   {'class': 'SqlSelectColumn',                           -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_70),  -->
-        <!--    'column_alias': 'metric_time__day'}                   -->
-        <!-- col1 =                                                   -->
-        <!--   {'class': 'SqlSelectColumn',                           -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_69),  -->
-        <!--    'column_alias': 'listing'}                            -->
-        <!-- col2 =                                                   -->
-        <!--   {'class': 'SqlSelectColumn',                           -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_68),  -->
-        <!--    'column_alias': 'booking_fees'}                       -->
+        <!-- col0 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_112),  -->
+        <!--    'column_alias': 'metric_time__day'}                    -->
+        <!-- col1 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_111),  -->
+        <!--    'column_alias': 'listing'}                             -->
+        <!-- col2 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
+        <!--    'column_alias': 'booking_fees'}                        -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_4) -->
         <!-- join_0 =                                                    -->
         <!--   {'class': 'SqlJoinDescription',                           -->
@@ -25,10 +25,10 @@
         <SqlSelectStatementNode>
             <!-- description = Date Spine -->
             <!-- node_id = ss_4 -->
-            <!-- col0 =                                                   -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_64),  -->
-            <!--    'column_alias': 'metric_time__day'}                   -->
+            <!-- col0 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_106),  -->
+            <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
             <!-- where = SqlBetweenExpression(node_id=betw_0) -->
             <SqlTableFromClauseNode>
@@ -40,14 +40,14 @@
         <SqlSelectStatementNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = ss_3 -->
-            <!-- col0 =                                                   -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),  -->
-            <!--    'column_alias': 'metric_time__day'}                   -->
-            <!-- col1 =                                                   -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_63),  -->
-            <!--    'column_alias': 'listing'}                            -->
+            <!-- col0 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+            <!--    'column_alias': 'metric_time__day'}                    -->
+            <!-- col1 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_105),  -->
+            <!--    'column_alias': 'listing'}                             -->
             <!-- col2 =                                                                        -->
             <!--   {'class': 'SqlSelectColumn',                                                -->
             <!--    'expr': SqlStringExpression(node_id=str_0 sql_expr=booking_value * 0.05),  -->
@@ -57,27 +57,27 @@
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_2 -->
-                <!-- col0 =                                                   -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_60),  -->
-                <!--    'column_alias': 'metric_time__day'}                   -->
-                <!-- col1 =                                                   -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
-                <!--    'column_alias': 'listing'}                            -->
+                <!-- col0 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                <!--    'column_alias': 'metric_time__day'}                    -->
+                <!-- col1 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                <!--    'column_alias': 'listing'}                             -->
                 <!-- col2 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
                 <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_0, sql_function=SUM),  -->
                 <!--    'column_alias': 'booking_value'}                                          -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_1) -->
-                <!-- group_by0 =                                              -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_60),  -->
-                <!--    'column_alias': 'metric_time__day'}                   -->
-                <!-- group_by1 =                                              -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
-                <!--    'column_alias': 'listing'}                            -->
+                <!-- group_by0 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                <!--    'column_alias': 'metric_time__day'}                    -->
+                <!-- group_by1 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                <!--    'column_alias': 'listing'}                             -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
                     <!-- description =                                         -->
@@ -86,15 +86,15 @@
                     <!-- node_id = ss_1 -->
                     <!-- col0 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_57),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
                     <!--    'column_alias': 'metric_time__day'}                   -->
-                    <!-- col1 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_58),  -->
-                    <!--    'column_alias': 'listing'}                            -->
+                    <!-- col1 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+                    <!--    'column_alias': 'listing'}                             -->
                     <!-- col2 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_56),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
                     <!--    'column_alias': 'booking_value'}                      -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_0) -->
                     <!-- where = None -->
@@ -124,204 +124,372 @@
                         <!-- col5 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_20),  -->
-                        <!--    'column_alias': 'ds_partitioned__day'}                -->
+                        <!--    'column_alias': 'ds__extract_year'}                   -->
                         <!-- col6 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_21),  -->
-                        <!--    'column_alias': 'ds_partitioned__week'}               -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                -->
                         <!-- col7 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_22),  -->
-                        <!--    'column_alias': 'ds_partitioned__month'}              -->
+                        <!--    'column_alias': 'ds__extract_month'}                  -->
                         <!-- col8 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_23),  -->
-                        <!--    'column_alias': 'ds_partitioned__quarter'}            -->
+                        <!--    'column_alias': 'ds__extract_week'}                   -->
                         <!-- col9 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_24),  -->
-                        <!--    'column_alias': 'ds_partitioned__year'}               -->
+                        <!--    'column_alias': 'ds__extract_day'}                    -->
                         <!-- col10 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_25),  -->
-                        <!--    'column_alias': 'paid_at__day'}                       -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
                         <!-- col11 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_26),  -->
-                        <!--    'column_alias': 'paid_at__week'}                      -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
                         <!-- col12 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_27),  -->
-                        <!--    'column_alias': 'paid_at__month'}                     -->
+                        <!--    'column_alias': 'ds_partitioned__day'}                -->
                         <!-- col13 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_28),  -->
-                        <!--    'column_alias': 'paid_at__quarter'}                   -->
+                        <!--    'column_alias': 'ds_partitioned__week'}               -->
                         <!-- col14 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_29),  -->
-                        <!--    'column_alias': 'paid_at__year'}                      -->
+                        <!--    'column_alias': 'ds_partitioned__month'}              -->
                         <!-- col15 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_30),  -->
-                        <!--    'column_alias': 'booking__ds__day'}                   -->
+                        <!--    'column_alias': 'ds_partitioned__quarter'}            -->
                         <!-- col16 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_31),  -->
-                        <!--    'column_alias': 'booking__ds__week'}                  -->
+                        <!--    'column_alias': 'ds_partitioned__year'}               -->
                         <!-- col17 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_32),  -->
-                        <!--    'column_alias': 'booking__ds__month'}                 -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}       -->
                         <!-- col18 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_33),  -->
-                        <!--    'column_alias': 'booking__ds__quarter'}               -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}    -->
                         <!-- col19 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_34),  -->
-                        <!--    'column_alias': 'booking__ds__year'}                  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}      -->
                         <!-- col20 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_35),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__day'}       -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}       -->
                         <!-- col21 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_36),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__week'}      -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}        -->
                         <!-- col22 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_37),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__month'}     -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
                         <!-- col23 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_38),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
                         <!-- col24 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_39),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__year'}      -->
+                        <!--    'column_alias': 'paid_at__day'}                       -->
                         <!-- col25 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_40),  -->
-                        <!--    'column_alias': 'booking__paid_at__day'}              -->
+                        <!--    'column_alias': 'paid_at__week'}                      -->
                         <!-- col26 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_41),  -->
-                        <!--    'column_alias': 'booking__paid_at__week'}             -->
+                        <!--    'column_alias': 'paid_at__month'}                     -->
                         <!-- col27 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_42),  -->
-                        <!--    'column_alias': 'booking__paid_at__month'}            -->
+                        <!--    'column_alias': 'paid_at__quarter'}                   -->
                         <!-- col28 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_43),  -->
-                        <!--    'column_alias': 'booking__paid_at__quarter'}          -->
+                        <!--    'column_alias': 'paid_at__year'}                      -->
                         <!-- col29 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_44),  -->
-                        <!--    'column_alias': 'booking__paid_at__year'}             -->
+                        <!--    'column_alias': 'paid_at__extract_year'}              -->
                         <!-- col30 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_45),  -->
-                        <!--    'column_alias': 'metric_time__day'}                   -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}           -->
                         <!-- col31 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_46),  -->
-                        <!--    'column_alias': 'metric_time__week'}                  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}             -->
                         <!-- col32 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_47),  -->
-                        <!--    'column_alias': 'metric_time__month'}                 -->
+                        <!--    'column_alias': 'paid_at__extract_week'}              -->
                         <!-- col33 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_48),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}               -->
+                        <!--    'column_alias': 'paid_at__extract_day'}               -->
                         <!-- col34 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_49),  -->
-                        <!--    'column_alias': 'metric_time__year'}                  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}         -->
                         <!-- col35 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_50),  -->
-                        <!--    'column_alias': 'listing'}                            -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}         -->
                         <!-- col36 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_51),  -->
-                        <!--    'column_alias': 'guest'}                              -->
+                        <!--    'column_alias': 'booking__ds__day'}                   -->
                         <!-- col37 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_52),  -->
-                        <!--    'column_alias': 'host'}                               -->
+                        <!--    'column_alias': 'booking__ds__week'}                  -->
                         <!-- col38 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_53),  -->
-                        <!--    'column_alias': 'booking__listing'}                   -->
+                        <!--    'column_alias': 'booking__ds__month'}                 -->
                         <!-- col39 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_54),  -->
-                        <!--    'column_alias': 'booking__guest'}                     -->
+                        <!--    'column_alias': 'booking__ds__quarter'}               -->
                         <!-- col40 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_55),  -->
-                        <!--    'column_alias': 'booking__host'}                      -->
+                        <!--    'column_alias': 'booking__ds__year'}                  -->
                         <!-- col41 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_56),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}          -->
+                        <!-- col42 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_57),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}       -->
+                        <!-- col43 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_58),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}         -->
+                        <!-- col44 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_59),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}          -->
+                        <!-- col45 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_60),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}           -->
+                        <!-- col46 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}     -->
+                        <!-- col47 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}     -->
+                        <!-- col48 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_63),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}       -->
+                        <!-- col49 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_64),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}      -->
+                        <!-- col50 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_65),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}     -->
+                        <!-- col51 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_66),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}   -->
+                        <!-- col52 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_67),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}      -->
+                        <!-- col53 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_68),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col54 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_69),         -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col55 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_70),       -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col56 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_71),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col57 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_72),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col58 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col59 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col60 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_75),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}              -->
+                        <!-- col61 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_76),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}             -->
+                        <!-- col62 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_77),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}            -->
+                        <!-- col63 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_78),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}          -->
+                        <!-- col64 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_79),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}             -->
+                        <!-- col65 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_80),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}     -->
+                        <!-- col66 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_81),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                        <!-- col67 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_82),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}    -->
+                        <!-- col68 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_83),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}     -->
+                        <!-- col69 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_84),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}      -->
+                        <!-- col70 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col71 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col72 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_87),  -->
+                        <!--    'column_alias': 'metric_time__day'}                   -->
+                        <!-- col73 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_88),  -->
+                        <!--    'column_alias': 'metric_time__week'}                  -->
+                        <!-- col74 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_89),  -->
+                        <!--    'column_alias': 'metric_time__month'}                 -->
+                        <!-- col75 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_90),  -->
+                        <!--    'column_alias': 'metric_time__quarter'}               -->
+                        <!-- col76 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_91),  -->
+                        <!--    'column_alias': 'metric_time__year'}                  -->
+                        <!-- col77 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_92),  -->
+                        <!--    'column_alias': 'listing'}                            -->
+                        <!-- col78 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_93),  -->
+                        <!--    'column_alias': 'guest'}                              -->
+                        <!-- col79 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_94),  -->
+                        <!--    'column_alias': 'host'}                               -->
+                        <!-- col80 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_95),  -->
+                        <!--    'column_alias': 'booking__listing'}                   -->
+                        <!-- col81 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_96),  -->
+                        <!--    'column_alias': 'booking__guest'}                     -->
+                        <!-- col82 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
+                        <!--    'column_alias': 'booking__host'}                      -->
+                        <!-- col83 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_13),  -->
                         <!--    'column_alias': 'is_instant'}                         -->
-                        <!-- col42 =                                                  -->
+                        <!-- col84 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_14),  -->
                         <!--    'column_alias': 'booking__is_instant'}                -->
-                        <!-- col43 =                                                 -->
+                        <!-- col85 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_0),  -->
                         <!--    'column_alias': 'bookings'}                          -->
-                        <!-- col44 =                                                 -->
+                        <!-- col86 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1),  -->
                         <!--    'column_alias': 'instant_bookings'}                  -->
-                        <!-- col45 =                                                 -->
+                        <!-- col87 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_2),  -->
                         <!--    'column_alias': 'booking_value'}                     -->
-                        <!-- col46 =                                                 -->
+                        <!-- col88 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_3),  -->
                         <!--    'column_alias': 'max_booking_value'}                 -->
-                        <!-- col47 =                                                 -->
+                        <!-- col89 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_4),  -->
                         <!--    'column_alias': 'min_booking_value'}                 -->
-                        <!-- col48 =                                                 -->
+                        <!-- col90 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_5),  -->
                         <!--    'column_alias': 'bookers'}                           -->
-                        <!-- col49 =                                                 -->
+                        <!-- col91 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_6),  -->
                         <!--    'column_alias': 'average_booking_value'}             -->
-                        <!-- col50 =                                                 -->
+                        <!-- col92 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_7),  -->
                         <!--    'column_alias': 'referred_bookings'}                 -->
-                        <!-- col51 =                                                 -->
+                        <!-- col93 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_8),  -->
                         <!--    'column_alias': 'median_booking_value'}              -->
-                        <!-- col52 =                                                 -->
+                        <!-- col94 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_9),  -->
                         <!--    'column_alias': 'booking_value_p99'}                 -->
-                        <!-- col53 =                                                  -->
+                        <!-- col95 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}         -->
-                        <!-- col54 =                                                         -->
+                        <!-- col96 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_11),         -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col55 =                                                       -->
+                        <!-- col97 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_12),       -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
@@ -340,27 +508,27 @@
                             <!--    'column_alias': 'instant_bookings'}                                                              -->
                             <!-- col2 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                             <!--    'column_alias': 'booking_value'}                         -->
                             <!-- col3 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                             <!--    'column_alias': 'max_booking_value'}                     -->
                             <!-- col4 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                             <!--    'column_alias': 'min_booking_value'}                     -->
                             <!-- col5 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                             <!--    'column_alias': 'bookers'}                               -->
                             <!-- col6 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                             <!--    'column_alias': 'average_booking_value'}                 -->
                             <!-- col7 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                             <!--    'column_alias': 'booking_payments'}                      -->
                             <!-- col8 =                                                                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -368,31 +536,31 @@
                             <!--    'column_alias': 'referred_bookings'}                                                                          -->
                             <!-- col9 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                             <!--    'column_alias': 'median_booking_value'}                  -->
                             <!-- col10 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                             <!--    'column_alias': 'booking_value_p99'}                     -->
                             <!-- col11 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                             <!-- col12 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col13 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- col14 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                             <!--    'column_alias': 'is_instant'}                            -->
                             <!-- col15 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                             <!--    'column_alias': 'ds__day'}                               -->
                             <!-- col16 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -410,133 +578,301 @@
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                             <!--    'column_alias': 'ds__year'}                        -->
-                            <!-- col20 =                                                     -->
+                            <!-- col20 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                            <!--    'column_alias': 'ds__extract_year'}              -->
+                            <!-- col21 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}           -->
+                            <!-- col22 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                            <!--    'column_alias': 'ds__extract_month'}             -->
+                            <!-- col23 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                            <!--    'column_alias': 'ds__extract_week'}              -->
+                            <!-- col24 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                            <!--    'column_alias': 'ds__extract_day'}               -->
+                            <!-- col25 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!-- col26 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                            <!-- col21 =                                               -->
+                            <!-- col28 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}            -->
-                            <!-- col22 =                                               -->
+                            <!-- col29 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}           -->
-                            <!-- col23 =                                               -->
+                            <!-- col30 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                            <!-- col24 =                                               -->
+                            <!-- col31 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}            -->
-                            <!-- col25 =                                                     -->
+                            <!-- col32 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                            <!-- col33 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                            <!-- col34 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                            <!-- col35 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                            <!-- col36 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                            <!-- col37 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col38 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                             <!--    'column_alias': 'paid_at__day'}                          -->
-                            <!-- col26 =                                               -->
+                            <!-- col40 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                             <!--    'column_alias': 'paid_at__week'}                   -->
-                            <!-- col27 =                                               -->
+                            <!-- col41 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                             <!--    'column_alias': 'paid_at__month'}                  -->
-                            <!-- col28 =                                               -->
+                            <!-- col42 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                -->
-                            <!-- col29 =                                               -->
+                            <!-- col43 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                             <!--    'column_alias': 'paid_at__year'}                   -->
-                            <!-- col30 =                                                     -->
+                            <!-- col44 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}         -->
+                            <!-- col45 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                            <!-- col46 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}        -->
+                            <!-- col47 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}         -->
+                            <!-- col48 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}          -->
+                            <!-- col49 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!-- col50 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                             <!--    'column_alias': 'booking__is_instant'}                   -->
-                            <!-- col31 =                                                     -->
+                            <!-- col52 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                             <!--    'column_alias': 'booking__ds__day'}                      -->
-                            <!-- col32 =                                               -->
+                            <!-- col53 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                             <!--    'column_alias': 'booking__ds__week'}               -->
-                            <!-- col33 =                                               -->
+                            <!-- col54 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                             <!--    'column_alias': 'booking__ds__month'}              -->
-                            <!-- col34 =                                               -->
+                            <!-- col55 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}            -->
-                            <!-- col35 =                                               -->
+                            <!-- col56 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                             <!--    'column_alias': 'booking__ds__year'}               -->
-                            <!-- col36 =                                                     -->
+                            <!-- col57 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                            <!-- col58 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                            <!-- col59 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                            <!-- col60 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                            <!-- col61 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                            <!-- col62 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                            <!-- col63 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                            <!-- col37 =                                               -->
+                            <!-- col65 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                            <!-- col38 =                                               -->
+                            <!-- col66 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                            <!-- col39 =                                                 -->
+                            <!-- col67 =                                                 -->
                             <!--   {'class': 'SqlSelectColumn',                          -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                            <!-- col40 =                                               -->
+                            <!-- col68 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                            <!-- col41 =                                                     -->
+                            <!-- col69 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col70 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col71 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col72 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col73 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col74 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col75 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                            <!-- col42 =                                               -->
+                            <!-- col77 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}          -->
-                            <!-- col43 =                                               -->
+                            <!-- col78 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}         -->
-                            <!-- col44 =                                               -->
+                            <!-- col79 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                            <!-- col45 =                                               -->
+                            <!-- col80 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}          -->
-                            <!-- col46 =                                                     -->
+                            <!-- col81 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                            <!-- col82 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                            <!-- col83 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                            <!-- col84 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                            <!-- col85 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                            <!-- col86 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col87 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                             <!--    'column_alias': 'listing'}                               -->
-                            <!-- col47 =                                                     -->
+                            <!-- col89 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                             <!--    'column_alias': 'guest'}                                 -->
-                            <!-- col48 =                                                     -->
+                            <!-- col90 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                             <!--    'column_alias': 'host'}                                  -->
-                            <!-- col49 =                                                     -->
+                            <!-- col91 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                             <!--    'column_alias': 'booking__listing'}                      -->
-                            <!-- col50 =                                                     -->
+                            <!-- col92 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                             <!--    'column_alias': 'booking__guest'}                        -->
-                            <!-- col51 =                                                     -->
+                            <!-- col93 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml
index e97315791a..d707b51e98 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml
@@ -2,18 +2,18 @@
     <SqlSelectStatementNode>
         <!-- description = Join to Time Spine Dataset -->
         <!-- node_id = ss_5 -->
-        <!-- col0 =                                                   -->
-        <!--   {'class': 'SqlSelectColumn',                           -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_70),  -->
-        <!--    'column_alias': 'metric_time__day'}                   -->
-        <!-- col1 =                                                   -->
-        <!--   {'class': 'SqlSelectColumn',                           -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_69),  -->
-        <!--    'column_alias': 'listing'}                            -->
-        <!-- col2 =                                                   -->
-        <!--   {'class': 'SqlSelectColumn',                           -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_68),  -->
-        <!--    'column_alias': 'booking_fees'}                       -->
+        <!-- col0 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_112),  -->
+        <!--    'column_alias': 'metric_time__day'}                    -->
+        <!-- col1 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_111),  -->
+        <!--    'column_alias': 'listing'}                             -->
+        <!-- col2 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
+        <!--    'column_alias': 'booking_fees'}                        -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_4) -->
         <!-- join_0 =                                                    -->
         <!--   {'class': 'SqlJoinDescription',                           -->
@@ -25,10 +25,10 @@
         <SqlSelectStatementNode>
             <!-- description = Date Spine -->
             <!-- node_id = ss_4 -->
-            <!-- col0 =                                                   -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_64),  -->
-            <!--    'column_alias': 'metric_time__day'}                   -->
+            <!-- col0 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_106),  -->
+            <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
             <!-- where = SqlBetweenExpression(node_id=betw_0) -->
             <SqlTableFromClauseNode>
@@ -40,14 +40,14 @@
         <SqlSelectStatementNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = ss_3 -->
-            <!-- col0 =                                                   -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),  -->
-            <!--    'column_alias': 'metric_time__day'}                   -->
-            <!-- col1 =                                                   -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_63),  -->
-            <!--    'column_alias': 'listing'}                            -->
+            <!-- col0 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+            <!--    'column_alias': 'metric_time__day'}                    -->
+            <!-- col1 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_105),  -->
+            <!--    'column_alias': 'listing'}                             -->
             <!-- col2 =                                                                        -->
             <!--   {'class': 'SqlSelectColumn',                                                -->
             <!--    'expr': SqlStringExpression(node_id=str_0 sql_expr=booking_value * 0.05),  -->
@@ -57,27 +57,27 @@
             <SqlSelectStatementNode>
                 <!-- description = Aggregate Measures -->
                 <!-- node_id = ss_2 -->
-                <!-- col0 =                                                   -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_60),  -->
-                <!--    'column_alias': 'metric_time__day'}                   -->
-                <!-- col1 =                                                   -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
-                <!--    'column_alias': 'listing'}                            -->
+                <!-- col0 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                <!--    'column_alias': 'metric_time__day'}                    -->
+                <!-- col1 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                <!--    'column_alias': 'listing'}                             -->
                 <!-- col2 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
                 <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_0, sql_function=SUM),  -->
                 <!--    'column_alias': 'booking_value'}                                          -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_1) -->
-                <!-- group_by0 =                                              -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_60),  -->
-                <!--    'column_alias': 'metric_time__day'}                   -->
-                <!-- group_by1 =                                              -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
-                <!--    'column_alias': 'listing'}                            -->
+                <!-- group_by0 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                <!--    'column_alias': 'metric_time__day'}                    -->
+                <!-- group_by1 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                <!--    'column_alias': 'listing'}                             -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
                     <!-- description =                                         -->
@@ -86,15 +86,15 @@
                     <!-- node_id = ss_1 -->
                     <!-- col0 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_57),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
                     <!--    'column_alias': 'metric_time__day'}                   -->
-                    <!-- col1 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_58),  -->
-                    <!--    'column_alias': 'listing'}                            -->
+                    <!-- col1 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+                    <!--    'column_alias': 'listing'}                             -->
                     <!-- col2 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_56),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
                     <!--    'column_alias': 'booking_value'}                      -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_0) -->
                     <!-- where = None -->
@@ -124,204 +124,372 @@
                         <!-- col5 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_20),  -->
-                        <!--    'column_alias': 'ds_partitioned__day'}                -->
+                        <!--    'column_alias': 'ds__extract_year'}                   -->
                         <!-- col6 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_21),  -->
-                        <!--    'column_alias': 'ds_partitioned__week'}               -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                -->
                         <!-- col7 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_22),  -->
-                        <!--    'column_alias': 'ds_partitioned__month'}              -->
+                        <!--    'column_alias': 'ds__extract_month'}                  -->
                         <!-- col8 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_23),  -->
-                        <!--    'column_alias': 'ds_partitioned__quarter'}            -->
+                        <!--    'column_alias': 'ds__extract_week'}                   -->
                         <!-- col9 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_24),  -->
-                        <!--    'column_alias': 'ds_partitioned__year'}               -->
+                        <!--    'column_alias': 'ds__extract_day'}                    -->
                         <!-- col10 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_25),  -->
-                        <!--    'column_alias': 'paid_at__day'}                       -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
                         <!-- col11 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_26),  -->
-                        <!--    'column_alias': 'paid_at__week'}                      -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
                         <!-- col12 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_27),  -->
-                        <!--    'column_alias': 'paid_at__month'}                     -->
+                        <!--    'column_alias': 'ds_partitioned__day'}                -->
                         <!-- col13 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_28),  -->
-                        <!--    'column_alias': 'paid_at__quarter'}                   -->
+                        <!--    'column_alias': 'ds_partitioned__week'}               -->
                         <!-- col14 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_29),  -->
-                        <!--    'column_alias': 'paid_at__year'}                      -->
+                        <!--    'column_alias': 'ds_partitioned__month'}              -->
                         <!-- col15 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_30),  -->
-                        <!--    'column_alias': 'booking__ds__day'}                   -->
+                        <!--    'column_alias': 'ds_partitioned__quarter'}            -->
                         <!-- col16 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_31),  -->
-                        <!--    'column_alias': 'booking__ds__week'}                  -->
+                        <!--    'column_alias': 'ds_partitioned__year'}               -->
                         <!-- col17 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_32),  -->
-                        <!--    'column_alias': 'booking__ds__month'}                 -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}       -->
                         <!-- col18 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_33),  -->
-                        <!--    'column_alias': 'booking__ds__quarter'}               -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}    -->
                         <!-- col19 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_34),  -->
-                        <!--    'column_alias': 'booking__ds__year'}                  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}      -->
                         <!-- col20 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_35),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__day'}       -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}       -->
                         <!-- col21 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_36),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__week'}      -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}        -->
                         <!-- col22 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_37),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__month'}     -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
                         <!-- col23 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_38),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
                         <!-- col24 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_39),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__year'}      -->
+                        <!--    'column_alias': 'paid_at__day'}                       -->
                         <!-- col25 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_40),  -->
-                        <!--    'column_alias': 'booking__paid_at__day'}              -->
+                        <!--    'column_alias': 'paid_at__week'}                      -->
                         <!-- col26 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_41),  -->
-                        <!--    'column_alias': 'booking__paid_at__week'}             -->
+                        <!--    'column_alias': 'paid_at__month'}                     -->
                         <!-- col27 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_42),  -->
-                        <!--    'column_alias': 'booking__paid_at__month'}            -->
+                        <!--    'column_alias': 'paid_at__quarter'}                   -->
                         <!-- col28 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_43),  -->
-                        <!--    'column_alias': 'booking__paid_at__quarter'}          -->
+                        <!--    'column_alias': 'paid_at__year'}                      -->
                         <!-- col29 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_44),  -->
-                        <!--    'column_alias': 'booking__paid_at__year'}             -->
+                        <!--    'column_alias': 'paid_at__extract_year'}              -->
                         <!-- col30 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_45),  -->
-                        <!--    'column_alias': 'metric_time__day'}                   -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}           -->
                         <!-- col31 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_46),  -->
-                        <!--    'column_alias': 'metric_time__week'}                  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}             -->
                         <!-- col32 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_47),  -->
-                        <!--    'column_alias': 'metric_time__month'}                 -->
+                        <!--    'column_alias': 'paid_at__extract_week'}              -->
                         <!-- col33 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_48),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}               -->
+                        <!--    'column_alias': 'paid_at__extract_day'}               -->
                         <!-- col34 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_49),  -->
-                        <!--    'column_alias': 'metric_time__year'}                  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}         -->
                         <!-- col35 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_50),  -->
-                        <!--    'column_alias': 'listing'}                            -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}         -->
                         <!-- col36 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_51),  -->
-                        <!--    'column_alias': 'guest'}                              -->
+                        <!--    'column_alias': 'booking__ds__day'}                   -->
                         <!-- col37 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_52),  -->
-                        <!--    'column_alias': 'host'}                               -->
+                        <!--    'column_alias': 'booking__ds__week'}                  -->
                         <!-- col38 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_53),  -->
-                        <!--    'column_alias': 'booking__listing'}                   -->
+                        <!--    'column_alias': 'booking__ds__month'}                 -->
                         <!-- col39 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_54),  -->
-                        <!--    'column_alias': 'booking__guest'}                     -->
+                        <!--    'column_alias': 'booking__ds__quarter'}               -->
                         <!-- col40 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_55),  -->
-                        <!--    'column_alias': 'booking__host'}                      -->
+                        <!--    'column_alias': 'booking__ds__year'}                  -->
                         <!-- col41 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_56),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}          -->
+                        <!-- col42 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_57),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}       -->
+                        <!-- col43 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_58),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}         -->
+                        <!-- col44 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_59),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}          -->
+                        <!-- col45 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_60),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}           -->
+                        <!-- col46 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}     -->
+                        <!-- col47 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}     -->
+                        <!-- col48 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_63),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}       -->
+                        <!-- col49 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_64),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}      -->
+                        <!-- col50 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_65),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}     -->
+                        <!-- col51 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_66),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}   -->
+                        <!-- col52 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_67),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}      -->
+                        <!-- col53 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_68),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col54 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_69),         -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col55 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_70),       -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col56 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_71),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col57 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_72),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col58 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col59 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col60 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_75),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}              -->
+                        <!-- col61 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_76),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}             -->
+                        <!-- col62 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_77),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}            -->
+                        <!-- col63 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_78),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}          -->
+                        <!-- col64 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_79),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}             -->
+                        <!-- col65 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_80),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}     -->
+                        <!-- col66 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_81),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                        <!-- col67 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_82),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}    -->
+                        <!-- col68 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_83),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}     -->
+                        <!-- col69 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_84),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}      -->
+                        <!-- col70 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col71 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col72 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_87),  -->
+                        <!--    'column_alias': 'metric_time__day'}                   -->
+                        <!-- col73 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_88),  -->
+                        <!--    'column_alias': 'metric_time__week'}                  -->
+                        <!-- col74 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_89),  -->
+                        <!--    'column_alias': 'metric_time__month'}                 -->
+                        <!-- col75 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_90),  -->
+                        <!--    'column_alias': 'metric_time__quarter'}               -->
+                        <!-- col76 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_91),  -->
+                        <!--    'column_alias': 'metric_time__year'}                  -->
+                        <!-- col77 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_92),  -->
+                        <!--    'column_alias': 'listing'}                            -->
+                        <!-- col78 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_93),  -->
+                        <!--    'column_alias': 'guest'}                              -->
+                        <!-- col79 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_94),  -->
+                        <!--    'column_alias': 'host'}                               -->
+                        <!-- col80 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_95),  -->
+                        <!--    'column_alias': 'booking__listing'}                   -->
+                        <!-- col81 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_96),  -->
+                        <!--    'column_alias': 'booking__guest'}                     -->
+                        <!-- col82 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
+                        <!--    'column_alias': 'booking__host'}                      -->
+                        <!-- col83 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_13),  -->
                         <!--    'column_alias': 'is_instant'}                         -->
-                        <!-- col42 =                                                  -->
+                        <!-- col84 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_14),  -->
                         <!--    'column_alias': 'booking__is_instant'}                -->
-                        <!-- col43 =                                                 -->
+                        <!-- col85 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_0),  -->
                         <!--    'column_alias': 'bookings'}                          -->
-                        <!-- col44 =                                                 -->
+                        <!-- col86 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1),  -->
                         <!--    'column_alias': 'instant_bookings'}                  -->
-                        <!-- col45 =                                                 -->
+                        <!-- col87 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_2),  -->
                         <!--    'column_alias': 'booking_value'}                     -->
-                        <!-- col46 =                                                 -->
+                        <!-- col88 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_3),  -->
                         <!--    'column_alias': 'max_booking_value'}                 -->
-                        <!-- col47 =                                                 -->
+                        <!-- col89 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_4),  -->
                         <!--    'column_alias': 'min_booking_value'}                 -->
-                        <!-- col48 =                                                 -->
+                        <!-- col90 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_5),  -->
                         <!--    'column_alias': 'bookers'}                           -->
-                        <!-- col49 =                                                 -->
+                        <!-- col91 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_6),  -->
                         <!--    'column_alias': 'average_booking_value'}             -->
-                        <!-- col50 =                                                 -->
+                        <!-- col92 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_7),  -->
                         <!--    'column_alias': 'referred_bookings'}                 -->
-                        <!-- col51 =                                                 -->
+                        <!-- col93 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_8),  -->
                         <!--    'column_alias': 'median_booking_value'}              -->
-                        <!-- col52 =                                                 -->
+                        <!-- col94 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_9),  -->
                         <!--    'column_alias': 'booking_value_p99'}                 -->
-                        <!-- col53 =                                                  -->
+                        <!-- col95 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}         -->
-                        <!-- col54 =                                                         -->
+                        <!-- col96 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_11),         -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col55 =                                                       -->
+                        <!-- col97 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_12),       -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
@@ -340,27 +508,27 @@
                             <!--    'column_alias': 'instant_bookings'}                                                              -->
                             <!-- col2 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                             <!--    'column_alias': 'booking_value'}                         -->
                             <!-- col3 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                             <!--    'column_alias': 'max_booking_value'}                     -->
                             <!-- col4 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                             <!--    'column_alias': 'min_booking_value'}                     -->
                             <!-- col5 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                             <!--    'column_alias': 'bookers'}                               -->
                             <!-- col6 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                             <!--    'column_alias': 'average_booking_value'}                 -->
                             <!-- col7 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                             <!--    'column_alias': 'booking_payments'}                      -->
                             <!-- col8 =                                                                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -368,31 +536,31 @@
                             <!--    'column_alias': 'referred_bookings'}                                                                          -->
                             <!-- col9 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                             <!--    'column_alias': 'median_booking_value'}                  -->
                             <!-- col10 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                             <!--    'column_alias': 'booking_value_p99'}                     -->
                             <!-- col11 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                             <!-- col12 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col13 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- col14 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                             <!--    'column_alias': 'is_instant'}                            -->
                             <!-- col15 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                             <!--    'column_alias': 'ds__day'}                               -->
                             <!-- col16 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -410,133 +578,301 @@
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                             <!--    'column_alias': 'ds__year'}                        -->
-                            <!-- col20 =                                                     -->
+                            <!-- col20 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                            <!--    'column_alias': 'ds__extract_year'}              -->
+                            <!-- col21 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}           -->
+                            <!-- col22 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                            <!--    'column_alias': 'ds__extract_month'}             -->
+                            <!-- col23 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                            <!--    'column_alias': 'ds__extract_week'}              -->
+                            <!-- col24 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                            <!--    'column_alias': 'ds__extract_day'}               -->
+                            <!-- col25 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!-- col26 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                            <!-- col21 =                                               -->
+                            <!-- col28 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}            -->
-                            <!-- col22 =                                               -->
+                            <!-- col29 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}           -->
-                            <!-- col23 =                                               -->
+                            <!-- col30 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                            <!-- col24 =                                               -->
+                            <!-- col31 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}            -->
-                            <!-- col25 =                                                     -->
+                            <!-- col32 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                            <!-- col33 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                            <!-- col34 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                            <!-- col35 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                            <!-- col36 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                            <!-- col37 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col38 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                             <!--    'column_alias': 'paid_at__day'}                          -->
-                            <!-- col26 =                                               -->
+                            <!-- col40 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                             <!--    'column_alias': 'paid_at__week'}                   -->
-                            <!-- col27 =                                               -->
+                            <!-- col41 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                             <!--    'column_alias': 'paid_at__month'}                  -->
-                            <!-- col28 =                                               -->
+                            <!-- col42 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                -->
-                            <!-- col29 =                                               -->
+                            <!-- col43 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                             <!--    'column_alias': 'paid_at__year'}                   -->
-                            <!-- col30 =                                                     -->
+                            <!-- col44 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}         -->
+                            <!-- col45 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                            <!-- col46 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}        -->
+                            <!-- col47 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}         -->
+                            <!-- col48 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}          -->
+                            <!-- col49 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!-- col50 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                             <!--    'column_alias': 'booking__is_instant'}                   -->
-                            <!-- col31 =                                                     -->
+                            <!-- col52 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                             <!--    'column_alias': 'booking__ds__day'}                      -->
-                            <!-- col32 =                                               -->
+                            <!-- col53 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                             <!--    'column_alias': 'booking__ds__week'}               -->
-                            <!-- col33 =                                               -->
+                            <!-- col54 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                             <!--    'column_alias': 'booking__ds__month'}              -->
-                            <!-- col34 =                                               -->
+                            <!-- col55 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}            -->
-                            <!-- col35 =                                               -->
+                            <!-- col56 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                             <!--    'column_alias': 'booking__ds__year'}               -->
-                            <!-- col36 =                                                     -->
+                            <!-- col57 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                            <!-- col58 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                            <!-- col59 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                            <!-- col60 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                            <!-- col61 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                            <!-- col62 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                            <!-- col63 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                            <!-- col37 =                                               -->
+                            <!-- col65 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                            <!-- col38 =                                               -->
+                            <!-- col66 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                            <!-- col39 =                                                 -->
+                            <!-- col67 =                                                 -->
                             <!--   {'class': 'SqlSelectColumn',                          -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                            <!-- col40 =                                               -->
+                            <!-- col68 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                            <!-- col41 =                                                     -->
+                            <!-- col69 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col70 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col71 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col72 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col73 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col74 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col75 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                            <!-- col42 =                                               -->
+                            <!-- col77 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}          -->
-                            <!-- col43 =                                               -->
+                            <!-- col78 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}         -->
-                            <!-- col44 =                                               -->
+                            <!-- col79 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                            <!-- col45 =                                               -->
+                            <!-- col80 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}          -->
-                            <!-- col46 =                                                     -->
+                            <!-- col81 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                            <!-- col82 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                            <!-- col83 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                            <!-- col84 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                            <!-- col85 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                            <!-- col86 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col87 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                             <!--    'column_alias': 'listing'}                               -->
-                            <!-- col47 =                                                     -->
+                            <!-- col89 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                             <!--    'column_alias': 'guest'}                                 -->
-                            <!-- col48 =                                                     -->
+                            <!-- col90 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                             <!--    'column_alias': 'host'}                                  -->
-                            <!-- col49 =                                                     -->
+                            <!-- col91 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                             <!--    'column_alias': 'booking__listing'}                      -->
-                            <!-- col50 =                                                     -->
+                            <!-- col92 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                             <!--    'column_alias': 'booking__guest'}                        -->
-                            <!-- col51 =                                                     -->
+                            <!-- col93 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml
index 2ad699be1e..eb918937d1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_11 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
         <!--    'column_alias': 'ds__day'}                             -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
         <!-- where = None -->
@@ -17,11 +17,11 @@
             <!-- node_id = ss_10 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
             <!--    'column_alias': 'ds__day'}                             -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
             <!-- where = None -->
@@ -30,7 +30,7 @@
                 <!-- node_id = ss_9 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                 <!--    'column_alias': 'ds__day'}                             -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -39,7 +39,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                 <!--    'column_alias': 'ds__day'}                             -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -49,11 +49,11 @@
                     <!-- node_id = ss_8 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                     <!-- where = None -->
@@ -62,227 +62,395 @@
                         <!-- node_id = ss_7 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                        <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                        <!--    'column_alias': 'ds_partitioned__week'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                        <!--    'column_alias': 'ds_partitioned__month'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                        <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                        <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                        <!--    'column_alias': 'ds_partitioned__year'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                        <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                        <!--    'column_alias': 'paid_at__day'}                        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                        <!--    'column_alias': 'paid_at__week'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                        <!--    'column_alias': 'paid_at__month'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                        <!--    'column_alias': 'paid_at__quarter'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                        <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                        <!--    'column_alias': 'paid_at__year'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                        <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                        <!--    'column_alias': 'booking__ds__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                        <!--    'column_alias': 'booking__ds__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                        <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                        <!--    'column_alias': 'booking__ds__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                        <!--    'column_alias': 'booking__ds__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                        <!--    'column_alias': 'booking__ds__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                        <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                        <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                        <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                        <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                        <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                        <!--    'column_alias': 'listing'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                        <!--    'column_alias': 'guest'}                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                        <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                        <!--    'column_alias': 'host'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                        <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                        <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                        <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                        <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                        <!--    'column_alias': 'bookings'}                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                        <!--    'column_alias': 'bookers'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                         <!-- col50 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                         <!-- col51 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                         <!-- col52 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!-- col53 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col54 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col55 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col56 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col57 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col58 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col59 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col60 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!-- col61 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!-- col62 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!-- col63 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!-- col64 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!-- col65 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                        <!-- col66 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                        <!-- col67 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                        <!-- col68 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                        <!-- col69 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                        <!-- col70 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col71 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col72 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!-- col73 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!-- col74 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!-- col75 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!-- col76 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!-- col77 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                        <!--    'column_alias': 'listing'}                             -->
+                        <!-- col78 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                        <!--    'column_alias': 'guest'}                               -->
+                        <!-- col79 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                        <!--    'column_alias': 'host'}                                -->
+                        <!-- col80 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!-- col81 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!-- col82 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!-- col83 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!-- col84 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!-- col85 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                        <!--    'column_alias': 'bookings'}                            -->
+                        <!-- col86 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!-- col87 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!-- col88 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!-- col89 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!-- col90 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                        <!--    'column_alias': 'bookers'}                             -->
+                        <!-- col91 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!-- col92 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!-- col93 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!-- col94 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                         <!--    'column_alias': 'booking_value_p99'}                   -->
-                        <!-- col53 =                                                   -->
+                        <!-- col95 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                        <!-- col54 =                                                         -->
+                        <!-- col96 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col55 =                                                       -->
+                        <!-- col97 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
@@ -299,27 +467,27 @@
                             <!--    'column_alias': 'instant_bookings'}                                                              -->
                             <!-- col2 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                             <!--    'column_alias': 'booking_value'}                         -->
                             <!-- col3 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                             <!--    'column_alias': 'max_booking_value'}                     -->
                             <!-- col4 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                             <!--    'column_alias': 'min_booking_value'}                     -->
                             <!-- col5 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                             <!--    'column_alias': 'bookers'}                               -->
                             <!-- col6 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                             <!--    'column_alias': 'average_booking_value'}                 -->
                             <!-- col7 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                             <!--    'column_alias': 'booking_payments'}                      -->
                             <!-- col8 =                                                                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -327,31 +495,31 @@
                             <!--    'column_alias': 'referred_bookings'}                                                                          -->
                             <!-- col9 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                             <!--    'column_alias': 'median_booking_value'}                  -->
                             <!-- col10 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                             <!--    'column_alias': 'booking_value_p99'}                     -->
                             <!-- col11 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                             <!-- col12 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col13 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- col14 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                             <!--    'column_alias': 'is_instant'}                            -->
                             <!-- col15 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                             <!--    'column_alias': 'ds__day'}                               -->
                             <!-- col16 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -369,133 +537,301 @@
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                             <!--    'column_alias': 'ds__year'}                        -->
-                            <!-- col20 =                                                     -->
+                            <!-- col20 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                            <!--    'column_alias': 'ds__extract_year'}              -->
+                            <!-- col21 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}           -->
+                            <!-- col22 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                            <!--    'column_alias': 'ds__extract_month'}             -->
+                            <!-- col23 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                            <!--    'column_alias': 'ds__extract_week'}              -->
+                            <!-- col24 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                            <!--    'column_alias': 'ds__extract_day'}               -->
+                            <!-- col25 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!-- col26 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                            <!-- col21 =                                               -->
+                            <!-- col28 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}            -->
-                            <!-- col22 =                                               -->
+                            <!-- col29 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}           -->
-                            <!-- col23 =                                               -->
+                            <!-- col30 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                            <!-- col24 =                                               -->
+                            <!-- col31 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}            -->
-                            <!-- col25 =                                                     -->
+                            <!-- col32 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                            <!-- col33 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                            <!-- col34 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                            <!-- col35 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                            <!-- col36 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                            <!-- col37 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col38 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                             <!--    'column_alias': 'paid_at__day'}                          -->
-                            <!-- col26 =                                               -->
+                            <!-- col40 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                             <!--    'column_alias': 'paid_at__week'}                   -->
-                            <!-- col27 =                                               -->
+                            <!-- col41 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                             <!--    'column_alias': 'paid_at__month'}                  -->
-                            <!-- col28 =                                               -->
+                            <!-- col42 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                -->
-                            <!-- col29 =                                               -->
+                            <!-- col43 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                             <!--    'column_alias': 'paid_at__year'}                   -->
-                            <!-- col30 =                                                     -->
+                            <!-- col44 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}         -->
+                            <!-- col45 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                            <!-- col46 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}        -->
+                            <!-- col47 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}         -->
+                            <!-- col48 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}          -->
+                            <!-- col49 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!-- col50 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                             <!--    'column_alias': 'booking__is_instant'}                   -->
-                            <!-- col31 =                                                     -->
+                            <!-- col52 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                             <!--    'column_alias': 'booking__ds__day'}                      -->
-                            <!-- col32 =                                               -->
+                            <!-- col53 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                             <!--    'column_alias': 'booking__ds__week'}               -->
-                            <!-- col33 =                                               -->
+                            <!-- col54 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                             <!--    'column_alias': 'booking__ds__month'}              -->
-                            <!-- col34 =                                               -->
+                            <!-- col55 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}            -->
-                            <!-- col35 =                                               -->
+                            <!-- col56 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                             <!--    'column_alias': 'booking__ds__year'}               -->
-                            <!-- col36 =                                                     -->
+                            <!-- col57 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                            <!-- col58 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                            <!-- col59 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                            <!-- col60 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                            <!-- col61 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                            <!-- col62 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                            <!-- col63 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                            <!-- col37 =                                               -->
+                            <!-- col65 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                            <!-- col38 =                                               -->
+                            <!-- col66 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                            <!-- col39 =                                                 -->
+                            <!-- col67 =                                                 -->
                             <!--   {'class': 'SqlSelectColumn',                          -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                            <!-- col40 =                                               -->
+                            <!-- col68 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                            <!-- col41 =                                                     -->
+                            <!-- col69 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col70 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col71 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col72 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col73 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col74 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col75 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                            <!-- col42 =                                               -->
+                            <!-- col77 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}          -->
-                            <!-- col43 =                                               -->
+                            <!-- col78 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}         -->
-                            <!-- col44 =                                               -->
+                            <!-- col79 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                            <!-- col45 =                                               -->
+                            <!-- col80 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}          -->
-                            <!-- col46 =                                                     -->
+                            <!-- col81 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                            <!-- col82 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                            <!-- col83 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                            <!-- col84 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                            <!-- col85 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                            <!-- col86 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col87 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                             <!--    'column_alias': 'listing'}                               -->
-                            <!-- col47 =                                                     -->
+                            <!-- col89 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                             <!--    'column_alias': 'guest'}                                 -->
-                            <!-- col48 =                                                     -->
+                            <!-- col90 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                             <!--    'column_alias': 'host'}                                  -->
-                            <!-- col49 =                                                     -->
+                            <!-- col91 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                             <!--    'column_alias': 'booking__listing'}                      -->
-                            <!-- col50 =                                                     -->
+                            <!-- col92 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                             <!--    'column_alias': 'booking__guest'}                        -->
-                            <!-- col51 =                                                     -->
+                            <!-- col93 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml
index 6d1aa61883..0c406fa13f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_10 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
         <!--    'column_alias': 'listing__country_latest'}             -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
         <!--    'column_alias': 'listings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_9 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
             <!--    'column_alias': 'listing__country_latest'}             -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
             <!--    'column_alias': 'listing__country_latest'}             -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_8 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                 <!--    'column_alias': 'listing__country_latest'}             -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                 <!--    'column_alias': 'listings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
@@ -49,151 +49,263 @@
                     <!-- node_id = ss_7 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                    <!--    'column_alias': 'created_at__day'}                     -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                    <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
-                    <!--    'column_alias': 'created_at__week'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
-                    <!--    'column_alias': 'created_at__month'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                    <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
-                    <!--    'column_alias': 'created_at__quarter'}                 -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                    <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
-                    <!--    'column_alias': 'created_at__year'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                    <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
-                    <!--    'column_alias': 'listing__ds__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                    <!--    'column_alias': 'listing__ds__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                    <!--    'column_alias': 'listing__ds__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                    <!--    'column_alias': 'created_at__day'}                     -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                    <!--    'column_alias': 'listing__ds__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                    <!--    'column_alias': 'created_at__week'}                    -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                    <!--    'column_alias': 'listing__ds__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                    <!--    'column_alias': 'created_at__month'}                   -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                    <!--    'column_alias': 'listing__created_at__day'}            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                    <!--    'column_alias': 'created_at__quarter'}                 -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                    <!--    'column_alias': 'listing__created_at__week'}           -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                    <!--    'column_alias': 'created_at__year'}                    -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                    <!--    'column_alias': 'listing__created_at__month'}          -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                    <!--    'column_alias': 'created_at__extract_year'}            -->
                     <!-- col18 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                    <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                    <!--    'column_alias': 'created_at__extract_quarter'}         -->
                     <!-- col19 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                    <!--    'column_alias': 'listing__created_at__year'}           -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                    <!--    'column_alias': 'created_at__extract_month'}           -->
                     <!-- col20 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                    <!--    'column_alias': 'created_at__extract_week'}            -->
                     <!-- col21 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                    <!--    'column_alias': 'created_at__extract_day'}             -->
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                    <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                    <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                    <!--    'column_alias': 'listing__ds__day'}                    -->
                     <!-- col25 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                    <!--    'column_alias': 'listing'}                             -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                    <!--    'column_alias': 'listing__ds__week'}                   -->
                     <!-- col26 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                    <!--    'column_alias': 'listing__ds__month'}                  -->
                     <!-- col27 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                    <!--    'column_alias': 'listing__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                    <!--    'column_alias': 'listing__ds__quarter'}                -->
                     <!-- col28 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                    <!--    'column_alias': 'country_latest'}                      -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                    <!--    'column_alias': 'listing__ds__year'}                   -->
                     <!-- col29 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                    <!--    'column_alias': 'listing__ds__extract_year'}           -->
                     <!-- col30 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                    <!--    'column_alias': 'capacity_latest'}                     -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                    <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                     <!-- col31 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                    <!--    'column_alias': 'listing__country_latest'}             -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                    <!--    'column_alias': 'listing__ds__extract_month'}          -->
                     <!-- col32 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                    <!--    'column_alias': 'listing__ds__extract_week'}           -->
                     <!-- col33 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                    <!--    'column_alias': 'listing__ds__extract_day'}            -->
                     <!-- col34 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                    <!--    'column_alias': 'listings'}                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                    <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                     <!-- col35 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                    <!--    'column_alias': 'largest_listing'}                     -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                    <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                     <!-- col36 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                    <!--    'column_alias': 'listing__created_at__day'}            -->
+                    <!-- col37 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                    <!--    'column_alias': 'listing__created_at__week'}           -->
+                    <!-- col38 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                    <!--    'column_alias': 'listing__created_at__month'}          -->
+                    <!-- col39 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                    <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                    <!-- col40 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                    <!--    'column_alias': 'listing__created_at__year'}           -->
+                    <!-- col41 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                    <!--    'column_alias': 'listing__created_at__extract_year'}   -->
+                    <!-- col42 =                                                     -->
+                    <!--   {'class': 'SqlSelectColumn',                              -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),    -->
+                    <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                    <!-- col43 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                    <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                    <!-- col44 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                    <!--    'column_alias': 'listing__created_at__extract_week'}   -->
+                    <!-- col45 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                    <!--    'column_alias': 'listing__created_at__extract_day'}    -->
+                    <!-- col46 =                                                       -->
+                    <!--   {'class': 'SqlSelectColumn',                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),      -->
+                    <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                    <!-- col47 =                                                       -->
+                    <!--   {'class': 'SqlSelectColumn',                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),      -->
+                    <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                    <!-- col48 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!-- col49 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!-- col50 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!-- col51 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!-- col52 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!-- col53 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                    <!--    'column_alias': 'listing'}                             -->
+                    <!-- col54 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                    <!--    'column_alias': 'user'}                                -->
+                    <!-- col55 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                    <!--    'column_alias': 'listing__user'}                       -->
+                    <!-- col56 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                    <!--    'column_alias': 'country_latest'}                      -->
+                    <!-- col57 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                    <!-- col58 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                    <!--    'column_alias': 'capacity_latest'}                     -->
+                    <!-- col59 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                    <!--    'column_alias': 'listing__country_latest'}             -->
+                    <!-- col60 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                    <!-- col61 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                    <!-- col62 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                    <!--    'column_alias': 'listings'}                            -->
+                    <!-- col63 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                    <!--    'column_alias': 'largest_listing'}                     -->
+                    <!-- col64 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
                     <!--    'column_alias': 'smallest_listing'}                    -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                     <!-- where = None -->
@@ -206,15 +318,15 @@
                         <!--    'column_alias': 'listings'}                                 -->
                         <!-- col1 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                         <!--    'column_alias': 'largest_listing'}                       -->
                         <!-- col2 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                         <!--    'column_alias': 'smallest_listing'}                      -->
                         <!-- col3 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                         <!--    'column_alias': 'ds__day'}                               -->
                         <!-- col4 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -232,101 +344,213 @@
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                         <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col8 =                                                      -->
+                        <!-- col8 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col9 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col10 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col11 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col12 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col13 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!-- col14 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!-- col15 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                         <!--    'column_alias': 'created_at__day'}                       -->
-                        <!-- col9 =                                                -->
+                        <!-- col16 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                         <!--    'column_alias': 'created_at__week'}                -->
-                        <!-- col10 =                                               -->
+                        <!-- col17 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                         <!--    'column_alias': 'created_at__month'}               -->
-                        <!-- col11 =                                               -->
+                        <!-- col18 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                         <!--    'column_alias': 'created_at__quarter'}             -->
-                        <!-- col12 =                                               -->
+                        <!-- col19 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                         <!--    'column_alias': 'created_at__year'}                -->
-                        <!-- col13 =                                                     -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                        <!--    'column_alias': 'created_at__extract_year'}      -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                        <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                        <!--    'column_alias': 'created_at__extract_month'}     -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                        <!--    'column_alias': 'created_at__extract_week'}      -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                        <!--    'column_alias': 'created_at__extract_day'}       -->
+                        <!-- col25 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                        <!-- col26 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                        <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                         <!--    'column_alias': 'country_latest'}                        -->
-                        <!-- col14 =                                                     -->
+                        <!-- col28 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                         <!--    'column_alias': 'is_lux_latest'}                         -->
-                        <!-- col15 =                                                     -->
+                        <!-- col29 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                         <!--    'column_alias': 'capacity_latest'}                       -->
-                        <!-- col16 =                                                     -->
+                        <!-- col30 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                         <!--    'column_alias': 'listing__ds__day'}                      -->
-                        <!-- col17 =                                               -->
+                        <!-- col31 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                         <!--    'column_alias': 'listing__ds__week'}               -->
-                        <!-- col18 =                                               -->
+                        <!-- col32 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                         <!--    'column_alias': 'listing__ds__month'}              -->
-                        <!-- col19 =                                               -->
+                        <!-- col33 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                         <!--    'column_alias': 'listing__ds__quarter'}            -->
-                        <!-- col20 =                                               -->
+                        <!-- col34 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                         <!--    'column_alias': 'listing__ds__year'}               -->
-                        <!-- col21 =                                                     -->
+                        <!-- col35 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                        <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                        <!-- col36 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                        <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                        <!-- col37 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                        <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                        <!-- col38 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                        <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                        <!-- col39 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                        <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                        <!-- col40 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                        <!-- col41 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                        <!-- col42 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                         <!--    'column_alias': 'listing__created_at__day'}              -->
-                        <!-- col22 =                                               -->
+                        <!-- col43 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                         <!--    'column_alias': 'listing__created_at__week'}       -->
-                        <!-- col23 =                                               -->
+                        <!-- col44 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                         <!--    'column_alias': 'listing__created_at__month'}      -->
-                        <!-- col24 =                                               -->
+                        <!-- col45 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                         <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                        <!-- col25 =                                               -->
+                        <!-- col46 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                         <!--    'column_alias': 'listing__created_at__year'}       -->
-                        <!-- col26 =                                                     -->
+                        <!-- col47 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                        <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                        <!-- col48 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                        <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                        <!-- col49 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                        <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                        <!-- col50 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                        <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                        <!-- col51 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                        <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                        <!-- col52 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                        <!-- col53 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                        <!-- col54 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                         <!--    'column_alias': 'listing__country_latest'}               -->
-                        <!-- col27 =                                                     -->
+                        <!-- col55 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                         <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                        <!-- col28 =                                                     -->
+                        <!-- col56 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                         <!--    'column_alias': 'listing__capacity_latest'}              -->
-                        <!-- col29 =                                                     -->
+                        <!-- col57 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                         <!--    'column_alias': 'listing'}                               -->
-                        <!-- col30 =                                                     -->
+                        <!-- col58 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                         <!--    'column_alias': 'user'}                                  -->
-                        <!-- col31 =                                                     -->
+                        <!-- col59 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                         <!--    'column_alias': 'listing__user'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml
index 6f19ddfe1f..aa58e56a77 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml
@@ -56,27 +56,27 @@
                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                 <!-- col2 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                 <!--    'column_alias': 'booking_value'}                         -->
                 <!-- col3 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                 <!--    'column_alias': 'max_booking_value'}                     -->
                 <!-- col4 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                 <!--    'column_alias': 'min_booking_value'}                     -->
                 <!-- col5 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                 <!--    'column_alias': 'bookers'}                               -->
                 <!-- col6 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                 <!--    'column_alias': 'average_booking_value'}                 -->
                 <!-- col7 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                 <!--    'column_alias': 'booking_payments'}                      -->
                 <!-- col8 =                                                                                                           -->
                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -84,31 +84,31 @@
                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                 <!-- col9 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                 <!--    'column_alias': 'median_booking_value'}                  -->
                 <!-- col10 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                 <!--    'column_alias': 'booking_value_p99'}                     -->
                 <!-- col11 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                 <!-- col12 =                                                         -->
                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                 <!-- col13 =                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                 <!-- col14 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                 <!--    'column_alias': 'is_instant'}                            -->
                 <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                 <!--    'column_alias': 'ds__day'}                               -->
                 <!-- col16 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -126,133 +126,301 @@
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                 <!--    'column_alias': 'ds__year'}                        -->
-                <!-- col20 =                                                     -->
+                <!-- col20 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                <!--    'column_alias': 'ds__extract_year'}              -->
+                <!-- col21 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                <!-- col22 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                <!--    'column_alias': 'ds__extract_month'}             -->
+                <!-- col23 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                <!--    'column_alias': 'ds__extract_week'}              -->
+                <!-- col24 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                <!--    'column_alias': 'ds__extract_day'}               -->
+                <!-- col25 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!-- col26 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                <!-- col21 =                                               -->
+                <!-- col28 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                <!-- col22 =                                               -->
+                <!-- col29 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                <!-- col23 =                                               -->
+                <!-- col30 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                <!-- col24 =                                               -->
+                <!-- col31 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                <!-- col25 =                                                     -->
+                <!-- col32 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                <!-- col33 =                                                -->
+                <!--   {'class': 'SqlSelectColumn',                         -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                <!-- col34 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                <!-- col35 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                <!-- col36 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                <!-- col37 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                <!-- col38 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                <!-- col39 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                 <!--    'column_alias': 'paid_at__day'}                          -->
-                <!-- col26 =                                               -->
+                <!-- col40 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                 <!--    'column_alias': 'paid_at__week'}                   -->
-                <!-- col27 =                                               -->
+                <!-- col41 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                 <!--    'column_alias': 'paid_at__month'}                  -->
-                <!-- col28 =                                               -->
+                <!-- col42 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                <!-- col29 =                                               -->
+                <!-- col43 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                 <!--    'column_alias': 'paid_at__year'}                   -->
-                <!-- col30 =                                                     -->
+                <!-- col44 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                <!-- col45 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                <!-- col46 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                <!-- col47 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                <!-- col48 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                <!-- col49 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                <!-- col50 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                <!-- col51 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                <!-- col31 =                                                     -->
+                <!-- col52 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                <!-- col32 =                                               -->
+                <!-- col53 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                 <!--    'column_alias': 'booking__ds__week'}               -->
-                <!-- col33 =                                               -->
+                <!-- col54 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                 <!--    'column_alias': 'booking__ds__month'}              -->
-                <!-- col34 =                                               -->
+                <!-- col55 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                <!-- col35 =                                               -->
+                <!-- col56 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                 <!--    'column_alias': 'booking__ds__year'}               -->
-                <!-- col36 =                                                     -->
+                <!-- col57 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                <!-- col58 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                <!-- col59 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                <!-- col60 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                <!-- col61 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                <!-- col62 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                <!-- col63 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                <!-- col64 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                <!-- col37 =                                               -->
+                <!-- col65 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                <!-- col38 =                                               -->
+                <!-- col66 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                <!-- col39 =                                                 -->
+                <!-- col67 =                                                 -->
                 <!--   {'class': 'SqlSelectColumn',                          -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                <!-- col40 =                                               -->
+                <!-- col68 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                <!-- col41 =                                                     -->
+                <!-- col69 =                                                      -->
+                <!--   {'class': 'SqlSelectColumn',                               -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                <!-- col70 =                                                         -->
+                <!--   {'class': 'SqlSelectColumn',                                  -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                <!-- col71 =                                                       -->
+                <!--   {'class': 'SqlSelectColumn',                                -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                <!-- col72 =                                                      -->
+                <!--   {'class': 'SqlSelectColumn',                               -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                <!-- col73 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                <!-- col74 =                                                           -->
+                <!--   {'class': 'SqlSelectColumn',                                    -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                <!-- col75 =                                                           -->
+                <!--   {'class': 'SqlSelectColumn',                                    -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                <!-- col76 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                <!-- col42 =                                               -->
+                <!-- col77 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                <!-- col43 =                                               -->
+                <!-- col78 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                <!-- col44 =                                               -->
+                <!-- col79 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                <!-- col45 =                                               -->
+                <!-- col80 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                <!-- col46 =                                                     -->
+                <!-- col81 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                <!-- col82 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                <!-- col83 =                                                -->
+                <!--   {'class': 'SqlSelectColumn',                         -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                <!-- col84 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                <!-- col85 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                <!-- col86 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                             -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                <!-- col87 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                             -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                <!-- col88 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                 <!--    'column_alias': 'listing'}                               -->
-                <!-- col47 =                                                     -->
+                <!-- col89 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                 <!--    'column_alias': 'guest'}                                 -->
-                <!-- col48 =                                                     -->
+                <!-- col90 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                 <!--    'column_alias': 'host'}                                  -->
-                <!-- col49 =                                                     -->
+                <!-- col91 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                 <!--    'column_alias': 'booking__listing'}                      -->
-                <!-- col50 =                                                     -->
+                <!-- col92 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                 <!--    'column_alias': 'booking__guest'}                        -->
-                <!-- col51 =                                                     -->
+                <!-- col93 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                 <!--    'column_alias': 'booking__host'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml
index 286024abca..861a4944cd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_32 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_920),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                                                               -->
         <!--   {'class': 'SqlSelectColumn',                                                                                       -->
@@ -21,15 +21,15 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_914),  -->
             <!--    'column_alias': 'average_booking_value'}               -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_915),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- col3 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_916),  -->
             <!--    'column_alias': 'booking_value'}                       -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
             <!-- join_0 =                                                   -->
@@ -50,11 +50,11 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                 <!--    'column_alias': 'average_booking_value'}               -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -63,7 +63,7 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                           -->
                     <!--   {'class': 'SqlSelectColumn',                                                   -->
@@ -72,7 +72,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -82,11 +82,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                         <!--    'column_alias': 'average_booking_value'}               -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -95,15 +95,15 @@
                             <!-- node_id = ss_13 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                             <!--    'column_alias': 'listing__is_lux_latest'}              -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                             <!-- where =                                                               -->
@@ -115,15 +115,15 @@
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                                 <!--    'column_alias': 'listing__is_lux_latest'}              -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                                 <!--    'column_alias': 'average_booking_value'}               -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                                 <!-- where = None -->
@@ -132,19 +132,19 @@
                                     <!-- node_id = ss_11 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                                     <!--    'column_alias': 'listing'}                             -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                                     <!--    'column_alias': 'listing__is_lux_latest'}              -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                                     <!--    'column_alias': 'average_booking_value'}               -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                                     <!-- join_0 =                                                    -->
@@ -161,15 +161,15 @@
                                         <!-- node_id = ss_8 -->
                                         <!-- col0 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                         <!--    'column_alias': 'metric_time__day'}                    -->
                                         <!-- col1 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                         <!--    'column_alias': 'listing'}                             -->
                                         <!-- col2 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                         <!--    'column_alias': 'average_booking_value'}               -->
                                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                         <!-- where = None -->
@@ -178,227 +178,395 @@
                                             <!-- node_id = ss_7 -->
                                             <!-- col0 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                                             <!--    'column_alias': 'ds__day'}                             -->
                                             <!-- col1 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                                             <!--    'column_alias': 'ds__week'}                            -->
                                             <!-- col2 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                                             <!--    'column_alias': 'ds__month'}                           -->
                                             <!-- col3 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                                             <!--    'column_alias': 'ds__quarter'}                         -->
                                             <!-- col4 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                                             <!--    'column_alias': 'ds__year'}                            -->
                                             <!-- col5 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                            <!--    'column_alias': 'ds__extract_year'}                    -->
                                             <!-- col6 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                             <!-- col7 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                            <!--    'column_alias': 'ds__extract_month'}                   -->
                                             <!-- col8 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                            <!--    'column_alias': 'ds__extract_week'}                    -->
                                             <!-- col9 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                            <!--    'column_alias': 'ds__extract_day'}                     -->
                                             <!-- col10 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                                            <!--    'column_alias': 'paid_at__day'}                        -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                             <!-- col11 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                                            <!--    'column_alias': 'paid_at__week'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                             <!-- col12 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                                            <!--    'column_alias': 'paid_at__month'}                      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                             <!-- col13 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                                             <!-- col14 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                                            <!--    'column_alias': 'paid_at__year'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                                             <!-- col15 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                             <!-- col16 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                                             <!-- col17 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                             <!-- col18 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                             <!-- col19 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                             <!-- col20 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                             <!-- col21 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                             <!-- col22 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                             <!-- col23 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                             <!-- col24 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                            <!--    'column_alias': 'paid_at__day'}                        -->
                                             <!-- col25 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                            <!--    'column_alias': 'paid_at__week'}                       -->
                                             <!-- col26 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                            <!--    'column_alias': 'paid_at__month'}                      -->
                                             <!-- col27 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                                             <!-- col28 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                            <!--    'column_alias': 'paid_at__year'}                       -->
                                             <!-- col29 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                                             <!-- col30 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                                            <!--    'column_alias': 'metric_time__day'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                             <!-- col31 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                                            <!--    'column_alias': 'metric_time__week'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                                             <!-- col32 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                                            <!--    'column_alias': 'metric_time__month'}                  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                                             <!-- col33 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                                             <!-- col34 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                                            <!--    'column_alias': 'metric_time__year'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                             <!-- col35 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                                            <!--    'column_alias': 'listing'}                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                             <!-- col36 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                                            <!--    'column_alias': 'guest'}                               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                            <!--    'column_alias': 'booking__ds__day'}                    -->
                                             <!-- col37 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                                            <!--    'column_alias': 'host'}                                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                            <!--    'column_alias': 'booking__ds__week'}                   -->
                                             <!-- col38 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                                            <!--    'column_alias': 'booking__listing'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                            <!--    'column_alias': 'booking__ds__month'}                  -->
                                             <!-- col39 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                                            <!--    'column_alias': 'booking__guest'}                      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                                             <!-- col40 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                                            <!--    'column_alias': 'booking__host'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                            <!--    'column_alias': 'booking__ds__year'}                   -->
                                             <!-- col41 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                                            <!--    'column_alias': 'is_instant'}                          -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                             <!-- col42 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                             <!-- col43 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                                            <!--    'column_alias': 'bookings'}                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                             <!-- col44 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                                            <!--    'column_alias': 'instant_bookings'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                             <!-- col45 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                                            <!--    'column_alias': 'booking_value'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                             <!-- col46 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                                            <!--    'column_alias': 'max_booking_value'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                             <!-- col47 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                                            <!--    'column_alias': 'min_booking_value'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                             <!-- col48 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                                            <!--    'column_alias': 'bookers'}                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                             <!-- col49 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                                            <!--    'column_alias': 'average_booking_value'}               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                             <!-- col50 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                                            <!--    'column_alias': 'referred_bookings'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                             <!-- col51 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                                            <!--    'column_alias': 'median_booking_value'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                             <!-- col52 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                            <!-- col53 =                                                      -->
+                                            <!--   {'class': 'SqlSelectColumn',                               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                            <!-- col54 =                                                         -->
+                                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                            <!-- col55 =                                                       -->
+                                            <!--   {'class': 'SqlSelectColumn',                                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                            <!-- col56 =                                                      -->
+                                            <!--   {'class': 'SqlSelectColumn',                               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                            <!-- col57 =                                                     -->
+                                            <!--   {'class': 'SqlSelectColumn',                              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                            <!-- col58 =                                                           -->
+                                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                            <!-- col59 =                                                           -->
+                                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                            <!-- col60 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                            <!-- col61 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                            <!-- col62 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                            <!-- col63 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                            <!-- col64 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                            <!-- col65 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                            <!-- col66 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                            <!-- col67 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                            <!-- col68 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                            <!-- col69 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                            <!-- col70 =                                                    -->
+                                            <!--   {'class': 'SqlSelectColumn',                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                            <!-- col71 =                                                    -->
+                                            <!--   {'class': 'SqlSelectColumn',                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                            <!-- col72 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                            <!--    'column_alias': 'metric_time__day'}                    -->
+                                            <!-- col73 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                            <!--    'column_alias': 'metric_time__week'}                   -->
+                                            <!-- col74 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                            <!--    'column_alias': 'metric_time__month'}                  -->
+                                            <!-- col75 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                                            <!-- col76 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                            <!--    'column_alias': 'metric_time__year'}                   -->
+                                            <!-- col77 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                                            <!--    'column_alias': 'listing'}                             -->
+                                            <!-- col78 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                                            <!--    'column_alias': 'guest'}                               -->
+                                            <!-- col79 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                                            <!--    'column_alias': 'host'}                                -->
+                                            <!-- col80 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                                            <!--    'column_alias': 'booking__listing'}                    -->
+                                            <!-- col81 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                                            <!--    'column_alias': 'booking__guest'}                      -->
+                                            <!-- col82 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                                            <!--    'column_alias': 'booking__host'}                       -->
+                                            <!-- col83 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                                            <!--    'column_alias': 'is_instant'}                          -->
+                                            <!-- col84 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                                            <!-- col85 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                                            <!--    'column_alias': 'bookings'}                            -->
+                                            <!-- col86 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                                            <!--    'column_alias': 'instant_bookings'}                    -->
+                                            <!-- col87 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                                            <!--    'column_alias': 'booking_value'}                       -->
+                                            <!-- col88 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                                            <!--    'column_alias': 'max_booking_value'}                   -->
+                                            <!-- col89 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                                            <!--    'column_alias': 'min_booking_value'}                   -->
+                                            <!-- col90 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                                            <!--    'column_alias': 'bookers'}                             -->
+                                            <!-- col91 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                                            <!--    'column_alias': 'average_booking_value'}               -->
+                                            <!-- col92 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                                            <!--    'column_alias': 'referred_bookings'}                   -->
+                                            <!-- col93 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                                            <!--    'column_alias': 'median_booking_value'}                -->
+                                            <!-- col94 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                                            <!-- col53 =                                                   -->
+                                            <!-- col95 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                            <!-- col54 =                                                         -->
+                                            <!-- col96 =                                                         -->
                                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                            <!-- col55 =                                                       -->
+                                            <!-- col97 =                                                       -->
                                             <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                             <!-- where = None -->
@@ -415,27 +583,27 @@
                                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                                 <!-- col2 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                                 <!--    'column_alias': 'booking_value'}                         -->
                                                 <!-- col3 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                                 <!-- col4 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                                 <!-- col5 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                                 <!--    'column_alias': 'bookers'}                               -->
                                                 <!-- col6 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                                 <!-- col7 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                                 <!--    'column_alias': 'booking_payments'}                      -->
                                                 <!-- col8 =                                                                                                           -->
                                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -443,31 +611,31 @@
                                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                                 <!-- col9 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                                 <!-- col10 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                                 <!-- col11 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                                 <!-- col12 =                                                         -->
                                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                                 <!-- col13 =                                                       -->
                                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                                 <!-- col14 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                                 <!--    'column_alias': 'is_instant'}                            -->
                                                 <!-- col15 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                                 <!--    'column_alias': 'ds__day'}                               -->
                                                 <!-- col16 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -485,133 +653,301 @@
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                                 <!--    'column_alias': 'ds__year'}                        -->
-                                                <!-- col20 =                                                     -->
+                                                <!-- col20 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                                <!-- col21 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                                <!-- col22 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                                <!-- col23 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                                <!-- col24 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                                <!-- col25 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                                <!-- col26 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                                <!-- col27 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                                <!-- col21 =                                               -->
+                                                <!-- col28 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                                <!-- col22 =                                               -->
+                                                <!-- col29 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                                <!-- col23 =                                               -->
+                                                <!-- col30 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                                <!-- col24 =                                               -->
+                                                <!-- col31 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                                <!-- col25 =                                                     -->
+                                                <!-- col32 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                                <!-- col33 =                                                -->
+                                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                                <!-- col34 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                                <!-- col35 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                                <!-- col36 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                                <!-- col37 =                                                  -->
+                                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                                <!-- col38 =                                                  -->
+                                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                                <!-- col39 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                                <!-- col26 =                                               -->
+                                                <!-- col40 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                                <!-- col27 =                                               -->
+                                                <!-- col41 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                                <!-- col28 =                                               -->
+                                                <!-- col42 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                                <!-- col29 =                                               -->
+                                                <!-- col43 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                                <!-- col30 =                                                     -->
+                                                <!-- col44 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                                <!-- col45 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                                <!-- col46 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                                <!-- col47 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                                <!-- col48 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                                <!-- col49 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                                <!-- col50 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                                <!-- col51 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                                <!-- col31 =                                                     -->
+                                                <!-- col52 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                                <!-- col32 =                                               -->
+                                                <!-- col53 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                                <!-- col33 =                                               -->
+                                                <!-- col54 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                                <!-- col34 =                                               -->
+                                                <!-- col55 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                                <!-- col35 =                                               -->
+                                                <!-- col56 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                                <!-- col36 =                                                     -->
-                                                <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                                <!-- col57 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                                <!-- col58 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                                <!-- col59 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                                <!-- col60 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                                <!-- col61 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                                <!-- col62 =                                               -->
+                                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                                <!-- col63 =                                               -->
+                                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                                <!-- col64 =                                                     -->
+                                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                                <!-- col37 =                                               -->
+                                                <!-- col65 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                                <!-- col38 =                                               -->
+                                                <!-- col66 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                                <!-- col39 =                                                 -->
+                                                <!-- col67 =                                                 -->
                                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                                <!-- col40 =                                               -->
+                                                <!-- col68 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                                <!-- col41 =                                                     -->
-                                                <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                                <!-- col69 =                                                      -->
+                                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                                <!-- col70 =                                                         -->
+                                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                                <!-- col71 =                                                       -->
+                                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                                <!-- col72 =                                                      -->
+                                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                                <!-- col73 =                                                     -->
+                                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                                <!-- col74 =                                                           -->
+                                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                                <!-- col75 =                                                           -->
+                                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                                <!-- col76 =                                                     -->
+                                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                                <!-- col42 =                                               -->
+                                                <!-- col77 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                                <!-- col43 =                                               -->
+                                                <!-- col78 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                                <!-- col44 =                                               -->
+                                                <!-- col79 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                                <!-- col45 =                                               -->
+                                                <!-- col80 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                                <!-- col46 =                                                     -->
+                                                <!-- col81 =                                               -->
+                                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                                <!-- col82 =                                                  -->
+                                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                                <!-- col83 =                                                -->
+                                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                                <!-- col84 =                                               -->
+                                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                                <!-- col85 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                                <!-- col86 =                                                    -->
+                                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                                <!-- col87 =                                                    -->
+                                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                                <!-- col88 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                                 <!--    'column_alias': 'listing'}                               -->
-                                                <!-- col47 =                                                     -->
+                                                <!-- col89 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                                 <!--    'column_alias': 'guest'}                                 -->
-                                                <!-- col48 =                                                     -->
+                                                <!-- col90 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                                 <!--    'column_alias': 'host'}                                  -->
-                                                <!-- col49 =                                                     -->
+                                                <!-- col91 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                                <!-- col50 =                                                     -->
+                                                <!-- col92 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                                <!-- col51 =                                                     -->
+                                                <!-- col93 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                                 <!--    'column_alias': 'booking__host'}                         -->
                                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                                 <!-- where = None -->
@@ -630,11 +966,11 @@
                                         <!-- node_id = ss_10 -->
                                         <!-- col0 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
                                         <!--    'column_alias': 'listing'}                             -->
                                         <!-- col1 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                                         <!--    'column_alias': 'is_lux_latest'}                       -->
                                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                                         <!-- where = None -->
@@ -643,151 +979,263 @@
                                             <!-- node_id = ss_9 -->
                                             <!-- col0 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                             <!--    'column_alias': 'ds__day'}                             -->
                                             <!-- col1 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                             <!--    'column_alias': 'ds__week'}                            -->
                                             <!-- col2 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                             <!--    'column_alias': 'ds__month'}                           -->
                                             <!-- col3 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                             <!--    'column_alias': 'ds__quarter'}                         -->
                                             <!-- col4 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                             <!--    'column_alias': 'ds__year'}                            -->
                                             <!-- col5 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
-                                            <!--    'column_alias': 'created_at__day'}                     -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                                            <!--    'column_alias': 'ds__extract_year'}                    -->
                                             <!-- col6 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
-                                            <!--    'column_alias': 'created_at__week'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                             <!-- col7 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                                            <!--    'column_alias': 'created_at__month'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                                            <!--    'column_alias': 'ds__extract_month'}                   -->
                                             <!-- col8 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                                            <!--    'column_alias': 'created_at__quarter'}                 -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                                            <!--    'column_alias': 'ds__extract_week'}                    -->
                                             <!-- col9 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
-                                            <!--    'column_alias': 'created_at__year'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                                            <!--    'column_alias': 'ds__extract_day'}                     -->
                                             <!-- col10 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
-                                            <!--    'column_alias': 'listing__ds__day'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                             <!-- col11 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
-                                            <!--    'column_alias': 'listing__ds__week'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                             <!-- col12 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
-                                            <!--    'column_alias': 'listing__ds__month'}                  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                                            <!--    'column_alias': 'created_at__day'}                     -->
                                             <!-- col13 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
-                                            <!--    'column_alias': 'listing__ds__quarter'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                                            <!--    'column_alias': 'created_at__week'}                    -->
                                             <!-- col14 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                                            <!--    'column_alias': 'listing__ds__year'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                            <!--    'column_alias': 'created_at__month'}                   -->
                                             <!-- col15 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                                            <!--    'column_alias': 'listing__created_at__day'}            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                            <!--    'column_alias': 'created_at__quarter'}                 -->
                                             <!-- col16 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                                            <!--    'column_alias': 'listing__created_at__week'}           -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                            <!--    'column_alias': 'created_at__year'}                    -->
                                             <!-- col17 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                                            <!--    'column_alias': 'listing__created_at__month'}          -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                            <!--    'column_alias': 'created_at__extract_year'}            -->
                                             <!-- col18 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                                            <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                            <!--    'column_alias': 'created_at__extract_quarter'}         -->
                                             <!-- col19 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                                            <!--    'column_alias': 'listing__created_at__year'}           -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                            <!--    'column_alias': 'created_at__extract_month'}           -->
                                             <!-- col20 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                                            <!--    'column_alias': 'metric_time__day'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                            <!--    'column_alias': 'created_at__extract_week'}            -->
                                             <!-- col21 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                                            <!--    'column_alias': 'metric_time__week'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                            <!--    'column_alias': 'created_at__extract_day'}             -->
                                             <!-- col22 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                                            <!--    'column_alias': 'metric_time__month'}                  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                            <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                                             <!-- col23 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                            <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                                             <!-- col24 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                                            <!--    'column_alias': 'metric_time__year'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                            <!--    'column_alias': 'listing__ds__day'}                    -->
                                             <!-- col25 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                                            <!--    'column_alias': 'listing'}                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                            <!--    'column_alias': 'listing__ds__week'}                   -->
                                             <!-- col26 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                                            <!--    'column_alias': 'user'}                                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                            <!--    'column_alias': 'listing__ds__month'}                  -->
                                             <!-- col27 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                                            <!--    'column_alias': 'listing__user'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                            <!--    'column_alias': 'listing__ds__quarter'}                -->
                                             <!-- col28 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                                            <!--    'column_alias': 'country_latest'}                      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                            <!--    'column_alias': 'listing__ds__year'}                   -->
                                             <!-- col29 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                                            <!--    'column_alias': 'is_lux_latest'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_year'}           -->
                                             <!-- col30 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                                            <!--    'column_alias': 'capacity_latest'}                     -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                                             <!-- col31 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                                            <!--    'column_alias': 'listing__country_latest'}             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_month'}          -->
                                             <!-- col32 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                                            <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_week'}           -->
                                             <!-- col33 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                                            <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_day'}            -->
                                             <!-- col34 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
-                                            <!--    'column_alias': 'listings'}                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                                             <!-- col35 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
-                                            <!--    'column_alias': 'largest_listing'}                     -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                                             <!-- col36 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                            <!--    'column_alias': 'listing__created_at__day'}            -->
+                                            <!-- col37 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                            <!--    'column_alias': 'listing__created_at__week'}           -->
+                                            <!-- col38 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                            <!--    'column_alias': 'listing__created_at__month'}          -->
+                                            <!-- col39 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                            <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                                            <!-- col40 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                            <!--    'column_alias': 'listing__created_at__year'}           -->
+                                            <!-- col41 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                            <!--    'column_alias': 'listing__created_at__extract_year'}   -->
+                                            <!-- col42 =                                                     -->
+                                            <!--   {'class': 'SqlSelectColumn',                              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),    -->
+                                            <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                            <!-- col43 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                            <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                            <!-- col44 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                            <!--    'column_alias': 'listing__created_at__extract_week'}   -->
+                                            <!-- col45 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                            <!--    'column_alias': 'listing__created_at__extract_day'}    -->
+                                            <!-- col46 =                                                       -->
+                                            <!--   {'class': 'SqlSelectColumn',                                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),      -->
+                                            <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                            <!-- col47 =                                                       -->
+                                            <!--   {'class': 'SqlSelectColumn',                                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),      -->
+                                            <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                            <!-- col48 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                            <!--    'column_alias': 'metric_time__day'}                    -->
+                                            <!-- col49 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                            <!--    'column_alias': 'metric_time__week'}                   -->
+                                            <!-- col50 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                            <!--    'column_alias': 'metric_time__month'}                  -->
+                                            <!-- col51 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                                            <!-- col52 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                            <!--    'column_alias': 'metric_time__year'}                   -->
+                                            <!-- col53 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                            <!--    'column_alias': 'listing'}                             -->
+                                            <!-- col54 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                            <!--    'column_alias': 'user'}                                -->
+                                            <!-- col55 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                            <!--    'column_alias': 'listing__user'}                       -->
+                                            <!-- col56 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                                            <!--    'column_alias': 'country_latest'}                      -->
+                                            <!-- col57 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                                            <!--    'column_alias': 'is_lux_latest'}                       -->
+                                            <!-- col58 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                                            <!--    'column_alias': 'capacity_latest'}                     -->
+                                            <!-- col59 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                                            <!--    'column_alias': 'listing__country_latest'}             -->
+                                            <!-- col60 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                                            <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                            <!-- col61 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                                            <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                            <!-- col62 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                                            <!--    'column_alias': 'listings'}                            -->
+                                            <!-- col63 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                                            <!--    'column_alias': 'largest_listing'}                     -->
+                                            <!-- col64 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                                             <!--    'column_alias': 'smallest_listing'}                    -->
                                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                             <!-- where = None -->
@@ -800,15 +1248,15 @@
                                                 <!--    'column_alias': 'listings'}                                 -->
                                                 <!-- col1 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                                                 <!--    'column_alias': 'largest_listing'}                       -->
                                                 <!-- col2 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                                                 <!--    'column_alias': 'smallest_listing'}                      -->
                                                 <!-- col3 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                                                 <!--    'column_alias': 'ds__day'}                               -->
                                                 <!-- col4 =                                                -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -826,101 +1274,213 @@
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                                                 <!--    'column_alias': 'ds__year'}                        -->
-                                                <!-- col8 =                                                      -->
+                                                <!-- col8 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                                <!-- col9 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                                <!-- col10 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                                <!-- col11 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                                <!-- col12 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                                <!-- col13 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                                <!-- col14 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                                <!-- col15 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                                                 <!--    'column_alias': 'created_at__day'}                       -->
-                                                <!-- col9 =                                                -->
+                                                <!-- col16 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                                                 <!--    'column_alias': 'created_at__week'}                -->
-                                                <!-- col10 =                                               -->
+                                                <!-- col17 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                                                 <!--    'column_alias': 'created_at__month'}               -->
-                                                <!-- col11 =                                               -->
+                                                <!-- col18 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                                                 <!--    'column_alias': 'created_at__quarter'}             -->
-                                                <!-- col12 =                                               -->
+                                                <!-- col19 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                                                 <!--    'column_alias': 'created_at__year'}                -->
-                                                <!-- col13 =                                                     -->
+                                                <!-- col20 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                                                <!--    'column_alias': 'created_at__extract_year'}      -->
+                                                <!-- col21 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                                                <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                                                <!-- col22 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                                                <!--    'column_alias': 'created_at__extract_month'}     -->
+                                                <!-- col23 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                                                <!--    'column_alias': 'created_at__extract_week'}      -->
+                                                <!-- col24 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                                                <!--    'column_alias': 'created_at__extract_day'}       -->
+                                                <!-- col25 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                                                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                                                <!-- col26 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                                                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                                <!-- col27 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                                                 <!--    'column_alias': 'country_latest'}                        -->
-                                                <!-- col14 =                                                     -->
+                                                <!-- col28 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                                                 <!--    'column_alias': 'is_lux_latest'}                         -->
-                                                <!-- col15 =                                                     -->
+                                                <!-- col29 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                                                 <!--    'column_alias': 'capacity_latest'}                       -->
-                                                <!-- col16 =                                                     -->
+                                                <!-- col30 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                                                 <!--    'column_alias': 'listing__ds__day'}                      -->
-                                                <!-- col17 =                                               -->
+                                                <!-- col31 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                                                 <!--    'column_alias': 'listing__ds__week'}               -->
-                                                <!-- col18 =                                               -->
+                                                <!-- col32 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                                                 <!--    'column_alias': 'listing__ds__month'}              -->
-                                                <!-- col19 =                                               -->
+                                                <!-- col33 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                                                 <!--    'column_alias': 'listing__ds__quarter'}            -->
-                                                <!-- col20 =                                               -->
+                                                <!-- col34 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                                                 <!--    'column_alias': 'listing__ds__year'}               -->
-                                                <!-- col21 =                                                     -->
+                                                <!-- col35 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                                                <!-- col36 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                                                <!-- col37 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                                                <!-- col38 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                                                <!-- col39 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                                                <!-- col40 =                                               -->
+                                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                                                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                                                <!-- col41 =                                               -->
+                                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                                                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                                <!-- col42 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                                                 <!--    'column_alias': 'listing__created_at__day'}              -->
-                                                <!-- col22 =                                               -->
+                                                <!-- col43 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                                                 <!--    'column_alias': 'listing__created_at__week'}       -->
-                                                <!-- col23 =                                               -->
+                                                <!-- col44 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                                                 <!--    'column_alias': 'listing__created_at__month'}      -->
-                                                <!-- col24 =                                               -->
+                                                <!-- col45 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                                                 <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                                                <!-- col25 =                                               -->
+                                                <!-- col46 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                                                 <!--    'column_alias': 'listing__created_at__year'}       -->
-                                                <!-- col26 =                                                     -->
+                                                <!-- col47 =                                                  -->
+                                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                                                <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                                                <!-- col48 =                                                     -->
+                                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                                                <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                                <!-- col49 =                                                   -->
+                                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                                                <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                                <!-- col50 =                                                  -->
+                                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                                                <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                                                <!-- col51 =                                                 -->
+                                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                                                <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                                                <!-- col52 =                                                       -->
+                                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                                                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                                <!-- col53 =                                                       -->
+                                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                                                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                                <!-- col54 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                                                 <!--    'column_alias': 'listing__country_latest'}               -->
-                                                <!-- col27 =                                                     -->
+                                                <!-- col55 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                                                 <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                                                <!-- col28 =                                                     -->
+                                                <!-- col56 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                                                 <!--    'column_alias': 'listing__capacity_latest'}              -->
-                                                <!-- col29 =                                                     -->
+                                                <!-- col57 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                                                 <!--    'column_alias': 'listing'}                               -->
-                                                <!-- col30 =                                                     -->
+                                                <!-- col58 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                                                 <!--    'column_alias': 'user'}                                  -->
-                                                <!-- col31 =                                                     -->
+                                                <!-- col59 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                                                 <!--    'column_alias': 'listing__user'}                         -->
                                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                                 <!-- where = None -->
@@ -943,11 +1503,11 @@
                 <!-- node_id = ss_26 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_25) -->
                 <!-- where = None -->
@@ -956,7 +1516,7 @@
                     <!-- node_id = ss_25 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -965,7 +1525,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_24) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -975,11 +1535,11 @@
                         <!-- node_id = ss_24 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_23) -->
                         <!-- where = None -->
@@ -988,15 +1548,15 @@
                             <!-- node_id = ss_23 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
                             <!--    'column_alias': 'listing__is_lux_latest'}              -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_22) -->
                             <!-- where =                                                               -->
@@ -1008,15 +1568,15 @@
                                 <!-- node_id = ss_22 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
                                 <!--    'column_alias': 'listing__is_lux_latest'}              -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_21) -->
                                 <!-- where = None -->
@@ -1025,19 +1585,19 @@
                                     <!-- node_id = ss_21 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
                                     <!--    'column_alias': 'listing'}                             -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
                                     <!--    'column_alias': 'listing__is_lux_latest'}              -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
                                     <!--    'column_alias': 'bookings'}                            -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_18) -->
                                     <!-- join_0 =                                                    -->
@@ -1054,15 +1614,15 @@
                                         <!-- node_id = ss_18 -->
                                         <!-- col0 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
                                         <!--    'column_alias': 'metric_time__day'}                    -->
                                         <!-- col1 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_412),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
                                         <!--    'column_alias': 'listing'}                             -->
                                         <!-- col2 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_410),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
                                         <!--    'column_alias': 'bookings'}                            -->
                                         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                                         <!-- where = None -->
@@ -1071,227 +1631,395 @@
                                             <!-- node_id = ss_17 -->
                                             <!-- col0 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_369),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                                             <!--    'column_alias': 'ds__day'}                             -->
                                             <!-- col1 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                             <!--    'column_alias': 'ds__week'}                            -->
                                             <!-- col2 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                                             <!--    'column_alias': 'ds__month'}                           -->
                                             <!-- col3 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_372),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                                             <!--    'column_alias': 'ds__quarter'}                         -->
                                             <!-- col4 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_373),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                                             <!--    'column_alias': 'ds__year'}                            -->
                                             <!-- col5 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
-                                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                                            <!--    'column_alias': 'ds__extract_year'}                    -->
                                             <!-- col6 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_375),  -->
-                                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                             <!-- col7 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_376),  -->
-                                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                                            <!--    'column_alias': 'ds__extract_month'}                   -->
                                             <!-- col8 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_377),  -->
-                                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                                            <!--    'column_alias': 'ds__extract_week'}                    -->
                                             <!-- col9 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_378),  -->
-                                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                                            <!--    'column_alias': 'ds__extract_day'}                     -->
                                             <!-- col10 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_379),  -->
-                                            <!--    'column_alias': 'paid_at__day'}                        -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                             <!-- col11 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),  -->
-                                            <!--    'column_alias': 'paid_at__week'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                             <!-- col12 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),  -->
-                                            <!--    'column_alias': 'paid_at__month'}                      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                             <!-- col13 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
-                                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                                             <!-- col14 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
-                                            <!--    'column_alias': 'paid_at__year'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
+                                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                                             <!-- col15 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
-                                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
+                                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                             <!-- col16 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
-                                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
+                                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                                             <!-- col17 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
-                                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                             <!-- col18 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),  -->
-                                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                             <!-- col19 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),  -->
-                                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                             <!-- col20 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),  -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                             <!-- col21 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),  -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                             <!-- col22 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),  -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                             <!-- col23 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),  -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                             <!-- col24 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),  -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                                            <!--    'column_alias': 'paid_at__day'}                        -->
                                             <!-- col25 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
-                                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                                            <!--    'column_alias': 'paid_at__week'}                       -->
                                             <!-- col26 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
-                                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                                            <!--    'column_alias': 'paid_at__month'}                      -->
                                             <!-- col27 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
-                                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                                             <!-- col28 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
-                                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                                            <!--    'column_alias': 'paid_at__year'}                       -->
                                             <!-- col29 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
-                                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                                             <!-- col30 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),  -->
-                                            <!--    'column_alias': 'metric_time__day'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                             <!-- col31 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),  -->
-                                            <!--    'column_alias': 'metric_time__week'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                                             <!-- col32 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),  -->
-                                            <!--    'column_alias': 'metric_time__month'}                  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                                             <!-- col33 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),  -->
-                                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                                             <!-- col34 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),  -->
-                                            <!--    'column_alias': 'metric_time__year'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                             <!-- col35 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),  -->
-                                            <!--    'column_alias': 'listing'}                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                             <!-- col36 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),  -->
-                                            <!--    'column_alias': 'guest'}                               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                                            <!--    'column_alias': 'booking__ds__day'}                    -->
                                             <!-- col37 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
-                                            <!--    'column_alias': 'host'}                                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                                            <!--    'column_alias': 'booking__ds__week'}                   -->
                                             <!-- col38 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_407),  -->
-                                            <!--    'column_alias': 'booking__listing'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                                            <!--    'column_alias': 'booking__ds__month'}                  -->
                                             <!-- col39 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_408),  -->
-                                            <!--    'column_alias': 'booking__guest'}                      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                                             <!-- col40 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),  -->
-                                            <!--    'column_alias': 'booking__host'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                                            <!--    'column_alias': 'booking__ds__year'}                   -->
                                             <!-- col41 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_367),  -->
-                                            <!--    'column_alias': 'is_instant'}                          -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                             <!-- col42 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),  -->
-                                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                             <!-- col43 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
-                                            <!--    'column_alias': 'bookings'}                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                             <!-- col44 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
-                                            <!--    'column_alias': 'instant_bookings'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                             <!-- col45 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
-                                            <!--    'column_alias': 'booking_value'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                             <!-- col46 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_357),  -->
-                                            <!--    'column_alias': 'max_booking_value'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                             <!-- col47 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_358),  -->
-                                            <!--    'column_alias': 'min_booking_value'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                             <!-- col48 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
-                                            <!--    'column_alias': 'bookers'}                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                             <!-- col49 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
-                                            <!--    'column_alias': 'average_booking_value'}               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                             <!-- col50 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
-                                            <!--    'column_alias': 'referred_bookings'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                             <!-- col51 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_362),  -->
-                                            <!--    'column_alias': 'median_booking_value'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                             <!-- col52 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_363),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                            <!-- col53 =                                                      -->
+                                            <!--   {'class': 'SqlSelectColumn',                               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),     -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                            <!-- col54 =                                                         -->
+                                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),        -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                            <!-- col55 =                                                       -->
+                                            <!--   {'class': 'SqlSelectColumn',                                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),      -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                            <!-- col56 =                                                      -->
+                                            <!--   {'class': 'SqlSelectColumn',                               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),     -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                            <!-- col57 =                                                     -->
+                                            <!--   {'class': 'SqlSelectColumn',                              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),    -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                            <!-- col58 =                                                           -->
+                                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),          -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                            <!-- col59 =                                                           -->
+                                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),          -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                            <!-- col60 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                            <!-- col61 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                            <!-- col62 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                            <!-- col63 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                            <!-- col64 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                            <!-- col65 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                            <!-- col66 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                            <!-- col67 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                            <!-- col68 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                            <!-- col69 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                            <!-- col70 =                                                    -->
+                                            <!--   {'class': 'SqlSelectColumn',                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),   -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                            <!-- col71 =                                                    -->
+                                            <!--   {'class': 'SqlSelectColumn',                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),   -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                            <!-- col72 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
+                                            <!--    'column_alias': 'metric_time__day'}                    -->
+                                            <!-- col73 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
+                                            <!--    'column_alias': 'metric_time__week'}                   -->
+                                            <!-- col74 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
+                                            <!--    'column_alias': 'metric_time__month'}                  -->
+                                            <!-- col75 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
+                                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                                            <!-- col76 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
+                                            <!--    'column_alias': 'metric_time__year'}                   -->
+                                            <!-- col77 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
+                                            <!--    'column_alias': 'listing'}                             -->
+                                            <!-- col78 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
+                                            <!--    'column_alias': 'guest'}                               -->
+                                            <!-- col79 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                                            <!--    'column_alias': 'host'}                                -->
+                                            <!-- col80 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                                            <!--    'column_alias': 'booking__listing'}                    -->
+                                            <!-- col81 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                                            <!--    'column_alias': 'booking__guest'}                      -->
+                                            <!-- col82 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                                            <!--    'column_alias': 'booking__host'}                       -->
+                                            <!-- col83 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                                            <!--    'column_alias': 'is_instant'}                          -->
+                                            <!-- col84 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                                            <!-- col85 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                                            <!--    'column_alias': 'bookings'}                            -->
+                                            <!-- col86 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                                            <!--    'column_alias': 'instant_bookings'}                    -->
+                                            <!-- col87 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                                            <!--    'column_alias': 'booking_value'}                       -->
+                                            <!-- col88 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                                            <!--    'column_alias': 'max_booking_value'}                   -->
+                                            <!-- col89 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                                            <!--    'column_alias': 'min_booking_value'}                   -->
+                                            <!-- col90 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                            <!--    'column_alias': 'bookers'}                             -->
+                                            <!-- col91 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                            <!--    'column_alias': 'average_booking_value'}               -->
+                                            <!-- col92 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                            <!--    'column_alias': 'referred_bookings'}                   -->
+                                            <!-- col93 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                            <!--    'column_alias': 'median_booking_value'}                -->
+                                            <!-- col94 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                                            <!-- col53 =                                                   -->
+                                            <!-- col95 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                            <!-- col54 =                                                         -->
+                                            <!-- col96 =                                                         -->
                                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),        -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),        -->
                                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                            <!-- col55 =                                                       -->
+                                            <!-- col97 =                                                       -->
                                             <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),      -->
                                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                             <!-- where = None -->
@@ -1308,27 +2036,27 @@
                                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                                 <!-- col2 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                                 <!--    'column_alias': 'booking_value'}                         -->
                                                 <!-- col3 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                                 <!-- col4 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                                 <!-- col5 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                                 <!--    'column_alias': 'bookers'}                               -->
                                                 <!-- col6 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                                 <!-- col7 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                                 <!--    'column_alias': 'booking_payments'}                      -->
                                                 <!-- col8 =                                                                                                           -->
                                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -1336,31 +2064,31 @@
                                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                                 <!-- col9 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                                 <!-- col10 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                                 <!-- col11 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                                 <!-- col12 =                                                         -->
                                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                                 <!-- col13 =                                                       -->
                                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                                 <!-- col14 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                                 <!--    'column_alias': 'is_instant'}                            -->
                                                 <!-- col15 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                                 <!--    'column_alias': 'ds__day'}                               -->
                                                 <!-- col16 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -1378,133 +2106,301 @@
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                                 <!--    'column_alias': 'ds__year'}                        -->
-                                                <!-- col20 =                                                     -->
+                                                <!-- col20 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                                <!-- col21 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                                <!-- col22 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                                <!-- col23 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                                <!-- col24 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                                <!-- col25 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                                <!-- col26 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                                <!-- col27 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                                <!-- col21 =                                               -->
+                                                <!-- col28 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                                <!-- col22 =                                               -->
+                                                <!-- col29 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                                <!-- col23 =                                               -->
+                                                <!-- col30 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                                <!-- col24 =                                               -->
+                                                <!-- col31 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                                <!-- col25 =                                                     -->
+                                                <!-- col32 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                                <!-- col33 =                                                -->
+                                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                                <!-- col34 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                                <!-- col35 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                                <!-- col36 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                                <!-- col37 =                                                  -->
+                                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                                <!-- col38 =                                                  -->
+                                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                                <!-- col39 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                                <!-- col26 =                                               -->
+                                                <!-- col40 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                                <!-- col27 =                                               -->
+                                                <!-- col41 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                                <!-- col28 =                                               -->
+                                                <!-- col42 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                                <!-- col29 =                                               -->
+                                                <!-- col43 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                                <!-- col30 =                                                     -->
+                                                <!-- col44 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                                <!-- col45 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                                <!-- col46 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                                <!-- col47 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                                <!-- col48 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                                <!-- col49 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                                <!-- col50 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                                <!-- col51 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                                <!-- col31 =                                                     -->
+                                                <!-- col52 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                                <!-- col32 =                                               -->
+                                                <!-- col53 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                                <!-- col33 =                                               -->
+                                                <!-- col54 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                                <!-- col34 =                                               -->
+                                                <!-- col55 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                                <!-- col35 =                                               -->
+                                                <!-- col56 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                                <!-- col36 =                                                     -->
-                                                <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                                <!-- col57 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                                <!-- col58 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                                <!-- col59 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                                <!-- col60 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                                <!-- col61 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                                <!-- col62 =                                               -->
+                                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                                <!-- col63 =                                               -->
+                                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                                <!-- col64 =                                                     -->
+                                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                                <!-- col37 =                                               -->
+                                                <!-- col65 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                                <!-- col38 =                                               -->
+                                                <!-- col66 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                                <!-- col39 =                                                 -->
+                                                <!-- col67 =                                                 -->
                                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                                <!-- col40 =                                               -->
+                                                <!-- col68 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                                <!-- col41 =                                                     -->
-                                                <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                                <!-- col69 =                                                      -->
+                                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                                <!-- col70 =                                                         -->
+                                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                                <!-- col71 =                                                       -->
+                                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                                <!-- col72 =                                                      -->
+                                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                                <!-- col73 =                                                     -->
+                                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                                <!-- col74 =                                                           -->
+                                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                                <!-- col75 =                                                           -->
+                                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                                <!-- col76 =                                                     -->
+                                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                                <!-- col42 =                                               -->
+                                                <!-- col77 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                                <!-- col43 =                                               -->
+                                                <!-- col78 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                                <!-- col44 =                                               -->
+                                                <!-- col79 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                                <!-- col45 =                                               -->
+                                                <!-- col80 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                                <!-- col46 =                                                     -->
+                                                <!-- col81 =                                               -->
+                                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                                <!-- col82 =                                                  -->
+                                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                                <!-- col83 =                                                -->
+                                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                                <!-- col84 =                                               -->
+                                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                                <!-- col85 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                                <!-- col86 =                                                    -->
+                                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                                <!-- col87 =                                                    -->
+                                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                                <!-- col88 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                                 <!--    'column_alias': 'listing'}                               -->
-                                                <!-- col47 =                                                     -->
+                                                <!-- col89 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                                 <!--    'column_alias': 'guest'}                                 -->
-                                                <!-- col48 =                                                     -->
+                                                <!-- col90 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                                 <!--    'column_alias': 'host'}                                  -->
-                                                <!-- col49 =                                                     -->
+                                                <!-- col91 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                                <!-- col50 =                                                     -->
+                                                <!-- col92 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                                <!-- col51 =                                                     -->
+                                                <!-- col93 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                                 <!--    'column_alias': 'booking__host'}                         -->
                                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                                 <!-- where = None -->
@@ -1523,11 +2419,11 @@
                                         <!-- node_id = ss_20 -->
                                         <!-- col0 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
                                         <!--    'column_alias': 'listing'}                             -->
                                         <!-- col1 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
                                         <!--    'column_alias': 'is_lux_latest'}                       -->
                                         <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
                                         <!-- where = None -->
@@ -1536,151 +2432,263 @@
                                             <!-- node_id = ss_19 -->
                                             <!-- col0 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_422),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
                                             <!--    'column_alias': 'ds__day'}                             -->
                                             <!-- col1 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_423),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
                                             <!--    'column_alias': 'ds__week'}                            -->
                                             <!-- col2 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_424),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                                             <!--    'column_alias': 'ds__month'}                           -->
                                             <!-- col3 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_425),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                                             <!--    'column_alias': 'ds__quarter'}                         -->
                                             <!-- col4 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_426),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                                             <!--    'column_alias': 'ds__year'}                            -->
                                             <!-- col5 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_427),  -->
-                                            <!--    'column_alias': 'created_at__day'}                     -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
+                                            <!--    'column_alias': 'ds__extract_year'}                    -->
                                             <!-- col6 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_428),  -->
-                                            <!--    'column_alias': 'created_at__week'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                             <!-- col7 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_429),  -->
-                                            <!--    'column_alias': 'created_at__month'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                                            <!--    'column_alias': 'ds__extract_month'}                   -->
                                             <!-- col8 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_430),  -->
-                                            <!--    'column_alias': 'created_at__quarter'}                 -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                                            <!--    'column_alias': 'ds__extract_week'}                    -->
                                             <!-- col9 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_431),  -->
-                                            <!--    'column_alias': 'created_at__year'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
+                                            <!--    'column_alias': 'ds__extract_day'}                     -->
                                             <!-- col10 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_432),  -->
-                                            <!--    'column_alias': 'listing__ds__day'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
+                                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                             <!-- col11 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_433),  -->
-                                            <!--    'column_alias': 'listing__ds__week'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
+                                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                             <!-- col12 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                                            <!--    'column_alias': 'listing__ds__month'}                  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
+                                            <!--    'column_alias': 'created_at__day'}                     -->
                                             <!-- col13 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                                            <!--    'column_alias': 'listing__ds__quarter'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
+                                            <!--    'column_alias': 'created_at__week'}                    -->
                                             <!-- col14 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                                            <!--    'column_alias': 'listing__ds__year'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
+                                            <!--    'column_alias': 'created_at__month'}                   -->
                                             <!-- col15 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                                            <!--    'column_alias': 'listing__created_at__day'}            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
+                                            <!--    'column_alias': 'created_at__quarter'}                 -->
                                             <!-- col16 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                                            <!--    'column_alias': 'listing__created_at__week'}           -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
+                                            <!--    'column_alias': 'created_at__year'}                    -->
                                             <!-- col17 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
+                                            <!--    'column_alias': 'created_at__extract_year'}            -->
+                                            <!-- col18 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
+                                            <!--    'column_alias': 'created_at__extract_quarter'}         -->
+                                            <!-- col19 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
+                                            <!--    'column_alias': 'created_at__extract_month'}           -->
+                                            <!-- col20 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
+                                            <!--    'column_alias': 'created_at__extract_week'}            -->
+                                            <!-- col21 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
+                                            <!--    'column_alias': 'created_at__extract_day'}             -->
+                                            <!-- col22 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
+                                            <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
+                                            <!-- col23 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
+                                            <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
+                                            <!-- col24 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
+                                            <!--    'column_alias': 'listing__ds__day'}                    -->
+                                            <!-- col25 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
+                                            <!--    'column_alias': 'listing__ds__week'}                   -->
+                                            <!-- col26 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
+                                            <!--    'column_alias': 'listing__ds__month'}                  -->
+                                            <!-- col27 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
+                                            <!--    'column_alias': 'listing__ds__quarter'}                -->
+                                            <!-- col28 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
+                                            <!--    'column_alias': 'listing__ds__year'}                   -->
+                                            <!-- col29 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_year'}           -->
+                                            <!-- col30 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
+                                            <!-- col31 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_month'}          -->
+                                            <!-- col32 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_week'}           -->
+                                            <!-- col33 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_day'}            -->
+                                            <!-- col34 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
+                                            <!-- col35 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
+                                            <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
+                                            <!-- col36 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
+                                            <!--    'column_alias': 'listing__created_at__day'}            -->
+                                            <!-- col37 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
+                                            <!--    'column_alias': 'listing__created_at__week'}           -->
+                                            <!-- col38 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
                                             <!--    'column_alias': 'listing__created_at__month'}          -->
-                                            <!-- col18 =                                                   -->
+                                            <!-- col39 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
                                             <!--    'column_alias': 'listing__created_at__quarter'}        -->
-                                            <!-- col19 =                                                   -->
+                                            <!-- col40 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
                                             <!--    'column_alias': 'listing__created_at__year'}           -->
-                                            <!-- col20 =                                                   -->
+                                            <!-- col41 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
+                                            <!--    'column_alias': 'listing__created_at__extract_year'}   -->
+                                            <!-- col42 =                                                     -->
+                                            <!--   {'class': 'SqlSelectColumn',                              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),    -->
+                                            <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                            <!-- col43 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
+                                            <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                            <!-- col44 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
+                                            <!--    'column_alias': 'listing__created_at__extract_week'}   -->
+                                            <!-- col45 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
+                                            <!--    'column_alias': 'listing__created_at__extract_day'}    -->
+                                            <!-- col46 =                                                       -->
+                                            <!--   {'class': 'SqlSelectColumn',                                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),      -->
+                                            <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                            <!-- col47 =                                                       -->
+                                            <!--   {'class': 'SqlSelectColumn',                                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),      -->
+                                            <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                            <!-- col48 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                                             <!--    'column_alias': 'metric_time__day'}                    -->
-                                            <!-- col21 =                                                   -->
+                                            <!-- col49 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                                             <!--    'column_alias': 'metric_time__week'}                   -->
-                                            <!-- col22 =                                                   -->
+                                            <!-- col50 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
                                             <!--    'column_alias': 'metric_time__month'}                  -->
-                                            <!-- col23 =                                                   -->
+                                            <!-- col51 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
                                             <!--    'column_alias': 'metric_time__quarter'}                -->
-                                            <!-- col24 =                                                   -->
+                                            <!-- col52 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
                                             <!--    'column_alias': 'metric_time__year'}                   -->
-                                            <!-- col25 =                                                   -->
+                                            <!-- col53 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
                                             <!--    'column_alias': 'listing'}                             -->
-                                            <!-- col26 =                                                   -->
+                                            <!-- col54 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
                                             <!--    'column_alias': 'user'}                                -->
-                                            <!-- col27 =                                                   -->
+                                            <!-- col55 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
                                             <!--    'column_alias': 'listing__user'}                       -->
-                                            <!-- col28 =                                                   -->
+                                            <!-- col56 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_416),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
                                             <!--    'column_alias': 'country_latest'}                      -->
-                                            <!-- col29 =                                                   -->
+                                            <!-- col57 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_417),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
                                             <!--    'column_alias': 'is_lux_latest'}                       -->
-                                            <!-- col30 =                                                   -->
+                                            <!-- col58 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_418),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
                                             <!--    'column_alias': 'capacity_latest'}                     -->
-                                            <!-- col31 =                                                   -->
+                                            <!-- col59 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_419),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
                                             <!--    'column_alias': 'listing__country_latest'}             -->
-                                            <!-- col32 =                                                   -->
+                                            <!-- col60 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_420),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
                                             <!--    'column_alias': 'listing__is_lux_latest'}              -->
-                                            <!-- col33 =                                                   -->
+                                            <!-- col61 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_421),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
                                             <!--    'column_alias': 'listing__capacity_latest'}            -->
-                                            <!-- col34 =                                                   -->
+                                            <!-- col62 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_413),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
                                             <!--    'column_alias': 'listings'}                            -->
-                                            <!-- col35 =                                                   -->
+                                            <!-- col63 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
                                             <!--    'column_alias': 'largest_listing'}                     -->
-                                            <!-- col36 =                                                   -->
+                                            <!-- col64 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
                                             <!--    'column_alias': 'smallest_listing'}                    -->
                                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                             <!-- where = None -->
@@ -1693,15 +2701,15 @@
                                                 <!--    'column_alias': 'listings'}                                 -->
                                                 <!-- col1 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                                                 <!--    'column_alias': 'largest_listing'}                       -->
                                                 <!-- col2 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                                                 <!--    'column_alias': 'smallest_listing'}                      -->
                                                 <!-- col3 =                                                      -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                                                 <!--    'column_alias': 'ds__day'}                               -->
                                                 <!-- col4 =                                                -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -1719,101 +2727,213 @@
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                                                 <!--    'column_alias': 'ds__year'}                        -->
-                                                <!-- col8 =                                                      -->
+                                                <!-- col8 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                                <!-- col9 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                                <!-- col10 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                                <!-- col11 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                                <!-- col12 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                                <!-- col13 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                                <!-- col14 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                                <!-- col15 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                                                 <!--    'column_alias': 'created_at__day'}                       -->
-                                                <!-- col9 =                                                -->
+                                                <!-- col16 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                                                 <!--    'column_alias': 'created_at__week'}                -->
-                                                <!-- col10 =                                               -->
+                                                <!-- col17 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                                                 <!--    'column_alias': 'created_at__month'}               -->
-                                                <!-- col11 =                                               -->
+                                                <!-- col18 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                                                 <!--    'column_alias': 'created_at__quarter'}             -->
-                                                <!-- col12 =                                               -->
+                                                <!-- col19 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                                                 <!--    'column_alias': 'created_at__year'}                -->
-                                                <!-- col13 =                                                     -->
+                                                <!-- col20 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                                                <!--    'column_alias': 'created_at__extract_year'}      -->
+                                                <!-- col21 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                                                <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                                                <!-- col22 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                                                <!--    'column_alias': 'created_at__extract_month'}     -->
+                                                <!-- col23 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                                                <!--    'column_alias': 'created_at__extract_week'}      -->
+                                                <!-- col24 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                                                <!--    'column_alias': 'created_at__extract_day'}       -->
+                                                <!-- col25 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                                                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                                                <!-- col26 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                                                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                                <!-- col27 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                                                 <!--    'column_alias': 'country_latest'}                        -->
-                                                <!-- col14 =                                                     -->
+                                                <!-- col28 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                                                 <!--    'column_alias': 'is_lux_latest'}                         -->
-                                                <!-- col15 =                                                     -->
+                                                <!-- col29 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                                                 <!--    'column_alias': 'capacity_latest'}                       -->
-                                                <!-- col16 =                                                     -->
+                                                <!-- col30 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                                                 <!--    'column_alias': 'listing__ds__day'}                      -->
-                                                <!-- col17 =                                               -->
+                                                <!-- col31 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                                                 <!--    'column_alias': 'listing__ds__week'}               -->
-                                                <!-- col18 =                                               -->
+                                                <!-- col32 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                                                 <!--    'column_alias': 'listing__ds__month'}              -->
-                                                <!-- col19 =                                               -->
+                                                <!-- col33 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                                                 <!--    'column_alias': 'listing__ds__quarter'}            -->
-                                                <!-- col20 =                                               -->
+                                                <!-- col34 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                                                 <!--    'column_alias': 'listing__ds__year'}               -->
-                                                <!-- col21 =                                                     -->
+                                                <!-- col35 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                                                <!-- col36 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                                                <!-- col37 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                                                <!-- col38 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                                                <!-- col39 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                                                <!-- col40 =                                               -->
+                                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                                                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                                                <!-- col41 =                                               -->
+                                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                                                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                                <!-- col42 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                                                 <!--    'column_alias': 'listing__created_at__day'}              -->
-                                                <!-- col22 =                                               -->
+                                                <!-- col43 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                                                 <!--    'column_alias': 'listing__created_at__week'}       -->
-                                                <!-- col23 =                                               -->
+                                                <!-- col44 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                                                 <!--    'column_alias': 'listing__created_at__month'}      -->
-                                                <!-- col24 =                                               -->
+                                                <!-- col45 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                                                 <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                                                <!-- col25 =                                               -->
+                                                <!-- col46 =                                               -->
                                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                                                 <!--    'column_alias': 'listing__created_at__year'}       -->
-                                                <!-- col26 =                                                     -->
+                                                <!-- col47 =                                                  -->
+                                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                                                <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                                                <!-- col48 =                                                     -->
+                                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                                                <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                                <!-- col49 =                                                   -->
+                                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                                                <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                                <!-- col50 =                                                  -->
+                                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                                                <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                                                <!-- col51 =                                                 -->
+                                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                                                <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                                                <!-- col52 =                                                       -->
+                                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                                                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                                <!-- col53 =                                                       -->
+                                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                                                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                                <!-- col54 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                                                 <!--    'column_alias': 'listing__country_latest'}               -->
-                                                <!-- col27 =                                                     -->
+                                                <!-- col55 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                                                 <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                                                <!-- col28 =                                                     -->
+                                                <!-- col56 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                                                 <!--    'column_alias': 'listing__capacity_latest'}              -->
-                                                <!-- col29 =                                                     -->
+                                                <!-- col57 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                                                 <!--    'column_alias': 'listing'}                               -->
-                                                <!-- col30 =                                                     -->
+                                                <!-- col58 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                                                 <!--    'column_alias': 'user'}                                  -->
-                                                <!-- col31 =                                                     -->
+                                                <!-- col59 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                                                 <!--    'column_alias': 'listing__user'}                         -->
                                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                                 <!-- where = None -->
@@ -1836,11 +2956,11 @@
                 <!-- node_id = ss_30 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_908),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_909),  -->
                 <!--    'column_alias': 'booking_value'}                       -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_29) -->
                 <!-- where = None -->
@@ -1849,7 +2969,7 @@
                     <!-- node_id = ss_29 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_907),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -1858,7 +2978,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_28) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_907),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -1868,11 +2988,11 @@
                         <!-- node_id = ss_28 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_905),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_904),  -->
                         <!--    'column_alias': 'booking_value'}                       -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_27) -->
                         <!-- where = None -->
@@ -1881,227 +3001,395 @@
                             <!-- node_id = ss_27 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_845),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_853),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_857),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_858),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_859),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_864),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_865),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_866),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_868),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_869),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_870),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_875),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_876),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_877),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_878),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_879),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_881),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_882),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_887),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_888),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_889),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_890),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_891),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_892),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_893),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_894),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_895),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_898),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_899),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_900),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_901),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_902),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_903),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col53 =                                                   -->
+                            <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -2118,27 +3406,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col8 =                                                                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -2146,31 +3434,31 @@
                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                 <!-- col9 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                 <!-- col12 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                 <!-- col13 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -2188,133 +3476,301 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col20 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col21 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col22 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col23 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col24 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col25 =                                                     -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col38 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col26 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col27 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col28 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col29 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col30 =                                                     -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col31 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col32 =                                               -->
+                                <!-- col53 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col33 =                                               -->
+                                <!-- col54 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col34 =                                               -->
+                                <!-- col55 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col35 =                                               -->
+                                <!-- col56 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col36 =                                                     -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col63 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col37 =                                               -->
+                                <!-- col65 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col38 =                                               -->
+                                <!-- col66 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col39 =                                                 -->
+                                <!-- col67 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col40 =                                               -->
+                                <!-- col68 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col41 =                                                     -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col75 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col76 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col42 =                                               -->
+                                <!-- col77 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col43 =                                               -->
+                                <!-- col78 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col44 =                                               -->
+                                <!-- col79 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col45 =                                               -->
+                                <!-- col80 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col46 =                                                     -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col87 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col47 =                                                     -->
+                                <!-- col89 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col48 =                                                     -->
+                                <!-- col90 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col49 =                                                     -->
+                                <!-- col91 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col50 =                                                     -->
+                                <!-- col92 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col51 =                                                     -->
+                                <!-- col93 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml
index 7ac1680f62..44372c125e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_18 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                          -->
             <!--   {'class': 'SqlSelectColumn',                                  -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),        -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),        -->
             <!--    'column_alias': 'booking_value_with_is_instant_constraint'}  -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
             <!--    'column_alias': 'booking_value'}                       -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_12 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                          -->
                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),        -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),        -->
                 <!--    'column_alias': 'booking_value_with_is_instant_constraint'}  -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_11 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_10 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                         <!--    'column_alias': 'booking_value'}                       -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                         <!-- where = None -->
@@ -85,15 +85,15 @@
                             <!-- node_id = ss_9 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                             <!--    'column_alias': 'booking_value'}                       -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- where =                                                            -->
@@ -105,15 +105,15 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                 -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                 <!--    'column_alias': 'booking_value'}                       -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
@@ -122,227 +122,395 @@
                                     <!-- node_id = ss_7 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                                    <!--    'column_alias': 'paid_at__day'}                        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                                    <!--    'column_alias': 'paid_at__week'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                                    <!--    'column_alias': 'paid_at__month'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                                    <!--    'column_alias': 'paid_at__year'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                                    <!--    'column_alias': 'booking__ds__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                                    <!--    'column_alias': 'booking__ds__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                                    <!--    'column_alias': 'booking__ds__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                                    <!--    'column_alias': 'booking__ds__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                    <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                    <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                    <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                    <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!-- col53 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col54 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col55 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col56 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col57 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col58 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col59 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col60 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!-- col61 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!-- col62 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!-- col63 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!-- col64 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!-- col65 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                    <!-- col66 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                    <!-- col67 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                    <!-- col68 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                    <!-- col69 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                    <!-- col70 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col71 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col72 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!-- col73 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!-- col74 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!-- col75 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!-- col76 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!-- col77 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!-- col78 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!-- col79 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                                    <!--    'column_alias': 'host'}                                -->
+                                    <!-- col80 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!-- col81 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!-- col82 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!-- col83 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!-- col84 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!-- col85 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!-- col86 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!-- col87 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!-- col88 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!-- col89 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!-- col90 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col91 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!-- col92 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!-- col93 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!-- col94 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                   -->
-                                    <!-- col53 =                                                   -->
+                                    <!-- col95 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                    <!-- col54 =                                                         -->
+                                    <!-- col96 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                    <!-- col55 =                                                       -->
+                                    <!-- col97 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
@@ -359,27 +527,27 @@
                                         <!--    'column_alias': 'instant_bookings'}                                                              -->
                                         <!-- col2 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                         <!--    'column_alias': 'booking_value'}                         -->
                                         <!-- col3 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                         <!--    'column_alias': 'max_booking_value'}                     -->
                                         <!-- col4 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                         <!--    'column_alias': 'min_booking_value'}                     -->
                                         <!-- col5 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                         <!--    'column_alias': 'bookers'}                               -->
                                         <!-- col6 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                         <!--    'column_alias': 'average_booking_value'}                 -->
                                         <!-- col7 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                         <!--    'column_alias': 'booking_payments'}                      -->
                                         <!-- col8 =                                                                                                           -->
                                         <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -387,31 +555,31 @@
                                         <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                         <!-- col9 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                         <!--    'column_alias': 'median_booking_value'}                  -->
                                         <!-- col10 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                         <!--    'column_alias': 'booking_value_p99'}                     -->
                                         <!-- col11 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                         <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                         <!-- col12 =                                                         -->
                                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                         <!-- col13 =                                                       -->
                                         <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                         <!-- col14 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                         <!--    'column_alias': 'is_instant'}                            -->
                                         <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                         <!--    'column_alias': 'ds__day'}                               -->
                                         <!-- col16 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -429,133 +597,301 @@
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                         <!--    'column_alias': 'ds__year'}                        -->
-                                        <!-- col20 =                                                     -->
+                                        <!-- col20 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                        <!--    'column_alias': 'ds__extract_year'}              -->
+                                        <!-- col21 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                        <!-- col22 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                        <!--    'column_alias': 'ds__extract_month'}             -->
+                                        <!-- col23 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                        <!--    'column_alias': 'ds__extract_week'}              -->
+                                        <!-- col24 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                        <!--    'column_alias': 'ds__extract_day'}               -->
+                                        <!-- col25 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!-- col26 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                         <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                        <!-- col21 =                                               -->
+                                        <!-- col28 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                         <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                        <!-- col22 =                                               -->
+                                        <!-- col29 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                         <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                        <!-- col23 =                                               -->
+                                        <!-- col30 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                        <!-- col24 =                                               -->
+                                        <!-- col31 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                         <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                        <!-- col25 =                                                     -->
+                                        <!-- col32 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                        <!-- col33 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                        <!-- col34 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                        <!-- col35 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                        <!-- col36 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                        <!-- col37 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col38 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col39 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                         <!--    'column_alias': 'paid_at__day'}                          -->
-                                        <!-- col26 =                                               -->
+                                        <!-- col40 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                         <!--    'column_alias': 'paid_at__week'}                   -->
-                                        <!-- col27 =                                               -->
+                                        <!-- col41 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                         <!--    'column_alias': 'paid_at__month'}                  -->
-                                        <!-- col28 =                                               -->
+                                        <!-- col42 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                         <!--    'column_alias': 'paid_at__quarter'}                -->
-                                        <!-- col29 =                                               -->
+                                        <!-- col43 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                         <!--    'column_alias': 'paid_at__year'}                   -->
-                                        <!-- col30 =                                                     -->
+                                        <!-- col44 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                        <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                        <!-- col45 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                        <!-- col46 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                        <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                        <!-- col47 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                        <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                        <!-- col48 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                        <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                        <!-- col49 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!-- col50 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!-- col51 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                         <!--    'column_alias': 'booking__is_instant'}                   -->
-                                        <!-- col31 =                                                     -->
+                                        <!-- col52 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                         <!--    'column_alias': 'booking__ds__day'}                      -->
-                                        <!-- col32 =                                               -->
+                                        <!-- col53 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                         <!--    'column_alias': 'booking__ds__week'}               -->
-                                        <!-- col33 =                                               -->
+                                        <!-- col54 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                         <!--    'column_alias': 'booking__ds__month'}              -->
-                                        <!-- col34 =                                               -->
+                                        <!-- col55 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                         <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                        <!-- col35 =                                               -->
+                                        <!-- col56 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                         <!--    'column_alias': 'booking__ds__year'}               -->
-                                        <!-- col36 =                                                     -->
+                                        <!-- col57 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                        <!-- col58 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                        <!-- col59 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                        <!-- col60 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                        <!-- col61 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                        <!-- col62 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                        <!-- col63 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col64 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                        <!-- col37 =                                               -->
+                                        <!-- col65 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                        <!-- col38 =                                               -->
+                                        <!-- col66 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                        <!-- col39 =                                                 -->
+                                        <!-- col67 =                                                 -->
                                         <!--   {'class': 'SqlSelectColumn',                          -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                        <!-- col40 =                                               -->
+                                        <!-- col68 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                        <!-- col41 =                                                     -->
+                                        <!-- col69 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                        <!-- col70 =                                                         -->
+                                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                        <!-- col71 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                        <!-- col72 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                        <!-- col73 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                        <!-- col74 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col75 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col76 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                         <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                        <!-- col42 =                                               -->
+                                        <!-- col77 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                         <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                        <!-- col43 =                                               -->
+                                        <!-- col78 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                         <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                        <!-- col44 =                                               -->
+                                        <!-- col79 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                         <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                        <!-- col45 =                                               -->
+                                        <!-- col80 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                         <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                        <!-- col46 =                                                     -->
+                                        <!-- col81 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                        <!-- col82 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                        <!-- col83 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                        <!-- col84 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                        <!-- col85 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                        <!-- col86 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                        <!-- col87 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col88 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                         <!--    'column_alias': 'listing'}                               -->
-                                        <!-- col47 =                                                     -->
+                                        <!-- col89 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                         <!--    'column_alias': 'guest'}                                 -->
-                                        <!-- col48 =                                                     -->
+                                        <!-- col90 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                         <!--    'column_alias': 'host'}                                  -->
-                                        <!-- col49 =                                                     -->
+                                        <!-- col91 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                         <!--    'column_alias': 'booking__listing'}                      -->
-                                        <!-- col50 =                                                     -->
+                                        <!-- col92 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                         <!--    'column_alias': 'booking__guest'}                        -->
-                                        <!-- col51 =                                                     -->
+                                        <!-- col93 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                         <!--    'column_alias': 'booking__host'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                         <!-- where = None -->
@@ -576,11 +912,11 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_367),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                 <!--    'column_alias': 'booking_value'}                       -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -589,7 +925,7 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -598,7 +934,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -608,11 +944,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_363),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_362),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                         <!--    'column_alias': 'booking_value'}                       -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -621,227 +957,395 @@
                             <!-- node_id = ss_13 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_357),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_358),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col53 =                                                   -->
+                            <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -858,27 +1362,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col8 =                                                                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -886,31 +1390,31 @@
                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                 <!-- col9 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                 <!-- col12 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                 <!-- col13 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -928,133 +1432,301 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col20 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col21 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col22 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col23 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col24 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col25 =                                                     -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col38 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col26 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col27 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col28 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col29 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col30 =                                                     -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col31 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col32 =                                               -->
+                                <!-- col53 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col33 =                                               -->
+                                <!-- col54 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col34 =                                               -->
+                                <!-- col55 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col35 =                                               -->
+                                <!-- col56 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col36 =                                                     -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col63 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col37 =                                               -->
+                                <!-- col65 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col38 =                                               -->
+                                <!-- col66 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col39 =                                                 -->
+                                <!-- col67 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col40 =                                               -->
+                                <!-- col68 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col41 =                                                     -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col75 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col42 =                                               -->
+                                <!-- col77 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col43 =                                               -->
+                                <!-- col78 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col44 =                                               -->
+                                <!-- col79 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col45 =                                               -->
+                                <!-- col80 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col46 =                                                     -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col87 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col47 =                                                     -->
+                                <!-- col89 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col48 =                                                     -->
+                                <!-- col90 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col49 =                                                     -->
+                                <!-- col91 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col50 =                                                     -->
+                                <!-- col92 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col51 =                                                     -->
+                                <!-- col93 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml
index cf76b6c264..c22e5aaa2c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_13 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                        -->
         <!--   {'class': 'SqlSelectColumn',                                                -->
@@ -17,11 +17,11 @@
             <!-- node_id = ss_12 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
             <!--    'column_alias': 'delayed_bookings'}                    -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
             <!-- where = None -->
@@ -30,7 +30,7 @@
                 <!-- node_id = ss_11 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -39,7 +39,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -49,11 +49,11 @@
                     <!-- node_id = ss_10 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                     <!-- where = None -->
@@ -62,15 +62,15 @@
                         <!-- node_id = ss_9 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                         <!--    'column_alias': 'booking__is_instant'}                 -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                         <!-- where =                                                                -->
@@ -82,15 +82,15 @@
                             <!-- node_id = ss_8 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                             <!-- where = None -->
@@ -99,227 +99,395 @@
                                 <!-- node_id = ss_7 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                                <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                                <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                                <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                                <!--    'column_alias': 'paid_at__day'}                        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                                <!--    'column_alias': 'paid_at__week'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                                <!--    'column_alias': 'paid_at__month'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                                <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                                <!--    'column_alias': 'paid_at__year'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                                <!--    'column_alias': 'booking__ds__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                                <!--    'column_alias': 'booking__ds__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                                <!--    'column_alias': 'booking__ds__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                                <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                                <!--    'column_alias': 'booking__ds__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!-- col53 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col54 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col55 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col56 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col57 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col58 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col59 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col60 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!-- col61 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!-- col62 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!-- col63 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!-- col64 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!-- col65 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                <!-- col66 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                <!-- col67 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                <!-- col68 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                <!-- col69 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                <!-- col70 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col71 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col72 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!-- col73 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!-- col74 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!-- col75 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!-- col76 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!-- col77 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                                <!--    'column_alias': 'listing'}                             -->
+                                <!-- col78 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                                <!--    'column_alias': 'guest'}                               -->
+                                <!-- col79 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                                <!--    'column_alias': 'host'}                                -->
+                                <!-- col80 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!-- col81 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!-- col82 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!-- col83 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!-- col84 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!-- col85 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
+                                <!-- col86 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!-- col87 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!-- col88 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col89 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col90 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col91 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col92 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col93 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col94 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                   -->
-                                <!-- col53 =                                                   -->
+                                <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col54 =                                                         -->
+                                <!-- col96 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col55 =                                                       -->
+                                <!-- col97 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
@@ -336,27 +504,27 @@
                                     <!--    'column_alias': 'instant_bookings'}                                                              -->
                                     <!-- col2 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                     <!--    'column_alias': 'booking_value'}                         -->
                                     <!-- col3 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                     <!--    'column_alias': 'max_booking_value'}                     -->
                                     <!-- col4 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                     <!--    'column_alias': 'min_booking_value'}                     -->
                                     <!-- col5 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                     <!--    'column_alias': 'bookers'}                               -->
                                     <!-- col6 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                     <!--    'column_alias': 'average_booking_value'}                 -->
                                     <!-- col7 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                     <!--    'column_alias': 'booking_payments'}                      -->
                                     <!-- col8 =                                                                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -364,31 +532,31 @@
                                     <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                     <!-- col9 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                     <!--    'column_alias': 'median_booking_value'}                  -->
                                     <!-- col10 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                     -->
                                     <!-- col11 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                     <!-- col12 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                     <!-- col13 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- col14 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                     <!--    'column_alias': 'is_instant'}                            -->
                                     <!-- col15 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                     <!--    'column_alias': 'ds__day'}                               -->
                                     <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -406,133 +574,301 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                     <!--    'column_alias': 'ds__year'}                        -->
-                                    <!-- col20 =                                                     -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}              -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}             -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}              -->
+                                    <!-- col24 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}               -->
+                                    <!-- col25 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!-- col26 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                    <!-- col21 =                                               -->
+                                    <!-- col28 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                    <!-- col22 =                                               -->
+                                    <!-- col29 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                    <!-- col23 =                                               -->
+                                    <!-- col30 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                    <!-- col24 =                                               -->
+                                    <!-- col31 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                    <!-- col25 =                                                     -->
+                                    <!-- col32 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                    <!-- col33 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                    <!-- col34 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                    <!-- col35 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                    <!-- col36 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                    <!-- col37 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col38 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                     <!--    'column_alias': 'paid_at__day'}                          -->
-                                    <!-- col26 =                                               -->
+                                    <!-- col40 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                     <!--    'column_alias': 'paid_at__week'}                   -->
-                                    <!-- col27 =                                               -->
+                                    <!-- col41 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                     <!--    'column_alias': 'paid_at__month'}                  -->
-                                    <!-- col28 =                                               -->
+                                    <!-- col42 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                -->
-                                    <!-- col29 =                                               -->
+                                    <!-- col43 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                     <!--    'column_alias': 'paid_at__year'}                   -->
-                                    <!-- col30 =                                                     -->
+                                    <!-- col44 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                    <!-- col45 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                    <!-- col46 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                    <!-- col47 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                    <!-- col48 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                    <!-- col49 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!-- col50 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                     <!--    'column_alias': 'booking__is_instant'}                   -->
-                                    <!-- col31 =                                                     -->
+                                    <!-- col52 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                      -->
-                                    <!-- col32 =                                               -->
+                                    <!-- col53 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                     <!--    'column_alias': 'booking__ds__week'}               -->
-                                    <!-- col33 =                                               -->
+                                    <!-- col54 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                     <!--    'column_alias': 'booking__ds__month'}              -->
-                                    <!-- col34 =                                               -->
+                                    <!-- col55 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                    <!-- col35 =                                               -->
+                                    <!-- col56 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                     <!--    'column_alias': 'booking__ds__year'}               -->
-                                    <!-- col36 =                                                     -->
+                                    <!-- col57 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                    <!-- col58 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                    <!-- col59 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                    <!-- col60 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                    <!-- col61 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                    <!-- col62 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                    <!-- col63 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                    <!-- col37 =                                               -->
+                                    <!-- col65 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                    <!-- col38 =                                               -->
+                                    <!-- col66 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                    <!-- col39 =                                                 -->
+                                    <!-- col67 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                    <!-- col40 =                                               -->
+                                    <!-- col68 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                    <!-- col41 =                                                     -->
+                                    <!-- col69 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col70 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col71 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col72 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col73 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col74 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col75 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                    <!-- col42 =                                               -->
+                                    <!-- col77 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                    <!-- col43 =                                               -->
+                                    <!-- col78 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                    <!-- col44 =                                               -->
+                                    <!-- col79 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                    <!-- col45 =                                               -->
+                                    <!-- col80 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                    <!-- col46 =                                                     -->
+                                    <!-- col81 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                    <!-- col82 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                    <!-- col83 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                    <!-- col84 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                    <!-- col85 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                    <!-- col86 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col87 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                     <!--    'column_alias': 'listing'}                               -->
-                                    <!-- col47 =                                                     -->
+                                    <!-- col89 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                     <!--    'column_alias': 'guest'}                                 -->
-                                    <!-- col48 =                                                     -->
+                                    <!-- col90 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                     <!--    'column_alias': 'host'}                                  -->
-                                    <!-- col49 =                                                     -->
+                                    <!-- col91 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                     <!--    'column_alias': 'booking__listing'}                      -->
-                                    <!-- col50 =                                                     -->
+                                    <!-- col92 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                     <!--    'column_alias': 'booking__guest'}                        -->
-                                    <!-- col51 =                                                     -->
+                                    <!-- col93 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                     <!--    'column_alias': 'booking__host'}                         -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml
index bc37ee4ba5..700630d85f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml
@@ -13,11 +13,11 @@
             <!-- node_id = ss_15 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
             <!--    'column_alias': 'listings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- join_0 =                                                   -->
@@ -32,7 +32,7 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -52,7 +52,7 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -61,227 +61,395 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col53 =                                                   -->
+                            <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -298,27 +466,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col8 =                                                                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -326,31 +494,31 @@
                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                 <!-- col9 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                 <!-- col12 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                 <!-- col13 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -368,133 +536,301 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col20 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col21 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col22 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col23 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col24 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col25 =                                                     -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col38 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col26 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col27 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col28 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col29 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col30 =                                                     -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col31 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col32 =                                               -->
+                                <!-- col53 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col33 =                                               -->
+                                <!-- col54 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col34 =                                               -->
+                                <!-- col55 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col35 =                                               -->
+                                <!-- col56 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col36 =                                                     -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col63 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col37 =                                               -->
+                                <!-- col65 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col38 =                                               -->
+                                <!-- col66 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col39 =                                                 -->
+                                <!-- col67 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col40 =                                               -->
+                                <!-- col68 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col41 =                                                     -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col75 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col76 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col42 =                                               -->
+                                <!-- col77 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col43 =                                               -->
+                                <!-- col78 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col44 =                                               -->
+                                <!-- col79 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col45 =                                               -->
+                                <!-- col80 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col46 =                                                     -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col87 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col47 =                                                     -->
+                                <!-- col89 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col48 =                                                     -->
+                                <!-- col90 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col49 =                                                     -->
+                                <!-- col91 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col50 =                                                     -->
+                                <!-- col92 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col51 =                                                     -->
+                                <!-- col93 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
@@ -513,7 +849,7 @@
                 <!-- node_id = ss_14 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
                 <!--    'column_alias': 'listings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
@@ -533,7 +869,7 @@
                         <!-- node_id = ss_12 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                         <!--    'column_alias': 'listings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
@@ -542,151 +878,263 @@
                             <!-- node_id = ss_11 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
-                            <!--    'column_alias': 'created_at__day'}                     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
-                            <!--    'column_alias': 'created_at__week'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                            <!--    'column_alias': 'created_at__month'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                            <!--    'column_alias': 'created_at__quarter'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
-                            <!--    'column_alias': 'created_at__year'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
-                            <!--    'column_alias': 'listing__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
-                            <!--    'column_alias': 'listing__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
-                            <!--    'column_alias': 'listing__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                            <!--    'column_alias': 'created_at__day'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
-                            <!--    'column_alias': 'listing__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                            <!--    'column_alias': 'created_at__week'}                    -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                            <!--    'column_alias': 'listing__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                            <!--    'column_alias': 'created_at__month'}                   -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                            <!--    'column_alias': 'listing__created_at__day'}            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                            <!--    'column_alias': 'created_at__quarter'}                 -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                            <!--    'column_alias': 'listing__created_at__week'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                            <!--    'column_alias': 'created_at__year'}                    -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                            <!--    'column_alias': 'listing__created_at__month'}          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                            <!--    'column_alias': 'created_at__extract_year'}            -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                            <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                            <!--    'column_alias': 'created_at__extract_quarter'}         -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                            <!--    'column_alias': 'listing__created_at__year'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                            <!--    'column_alias': 'created_at__extract_month'}           -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                            <!--    'column_alias': 'created_at__extract_week'}            -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                            <!--    'column_alias': 'created_at__extract_day'}             -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                            <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                            <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'listing__ds__day'}                    -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'listing__ds__week'}                   -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                            <!--    'column_alias': 'user'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                            <!--    'column_alias': 'listing__ds__month'}                  -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                            <!--    'column_alias': 'listing__user'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                            <!--    'column_alias': 'listing__ds__quarter'}                -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                            <!--    'column_alias': 'country_latest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                            <!--    'column_alias': 'listing__ds__year'}                   -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                            <!--    'column_alias': 'is_lux_latest'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                            <!--    'column_alias': 'listing__ds__extract_year'}           -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                            <!--    'column_alias': 'capacity_latest'}                     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                            <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                            <!--    'column_alias': 'listing__country_latest'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'listing__ds__extract_month'}          -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                            <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'listing__ds__extract_week'}           -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                            <!--    'column_alias': 'listing__capacity_latest'}            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'listing__ds__extract_day'}            -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
-                            <!--    'column_alias': 'listings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
-                            <!--    'column_alias': 'largest_listing'}                     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'listing__created_at__day'}            -->
+                            <!-- col37 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'listing__created_at__week'}           -->
+                            <!-- col38 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'listing__created_at__month'}          -->
+                            <!-- col39 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                            <!-- col40 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'listing__created_at__year'}           -->
+                            <!-- col41 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'listing__created_at__extract_year'}   -->
+                            <!-- col42 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),    -->
+                            <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                            <!-- col43 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                            <!-- col44 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                            <!--    'column_alias': 'listing__created_at__extract_week'}   -->
+                            <!-- col45 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                            <!--    'column_alias': 'listing__created_at__extract_day'}    -->
+                            <!-- col46 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),      -->
+                            <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                            <!-- col47 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),      -->
+                            <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                            <!-- col48 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col49 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col50 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col51 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col52 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col53 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col54 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'column_alias': 'user'}                                -->
+                            <!-- col55 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'column_alias': 'listing__user'}                       -->
+                            <!-- col56 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                            <!--    'column_alias': 'country_latest'}                      -->
+                            <!-- col57 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                            <!--    'column_alias': 'is_lux_latest'}                       -->
+                            <!-- col58 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                            <!--    'column_alias': 'capacity_latest'}                     -->
+                            <!-- col59 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                            <!--    'column_alias': 'listing__country_latest'}             -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                            <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                            <!--    'column_alias': 'listing__capacity_latest'}            -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                            <!--    'column_alias': 'listings'}                            -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                            <!--    'column_alias': 'largest_listing'}                     -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                             <!--    'column_alias': 'smallest_listing'}                    -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                             <!-- where = None -->
@@ -699,15 +1147,15 @@
                                 <!--    'column_alias': 'listings'}                                 -->
                                 <!-- col1 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                                 <!--    'column_alias': 'largest_listing'}                       -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                                 <!--    'column_alias': 'smallest_listing'}                      -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col4 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -725,101 +1173,213 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col8 =                                                      -->
+                                <!-- col8 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col9 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col10 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col11 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col12 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col13 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col14 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                                 <!--    'column_alias': 'created_at__day'}                       -->
-                                <!-- col9 =                                                -->
+                                <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                                 <!--    'column_alias': 'created_at__week'}                -->
-                                <!-- col10 =                                               -->
+                                <!-- col17 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                                 <!--    'column_alias': 'created_at__month'}               -->
-                                <!-- col11 =                                               -->
+                                <!-- col18 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                                 <!--    'column_alias': 'created_at__quarter'}             -->
-                                <!-- col12 =                                               -->
+                                <!-- col19 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                                 <!--    'column_alias': 'created_at__year'}                -->
-                                <!-- col13 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                                <!--    'column_alias': 'created_at__extract_year'}      -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                                <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                                <!--    'column_alias': 'created_at__extract_month'}     -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                                <!--    'column_alias': 'created_at__extract_week'}      -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                                <!--    'column_alias': 'created_at__extract_day'}       -->
+                                <!-- col25 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                                <!-- col26 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                                 <!--    'column_alias': 'country_latest'}                        -->
-                                <!-- col14 =                                                     -->
+                                <!-- col28 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                                 <!--    'column_alias': 'is_lux_latest'}                         -->
-                                <!-- col15 =                                                     -->
+                                <!-- col29 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                                 <!--    'column_alias': 'capacity_latest'}                       -->
-                                <!-- col16 =                                                     -->
+                                <!-- col30 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                                 <!--    'column_alias': 'listing__ds__day'}                      -->
-                                <!-- col17 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                                 <!--    'column_alias': 'listing__ds__week'}               -->
-                                <!-- col18 =                                               -->
+                                <!-- col32 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                                 <!--    'column_alias': 'listing__ds__month'}              -->
-                                <!-- col19 =                                               -->
+                                <!-- col33 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                                 <!--    'column_alias': 'listing__ds__quarter'}            -->
-                                <!-- col20 =                                               -->
+                                <!-- col34 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                                 <!--    'column_alias': 'listing__ds__year'}               -->
-                                <!-- col21 =                                                     -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                                <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                                <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                                <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                                <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                                <!-- col39 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                                <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                                <!-- col40 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                                <!-- col41 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                <!-- col42 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                                 <!--    'column_alias': 'listing__created_at__day'}              -->
-                                <!-- col22 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                                 <!--    'column_alias': 'listing__created_at__week'}       -->
-                                <!-- col23 =                                               -->
+                                <!-- col44 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                                 <!--    'column_alias': 'listing__created_at__month'}      -->
-                                <!-- col24 =                                               -->
+                                <!-- col45 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                                 <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                                <!-- col25 =                                               -->
+                                <!-- col46 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                                 <!--    'column_alias': 'listing__created_at__year'}       -->
-                                <!-- col26 =                                                     -->
+                                <!-- col47 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                                <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                                <!-- col48 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                                <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                <!-- col49 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                                <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                <!-- col50 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                                <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                                <!-- col51 =                                                 -->
+                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                                <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                                <!-- col52 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                <!-- col53 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                <!-- col54 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                                 <!--    'column_alias': 'listing__country_latest'}               -->
-                                <!-- col27 =                                                     -->
+                                <!-- col55 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                                 <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                                <!-- col28 =                                                     -->
+                                <!-- col56 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                                 <!--    'column_alias': 'listing__capacity_latest'}              -->
-                                <!-- col29 =                                                     -->
+                                <!-- col57 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col30 =                                                     -->
+                                <!-- col58 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                                 <!--    'column_alias': 'user'}                                  -->
-                                <!-- col31 =                                                     -->
+                                <!-- col59 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                                 <!--    'column_alias': 'listing__user'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
index 61d600e32e..0925971c02 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
@@ -4,15 +4,15 @@
         <!-- node_id = ss_18 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_939),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_938),  -->
         <!--    'column_alias': 'listing__user__home_state_latest'}    -->
         <!-- col2 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_940),  -->
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
         <!-- where = None -->
@@ -21,11 +21,11 @@
             <!-- node_id = ss_17 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_937),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_936),  -->
             <!--    'column_alias': 'listing__user__home_state_latest'}    -->
             <!-- col2 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -34,11 +34,11 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_937),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- group_by1 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_936),  -->
             <!--    'column_alias': 'listing__user__home_state_latest'}    -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -48,15 +48,15 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_934),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_933),  -->
                 <!--    'column_alias': 'listing__user__home_state_latest'}    -->
                 <!-- col2 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_932),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -65,27 +65,27 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_927),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
-                    <!-- col1 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
-                    <!--    'column_alias': 'listing__window_start__day'}          -->
+                    <!-- col1 =                                                     -->
+                    <!--   {'class': 'SqlSelectColumn',                             -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_930),   -->
+                    <!--    'column_alias': 'listing__window_start__extract_week'}  -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_931),  -->
                     <!--    'column_alias': 'listing__window_end__day'}            -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_928),  -->
                     <!--    'column_alias': 'listing'}                             -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_929),  -->
                     <!--    'column_alias': 'listing__user__home_state_latest'}    -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_926),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                     <!-- join_0 =                                                   -->
@@ -102,15 +102,15 @@
                         <!-- node_id = ss_11 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_431),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_432),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
                         <!--    'column_alias': 'listing'}                             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_430),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                         <!-- where = None -->
@@ -119,203 +119,371 @@
                             <!-- node_id = ss_10 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_407),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_408),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_410),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_412),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_413),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_416),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_417),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_418),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_419),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_420),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_421),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_422),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_423),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_424),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_425),  -->
-                            <!--    'column_alias': 'user'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_426),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_427),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_428),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_429),  -->
-                            <!--    'column_alias': 'booking__user'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!-- col50 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!-- col51 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!-- col52 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
+                            <!--    'column_alias': 'user'}                                -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
+                            <!--    'column_alias': 'booking__user'}                       -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10015) -->
                             <!-- where = None -->
@@ -332,27 +500,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10279),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10280),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10281),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10129),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10282),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10130),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10283),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10131),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10284),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10132),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col8 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -370,141 +538,309 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10155),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col12 =                                                     -->
+                                <!-- col12 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10266),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col13 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10267),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col14 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10268),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col15 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10269),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col16 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10270),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col17 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10271),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col18 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10272),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col19 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10289),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10133),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col13 =                                               -->
+                                <!-- col20 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10156),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col14 =                                               -->
+                                <!-- col21 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10157),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col15 =                                               -->
+                                <!-- col22 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10158),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col16 =                                               -->
+                                <!-- col23 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10159),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col17 =                                                     -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10273),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col25 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10274),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col26 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10275),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col27 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10276),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col28 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10277),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col29 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10278),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col30 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10279),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col31 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10294),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10134),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col18 =                                               -->
+                                <!-- col32 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10160),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col19 =                                               -->
+                                <!-- col33 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10161),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col20 =                                               -->
+                                <!-- col34 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10162),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col21 =                                               -->
+                                <!-- col35 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10163),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col22 =                                                     -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10280),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10281),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10282),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col39 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10283),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col40 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10284),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col41 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10285),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col42 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10286),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col43 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10299),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10135),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col23 =                                                     -->
+                                <!-- col44 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10300),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10136),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col24 =                                               -->
+                                <!-- col45 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10164),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col25 =                                               -->
+                                <!-- col46 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10165),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col26 =                                               -->
+                                <!-- col47 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10166),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col27 =                                               -->
+                                <!-- col48 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10167),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col28 =                                                     -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10287),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10288),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col51 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10289),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col52 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10290),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col53 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10291),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col54 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10292),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col55 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10293),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col56 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10305),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10137),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col29 =                                               -->
+                                <!-- col57 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10168),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col30 =                                               -->
+                                <!-- col58 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10169),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col31 =                                                 -->
+                                <!-- col59 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10170),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col32 =                                               -->
+                                <!-- col60 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10171),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col33 =                                                     -->
+                                <!-- col61 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10294),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col62 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10295),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col63 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10296),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col64 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10297),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col65 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10298),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col66 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10299),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col67 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10300),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col68 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10310),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10138),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col34 =                                               -->
+                                <!-- col69 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10172),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col35 =                                               -->
+                                <!-- col70 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10173),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col36 =                                               -->
+                                <!-- col71 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10174),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col37 =                                               -->
+                                <!-- col72 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10175),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col38 =                                                     -->
+                                <!-- col73 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10301),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col74 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10302),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col75 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10303),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col76 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10304),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col77 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10305),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col78 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10306),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col79 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10307),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col80 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10315),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10139),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col39 =                                                     -->
+                                <!-- col81 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10316),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10140),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col40 =                                                     -->
+                                <!-- col82 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10317),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10141),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col41 =                                                     -->
+                                <!-- col83 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10318),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10142),  -->
                                 <!--    'column_alias': 'user'}                                  -->
-                                <!-- col42 =                                                     -->
+                                <!-- col84 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10319),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10143),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col43 =                                                     -->
+                                <!-- col85 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10320),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10144),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col44 =                                                     -->
+                                <!-- col86 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10321),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10145),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
-                                <!-- col45 =                                                     -->
+                                <!-- col87 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10322),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10146),  -->
                                 <!--    'column_alias': 'booking__user'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10015) -->
                                 <!-- where = None -->
@@ -523,19 +859,19 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
-                        <!--    'column_alias': 'window_start__day'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_918),  -->
+                        <!--    'column_alias': 'window_start__extract_week'}          -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_919),  -->
                         <!--    'column_alias': 'window_end__day'}                     -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_920),  -->
                         <!--    'column_alias': 'listing'}                             -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_917),  -->
                         <!--    'column_alias': 'user__home_state_latest'}             -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -544,143 +880,283 @@
                             <!-- node_id = ss_13 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_853),  -->
                             <!--    'column_alias': 'window_start__day'}                   -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
                             <!--    'column_alias': 'window_start__week'}                  -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
                             <!--    'column_alias': 'window_start__month'}                 -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
                             <!--    'column_alias': 'window_start__quarter'}               -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_857),  -->
                             <!--    'column_alias': 'window_start__year'}                  -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
-                            <!--    'column_alias': 'window_end__day'}                     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_858),  -->
+                            <!--    'column_alias': 'window_start__extract_year'}          -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
-                            <!--    'column_alias': 'window_end__week'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_859),  -->
+                            <!--    'column_alias': 'window_start__extract_quarter'}       -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
-                            <!--    'column_alias': 'window_end__month'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
+                            <!--    'column_alias': 'window_start__extract_month'}         -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
-                            <!--    'column_alias': 'window_end__quarter'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
+                            <!--    'column_alias': 'window_start__extract_week'}          -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
-                            <!--    'column_alias': 'window_end__year'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
+                            <!--    'column_alias': 'window_start__extract_day'}           -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
-                            <!--    'column_alias': 'listing__window_start__day'}          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
+                            <!--    'column_alias': 'window_start__extract_dayofweek'}     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
-                            <!--    'column_alias': 'listing__window_start__week'}         -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_864),  -->
+                            <!--    'column_alias': 'window_start__extract_dayofyear'}     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
-                            <!--    'column_alias': 'listing__window_start__month'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_865),  -->
+                            <!--    'column_alias': 'window_end__day'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
-                            <!--    'column_alias': 'listing__window_start__quarter'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_866),  -->
+                            <!--    'column_alias': 'window_end__week'}                    -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
-                            <!--    'column_alias': 'listing__window_start__year'}         -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),  -->
+                            <!--    'column_alias': 'window_end__month'}                   -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
-                            <!--    'column_alias': 'listing__window_end__day'}            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_868),  -->
+                            <!--    'column_alias': 'window_end__quarter'}                 -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
-                            <!--    'column_alias': 'listing__window_end__week'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_869),  -->
+                            <!--    'column_alias': 'window_end__year'}                    -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
-                            <!--    'column_alias': 'listing__window_end__month'}          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_870),  -->
+                            <!--    'column_alias': 'window_end__extract_year'}            -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
-                            <!--    'column_alias': 'listing__window_end__quarter'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),  -->
+                            <!--    'column_alias': 'window_end__extract_quarter'}         -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
-                            <!--    'column_alias': 'listing__window_end__year'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),  -->
+                            <!--    'column_alias': 'window_end__extract_month'}           -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
-                            <!--    'column_alias': 'user__ds__day'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),  -->
+                            <!--    'column_alias': 'window_end__extract_week'}            -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
-                            <!--    'column_alias': 'user__ds__week'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),  -->
+                            <!--    'column_alias': 'window_end__extract_day'}             -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
-                            <!--    'column_alias': 'user__ds__month'}                     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_875),  -->
+                            <!--    'column_alias': 'window_end__extract_dayofweek'}       -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
-                            <!--    'column_alias': 'user__ds__quarter'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_876),  -->
+                            <!--    'column_alias': 'window_end__extract_dayofyear'}       -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
-                            <!--    'column_alias': 'user__ds__year'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_877),  -->
+                            <!--    'column_alias': 'listing__window_start__day'}          -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_878),  -->
+                            <!--    'column_alias': 'listing__window_start__week'}         -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
-                            <!--    'column_alias': 'user'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_879),  -->
+                            <!--    'column_alias': 'listing__window_start__month'}        -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
-                            <!--    'column_alias': 'listing__user'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),  -->
+                            <!--    'column_alias': 'listing__window_start__quarter'}      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_881),  -->
+                            <!--    'column_alias': 'listing__window_start__year'}         -->
+                            <!-- col29 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_882),   -->
+                            <!--    'column_alias': 'listing__window_start__extract_year'}  -->
+                            <!-- col30 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),      -->
+                            <!--    'column_alias': 'listing__window_start__extract_quarter'}  -->
+                            <!-- col31 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),    -->
+                            <!--    'column_alias': 'listing__window_start__extract_month'}  -->
+                            <!-- col32 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),   -->
+                            <!--    'column_alias': 'listing__window_start__extract_week'}  -->
+                            <!-- col33 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
+                            <!--    'column_alias': 'listing__window_start__extract_day'}  -->
+                            <!-- col34 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_887),        -->
+                            <!--    'column_alias': 'listing__window_start__extract_dayofweek'}  -->
+                            <!-- col35 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_888),        -->
+                            <!--    'column_alias': 'listing__window_start__extract_dayofyear'}  -->
+                            <!-- col36 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_889),  -->
+                            <!--    'column_alias': 'listing__window_end__day'}            -->
+                            <!-- col37 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_890),  -->
+                            <!--    'column_alias': 'listing__window_end__week'}           -->
+                            <!-- col38 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_891),  -->
+                            <!--    'column_alias': 'listing__window_end__month'}          -->
+                            <!-- col39 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_892),  -->
+                            <!--    'column_alias': 'listing__window_end__quarter'}        -->
+                            <!-- col40 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_893),  -->
+                            <!--    'column_alias': 'listing__window_end__year'}           -->
+                            <!-- col41 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_894),  -->
+                            <!--    'column_alias': 'listing__window_end__extract_year'}   -->
+                            <!-- col42 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_895),    -->
+                            <!--    'column_alias': 'listing__window_end__extract_quarter'}  -->
+                            <!-- col43 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),  -->
+                            <!--    'column_alias': 'listing__window_end__extract_month'}  -->
+                            <!-- col44 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),  -->
+                            <!--    'column_alias': 'listing__window_end__extract_week'}   -->
+                            <!-- col45 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_898),  -->
+                            <!--    'column_alias': 'listing__window_end__extract_day'}    -->
+                            <!-- col46 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_899),      -->
+                            <!--    'column_alias': 'listing__window_end__extract_dayofweek'}  -->
+                            <!-- col47 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_900),      -->
+                            <!--    'column_alias': 'listing__window_end__extract_dayofyear'}  -->
+                            <!-- col48 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_905),  -->
+                            <!--    'column_alias': 'user__ds__day'}                       -->
+                            <!-- col49 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_906),  -->
+                            <!--    'column_alias': 'user__ds__week'}                      -->
+                            <!-- col50 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_907),  -->
+                            <!--    'column_alias': 'user__ds__month'}                     -->
+                            <!-- col51 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_908),  -->
+                            <!--    'column_alias': 'user__ds__quarter'}                   -->
+                            <!-- col52 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_909),  -->
+                            <!--    'column_alias': 'user__ds__year'}                      -->
+                            <!-- col53 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_910),  -->
+                            <!--    'column_alias': 'user__ds__extract_year'}              -->
+                            <!-- col54 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_911),  -->
+                            <!--    'column_alias': 'user__ds__extract_quarter'}           -->
+                            <!-- col55 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_912),  -->
+                            <!--    'column_alias': 'user__ds__extract_month'}             -->
+                            <!-- col56 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_913),  -->
+                            <!--    'column_alias': 'user__ds__extract_week'}              -->
+                            <!-- col57 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_914),  -->
+                            <!--    'column_alias': 'user__ds__extract_day'}               -->
+                            <!-- col58 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_915),  -->
+                            <!--    'column_alias': 'user__ds__extract_dayofweek'}         -->
+                            <!-- col59 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_916),  -->
+                            <!--    'column_alias': 'user__ds__extract_dayofyear'}         -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_901),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_902),  -->
+                            <!--    'column_alias': 'user'}                                -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_903),  -->
+                            <!--    'column_alias': 'listing__user'}                       -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),  -->
                             <!--    'column_alias': 'country'}                             -->
-                            <!-- col29 =                                                   -->
+                            <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
                             <!--    'column_alias': 'is_lux'}                              -->
-                            <!-- col30 =                                                   -->
+                            <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
                             <!--    'column_alias': 'capacity'}                            -->
-                            <!-- col31 =                                                   -->
+                            <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
                             <!--    'column_alias': 'listing__country'}                    -->
-                            <!-- col32 =                                                   -->
+                            <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),  -->
                             <!--    'column_alias': 'listing__is_lux'}                     -->
-                            <!-- col33 =                                                   -->
+                            <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
                             <!--    'column_alias': 'listing__capacity'}                   -->
-                            <!-- col34 =                                                   -->
+                            <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_904),  -->
                             <!--    'column_alias': 'user__home_state_latest'}             -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10017) -->
                             <!-- join_0 =                                                    -->
@@ -695,7 +1171,7 @@
                                 <!-- node_id = ss_10017 -->
                                 <!-- col0 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10330),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10154),  -->
                                 <!--    'column_alias': 'window_start__day'}                     -->
                                 <!-- col1 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -713,101 +1189,213 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10179),  -->
                                 <!--    'column_alias': 'window_start__year'}              -->
-                                <!-- col5 =                                                      -->
+                                <!-- col5 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10308),  -->
+                                <!--    'column_alias': 'window_start__extract_year'}    -->
+                                <!-- col6 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10309),   -->
+                                <!--    'column_alias': 'window_start__extract_quarter'}  -->
+                                <!-- col7 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10310),  -->
+                                <!--    'column_alias': 'window_start__extract_month'}   -->
+                                <!-- col8 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10311),  -->
+                                <!--    'column_alias': 'window_start__extract_week'}    -->
+                                <!-- col9 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10312),  -->
+                                <!--    'column_alias': 'window_start__extract_day'}     -->
+                                <!-- col10 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10313),     -->
+                                <!--    'column_alias': 'window_start__extract_dayofweek'}  -->
+                                <!-- col11 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10314),     -->
+                                <!--    'column_alias': 'window_start__extract_dayofyear'}  -->
+                                <!-- col12 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10335),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10155),  -->
                                 <!--    'column_alias': 'window_end__day'}                       -->
-                                <!-- col6 =                                                -->
+                                <!-- col13 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10180),  -->
                                 <!--    'column_alias': 'window_end__week'}                -->
-                                <!-- col7 =                                                -->
+                                <!-- col14 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10181),  -->
                                 <!--    'column_alias': 'window_end__month'}               -->
-                                <!-- col8 =                                                -->
+                                <!-- col15 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10182),  -->
                                 <!--    'column_alias': 'window_end__quarter'}             -->
-                                <!-- col9 =                                                -->
+                                <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10183),  -->
                                 <!--    'column_alias': 'window_end__year'}                -->
-                                <!-- col10 =                                                     -->
+                                <!-- col17 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10315),  -->
+                                <!--    'column_alias': 'window_end__extract_year'}      -->
+                                <!-- col18 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10316),  -->
+                                <!--    'column_alias': 'window_end__extract_quarter'}   -->
+                                <!-- col19 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10317),  -->
+                                <!--    'column_alias': 'window_end__extract_month'}     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10318),  -->
+                                <!--    'column_alias': 'window_end__extract_week'}      -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10319),  -->
+                                <!--    'column_alias': 'window_end__extract_day'}       -->
+                                <!-- col22 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10320),   -->
+                                <!--    'column_alias': 'window_end__extract_dayofweek'}  -->
+                                <!-- col23 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10321),   -->
+                                <!--    'column_alias': 'window_end__extract_dayofyear'}  -->
+                                <!-- col24 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10340),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10156),  -->
                                 <!--    'column_alias': 'country'}                               -->
-                                <!-- col11 =                                                     -->
+                                <!-- col25 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10341),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10157),  -->
                                 <!--    'column_alias': 'is_lux'}                                -->
-                                <!-- col12 =                                                     -->
+                                <!-- col26 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10342),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10158),  -->
                                 <!--    'column_alias': 'capacity'}                              -->
-                                <!-- col13 =                                                     -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10343),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10159),  -->
                                 <!--    'column_alias': 'listing__window_start__day'}            -->
-                                <!-- col14 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10184),  -->
                                 <!--    'column_alias': 'listing__window_start__week'}     -->
-                                <!-- col15 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10185),  -->
                                 <!--    'column_alias': 'listing__window_start__month'}    -->
-                                <!-- col16 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10186),  -->
                                 <!--    'column_alias': 'listing__window_start__quarter'}  -->
-                                <!-- col17 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10187),  -->
                                 <!--    'column_alias': 'listing__window_start__year'}     -->
-                                <!-- col18 =                                                     -->
+                                <!-- col32 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10322),         -->
+                                <!--    'column_alias': 'listing__window_start__extract_year'}  -->
+                                <!-- col33 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10323),            -->
+                                <!--    'column_alias': 'listing__window_start__extract_quarter'}  -->
+                                <!-- col34 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10348),  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10324),          -->
+                                <!--    'column_alias': 'listing__window_start__extract_month'}  -->
+                                <!-- col35 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10325),         -->
+                                <!--    'column_alias': 'listing__window_start__extract_week'}  -->
+                                <!-- col36 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10326),        -->
+                                <!--    'column_alias': 'listing__window_start__extract_day'}  -->
+                                <!-- col37 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10327),              -->
+                                <!--    'column_alias': 'listing__window_start__extract_dayofweek'}  -->
+                                <!-- col38 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10328),              -->
+                                <!--    'column_alias': 'listing__window_start__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10160),  -->
                                 <!--    'column_alias': 'listing__window_end__day'}              -->
-                                <!-- col19 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10188),  -->
                                 <!--    'column_alias': 'listing__window_end__week'}       -->
-                                <!-- col20 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10189),  -->
                                 <!--    'column_alias': 'listing__window_end__month'}      -->
-                                <!-- col21 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10190),  -->
                                 <!--    'column_alias': 'listing__window_end__quarter'}    -->
-                                <!-- col22 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10191),  -->
                                 <!--    'column_alias': 'listing__window_end__year'}       -->
-                                <!-- col23 =                                                     -->
+                                <!-- col44 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10329),       -->
+                                <!--    'column_alias': 'listing__window_end__extract_year'}  -->
+                                <!-- col45 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10353),  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10330),          -->
+                                <!--    'column_alias': 'listing__window_end__extract_quarter'}  -->
+                                <!-- col46 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10331),        -->
+                                <!--    'column_alias': 'listing__window_end__extract_month'}  -->
+                                <!-- col47 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10332),       -->
+                                <!--    'column_alias': 'listing__window_end__extract_week'}  -->
+                                <!-- col48 =                                                 -->
+                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10333),      -->
+                                <!--    'column_alias': 'listing__window_end__extract_day'}  -->
+                                <!-- col49 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10334),            -->
+                                <!--    'column_alias': 'listing__window_end__extract_dayofweek'}  -->
+                                <!-- col50 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10335),            -->
+                                <!--    'column_alias': 'listing__window_end__extract_dayofyear'}  -->
+                                <!-- col51 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10161),  -->
                                 <!--    'column_alias': 'listing__country'}                      -->
-                                <!-- col24 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10354),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10162),  -->
                                 <!--    'column_alias': 'listing__is_lux'}                       -->
-                                <!-- col25 =                                                     -->
+                                <!-- col53 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10355),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10163),  -->
                                 <!--    'column_alias': 'listing__capacity'}                     -->
-                                <!-- col26 =                                                     -->
+                                <!-- col54 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10356),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10164),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col27 =                                                     -->
+                                <!-- col55 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10357),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10165),  -->
                                 <!--    'column_alias': 'user'}                                  -->
-                                <!-- col28 =                                                     -->
+                                <!-- col56 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10358),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10166),  -->
                                 <!--    'column_alias': 'listing__user'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10017) -->
                                 <!-- where = None -->
@@ -827,64 +1415,134 @@
                                 <!--      'ds__month',                -->
                                 <!--      'ds__quarter',              -->
                                 <!--      'ds__year',                 -->
+                                <!--      'ds__day',                  -->
+                                <!--      'ds__day',                  -->
+                                <!--      'ds__day',                  -->
+                                <!--      'ds__day',                  -->
+                                <!--      'ds__day',                  -->
+                                <!--      'ds__day',                  -->
+                                <!--      'ds__day',                  -->
                                 <!--      'user__ds__day',            -->
                                 <!--      'user__ds__week',           -->
                                 <!--      'user__ds__month',          -->
                                 <!--      'user__ds__quarter',        -->
                                 <!--      'user__ds__year',           -->
+                                <!--      'user__ds__day',            -->
+                                <!--      'user__ds__day',            -->
+                                <!--      'user__ds__day',            -->
+                                <!--      'user__ds__day',            -->
+                                <!--      'user__ds__day',            -->
+                                <!--      'user__ds__day',            -->
+                                <!--      'user__ds__day',            -->
                                 <!--      'user']                     -->
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                                <!--    'column_alias': 'user__ds__day'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
+                                <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                                <!--    'column_alias': 'user__ds__week'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                                <!--    'column_alias': 'user__ds__month'}                     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
+                                <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                                <!--    'column_alias': 'user__ds__quarter'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
+                                <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
-                                <!--    'column_alias': 'user__ds__year'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
+                                <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
-                                <!--    'column_alias': 'user'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_433),  -->
-                                <!--    'column_alias': 'home_state_latest'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
+                                <!--    'column_alias': 'user__ds__day'}                       -->
+                                <!-- col13 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
+                                <!--    'column_alias': 'user__ds__week'}                      -->
+                                <!-- col14 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
+                                <!--    'column_alias': 'user__ds__month'}                     -->
+                                <!-- col15 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
+                                <!--    'column_alias': 'user__ds__quarter'}                   -->
+                                <!-- col16 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
+                                <!--    'column_alias': 'user__ds__year'}                      -->
+                                <!-- col17 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
+                                <!--    'column_alias': 'user__ds__extract_year'}              -->
+                                <!-- col18 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
+                                <!--    'column_alias': 'user__ds__extract_quarter'}           -->
+                                <!-- col19 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
+                                <!--    'column_alias': 'user__ds__extract_month'}             -->
+                                <!-- col20 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
+                                <!--    'column_alias': 'user__ds__extract_week'}              -->
+                                <!-- col21 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
+                                <!--    'column_alias': 'user__ds__extract_day'}               -->
+                                <!-- col22 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
+                                <!--    'column_alias': 'user__ds__extract_dayofweek'}         -->
+                                <!-- col23 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
+                                <!--    'column_alias': 'user__ds__extract_dayofyear'}         -->
+                                <!-- col24 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
+                                <!--    'column_alias': 'user'}                                -->
+                                <!-- col25 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
+                                <!--    'column_alias': 'home_state_latest'}                   -->
+                                <!-- col26 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
                                 <!--    'column_alias': 'user__home_state_latest'}             -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10021) -->
                                 <!-- where = None -->
@@ -893,7 +1551,7 @@
                                     <!-- node_id = ss_10021 -->
                                     <!-- col0 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10408),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10184),  -->
                                     <!--    'column_alias': 'ds__day'}                               -->
                                     <!-- col1 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -911,37 +1569,93 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10227),  -->
                                     <!--    'column_alias': 'ds__year'}                        -->
-                                    <!-- col5 =                                                      -->
+                                    <!-- col5 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10392),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}              -->
+                                    <!-- col6 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10393),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                    <!-- col7 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10394),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}             -->
+                                    <!-- col8 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10395),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}              -->
+                                    <!-- col9 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10396),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}               -->
+                                    <!-- col10 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10397),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!-- col11 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10398),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!-- col12 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10413),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10185),  -->
                                     <!--    'column_alias': 'home_state_latest'}                     -->
-                                    <!-- col6 =                                                      -->
+                                    <!-- col13 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10414),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10186),  -->
                                     <!--    'column_alias': 'user__ds__day'}                         -->
-                                    <!-- col7 =                                                -->
+                                    <!-- col14 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10228),  -->
                                     <!--    'column_alias': 'user__ds__week'}                  -->
-                                    <!-- col8 =                                                -->
+                                    <!-- col15 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10229),  -->
                                     <!--    'column_alias': 'user__ds__month'}                 -->
-                                    <!-- col9 =                                                -->
+                                    <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10230),  -->
                                     <!--    'column_alias': 'user__ds__quarter'}               -->
-                                    <!-- col10 =                                               -->
+                                    <!-- col17 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10231),  -->
                                     <!--    'column_alias': 'user__ds__year'}                  -->
-                                    <!-- col11 =                                                     -->
+                                    <!-- col18 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10399),  -->
+                                    <!--    'column_alias': 'user__ds__extract_year'}        -->
+                                    <!-- col19 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10400),  -->
+                                    <!--    'column_alias': 'user__ds__extract_quarter'}     -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10401),  -->
+                                    <!--    'column_alias': 'user__ds__extract_month'}       -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10402),  -->
+                                    <!--    'column_alias': 'user__ds__extract_week'}        -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10403),  -->
+                                    <!--    'column_alias': 'user__ds__extract_day'}         -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10404),  -->
+                                    <!--    'column_alias': 'user__ds__extract_dayofweek'}   -->
+                                    <!-- col24 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10405),  -->
+                                    <!--    'column_alias': 'user__ds__extract_dayofyear'}   -->
+                                    <!-- col25 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10419),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10187),  -->
                                     <!--    'column_alias': 'user__home_state_latest'}               -->
-                                    <!-- col12 =                                                     -->
+                                    <!-- col26 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10420),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10188),  -->
                                     <!--    'column_alias': 'user'}                                  -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10021) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
index af8393dcd6..e26de6a7d9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
@@ -4,15 +4,15 @@
         <!-- node_id = ss_12 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                        -->
         <!--   {'class': 'SqlSelectColumn',                                -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),      -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),      -->
         <!--    'column_alias': 'listing__lux_listing__is_confirmed_lux'}  -->
         <!-- col2 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
         <!-- where = None -->
@@ -21,11 +21,11 @@
             <!-- node_id = ss_11 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                        -->
             <!--   {'class': 'SqlSelectColumn',                                -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),      -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),      -->
             <!--    'column_alias': 'listing__lux_listing__is_confirmed_lux'}  -->
             <!-- col2 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -34,11 +34,11 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- group_by1 =                                                   -->
             <!--   {'class': 'SqlSelectColumn',                                -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),      -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),      -->
             <!--    'column_alias': 'listing__lux_listing__is_confirmed_lux'}  -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -48,15 +48,15 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                        -->
                 <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),      -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),      -->
                 <!--    'column_alias': 'listing__lux_listing__is_confirmed_lux'}  -->
                 <!-- col2 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -65,27 +65,27 @@
                     <!-- node_id = ss_9 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_237),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
-                    <!-- col1 =                                                         -->
-                    <!--   {'class': 'SqlSelectColumn',                                 -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),       -->
-                    <!--    'column_alias': 'listing__lux_listing__window_start__day'}  -->
-                    <!-- col2 =                                                       -->
-                    <!--   {'class': 'SqlSelectColumn',                               -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),     -->
-                    <!--    'column_alias': 'listing__lux_listing__window_end__day'}  -->
+                    <!-- col1 =                                                                       -->
+                    <!--   {'class': 'SqlSelectColumn',                                               -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),                     -->
+                    <!--    'column_alias': 'listing__lux_listing__window_start__extract_dayofweek'}  -->
+                    <!-- col2 =                                                                 -->
+                    <!--   {'class': 'SqlSelectColumn',                                         -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),               -->
+                    <!--    'column_alias': 'listing__lux_listing__window_end__extract_month'}  -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
                     <!--    'column_alias': 'listing'}                             -->
                     <!-- col4 =                                                        -->
                     <!--   {'class': 'SqlSelectColumn',                                -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),      -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),      -->
                     <!--    'column_alias': 'listing__lux_listing__is_confirmed_lux'}  -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_236),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_5) -->
                     <!-- join_0 =                                                  -->
@@ -102,15 +102,15 @@
                         <!-- node_id = ss_5 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_186),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_187),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
                         <!--    'column_alias': 'listing'}                             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_185),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_4) -->
                         <!-- where = None -->
@@ -119,203 +119,371 @@
                             <!-- node_id = ss_4 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_142),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_143),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_144),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_145),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_146),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_147),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_148),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_149),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_150),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_151),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_152),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_153),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_154),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_155),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_156),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_157),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_158),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_159),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_160),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_161),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_162),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_163),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_164),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_165),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_166),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_167),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_168),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_169),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_170),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_171),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_172),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_173),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_174),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_175),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_176),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_177),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_178),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_179),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_180),  -->
-                            <!--    'column_alias': 'user'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_181),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_182),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_183),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_184),  -->
-                            <!--    'column_alias': 'booking__user'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_140),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_141),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_135),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_136),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_137),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_138),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_139),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!-- col50 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!-- col51 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!-- col52 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
+                            <!--    'column_alias': 'user'}                                -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
+                            <!--    'column_alias': 'booking__user'}                       -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10015) -->
                             <!-- where = None -->
@@ -332,27 +500,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10279),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10280),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10281),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10129),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10282),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10130),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10283),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10131),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10284),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10132),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col8 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -370,141 +538,309 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10155),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col12 =                                                     -->
+                                <!-- col12 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10266),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col13 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10267),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col14 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10268),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col15 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10269),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col16 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10270),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col17 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10271),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col18 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10272),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col19 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10289),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10133),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col13 =                                               -->
+                                <!-- col20 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10156),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col14 =                                               -->
+                                <!-- col21 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10157),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col15 =                                               -->
+                                <!-- col22 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10158),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col16 =                                               -->
+                                <!-- col23 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10159),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col17 =                                                     -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10273),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col25 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10274),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col26 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10275),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col27 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10276),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col28 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10277),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col29 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10278),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col30 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10279),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col31 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10294),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10134),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col18 =                                               -->
+                                <!-- col32 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10160),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col19 =                                               -->
+                                <!-- col33 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10161),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col20 =                                               -->
+                                <!-- col34 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10162),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col21 =                                               -->
+                                <!-- col35 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10163),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col22 =                                                     -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10280),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10281),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10282),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col39 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10283),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col40 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10284),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col41 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10285),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col42 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10286),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col43 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10299),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10135),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col23 =                                                     -->
+                                <!-- col44 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10300),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10136),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col24 =                                               -->
+                                <!-- col45 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10164),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col25 =                                               -->
+                                <!-- col46 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10165),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col26 =                                               -->
+                                <!-- col47 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10166),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col27 =                                               -->
+                                <!-- col48 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10167),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col28 =                                                     -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10287),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10288),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col51 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10289),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col52 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10290),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col53 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10291),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col54 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10292),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col55 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10293),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col56 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10305),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10137),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col29 =                                               -->
+                                <!-- col57 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10168),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col30 =                                               -->
+                                <!-- col58 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10169),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col31 =                                                 -->
+                                <!-- col59 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10170),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col32 =                                               -->
+                                <!-- col60 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10171),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col33 =                                                     -->
+                                <!-- col61 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10294),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col62 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10295),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col63 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10296),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col64 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10297),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col65 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10310),  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10298),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col66 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10299),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col67 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10300),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col68 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10138),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col34 =                                               -->
+                                <!-- col69 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10172),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col35 =                                               -->
+                                <!-- col70 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10173),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col36 =                                               -->
+                                <!-- col71 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10174),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col37 =                                               -->
+                                <!-- col72 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10175),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col38 =                                                     -->
+                                <!-- col73 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10301),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col74 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10302),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col75 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10303),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col76 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10304),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col77 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10305),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col78 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10306),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col79 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10307),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col80 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10315),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10139),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col39 =                                                     -->
+                                <!-- col81 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10316),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10140),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col40 =                                                     -->
+                                <!-- col82 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10317),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10141),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col41 =                                                     -->
+                                <!-- col83 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10318),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10142),  -->
                                 <!--    'column_alias': 'user'}                                  -->
-                                <!-- col42 =                                                     -->
+                                <!-- col84 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10319),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10143),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col43 =                                                     -->
+                                <!-- col85 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10320),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10144),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col44 =                                                     -->
+                                <!-- col86 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10321),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10145),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
-                                <!-- col45 =                                                     -->
+                                <!-- col87 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10322),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10146),  -->
                                 <!--    'column_alias': 'booking__user'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10015) -->
                                 <!-- where = None -->
@@ -524,21 +860,21 @@
                         <!--      'lux_listing__window_end__day',    -->
                         <!--      'listing']                         -->
                         <!-- node_id = ss_8 -->
-                        <!-- col0 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_228),  -->
-                        <!--    'column_alias': 'lux_listing__window_start__day'}      -->
-                        <!-- col1 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_229),  -->
-                        <!--    'column_alias': 'lux_listing__window_end__day'}        -->
+                        <!-- col0 =                                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),            -->
+                        <!--    'column_alias': 'lux_listing__window_start__extract_dayofweek'}  -->
+                        <!-- col1 =                                                        -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),      -->
+                        <!--    'column_alias': 'lux_listing__window_end__extract_month'}  -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_230),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
                         <!--    'column_alias': 'listing'}                             -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_227),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
                         <!--    'column_alias': 'lux_listing__is_confirmed_lux'}       -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -547,59 +883,115 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_217),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_413),  -->
                             <!--    'column_alias': 'lux_listing__window_start__day'}      -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_218),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
                             <!--    'column_alias': 'lux_listing__window_start__week'}     -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_219),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
                             <!--    'column_alias': 'lux_listing__window_start__month'}    -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_220),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_416),  -->
                             <!--    'column_alias': 'lux_listing__window_start__quarter'}  -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_221),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_417),  -->
                             <!--    'column_alias': 'lux_listing__window_start__year'}     -->
-                            <!-- col5 =                                                    -->
+                            <!-- col5 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_418),       -->
+                            <!--    'column_alias': 'lux_listing__window_start__extract_year'}  -->
+                            <!-- col6 =                                                            -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_419),          -->
+                            <!--    'column_alias': 'lux_listing__window_start__extract_quarter'}  -->
+                            <!-- col7 =                                                          -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_420),        -->
+                            <!--    'column_alias': 'lux_listing__window_start__extract_month'}  -->
+                            <!-- col8 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_421),       -->
+                            <!--    'column_alias': 'lux_listing__window_start__extract_week'}  -->
+                            <!-- col9 =                                                        -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_422),      -->
+                            <!--    'column_alias': 'lux_listing__window_start__extract_day'}  -->
+                            <!-- col10 =                                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_423),            -->
+                            <!--    'column_alias': 'lux_listing__window_start__extract_dayofweek'}  -->
+                            <!-- col11 =                                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_424),            -->
+                            <!--    'column_alias': 'lux_listing__window_start__extract_dayofyear'}  -->
+                            <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_222),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_425),  -->
                             <!--    'column_alias': 'lux_listing__window_end__day'}        -->
-                            <!-- col6 =                                                    -->
+                            <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_223),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_426),  -->
                             <!--    'column_alias': 'lux_listing__window_end__week'}       -->
-                            <!-- col7 =                                                    -->
+                            <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_224),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_427),  -->
                             <!--    'column_alias': 'lux_listing__window_end__month'}      -->
-                            <!-- col8 =                                                    -->
+                            <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_225),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_428),  -->
                             <!--    'column_alias': 'lux_listing__window_end__quarter'}    -->
-                            <!-- col9 =                                                    -->
+                            <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_226),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_429),  -->
                             <!--    'column_alias': 'lux_listing__window_end__year'}       -->
-                            <!-- col10 =                                                   -->
+                            <!-- col17 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_430),     -->
+                            <!--    'column_alias': 'lux_listing__window_end__extract_year'}  -->
+                            <!-- col18 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_431),        -->
+                            <!--    'column_alias': 'lux_listing__window_end__extract_quarter'}  -->
+                            <!-- col19 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_432),      -->
+                            <!--    'column_alias': 'lux_listing__window_end__extract_month'}  -->
+                            <!-- col20 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_433),     -->
+                            <!--    'column_alias': 'lux_listing__window_end__extract_week'}  -->
+                            <!-- col21 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),    -->
+                            <!--    'column_alias': 'lux_listing__window_end__extract_day'}  -->
+                            <!-- col22 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),          -->
+                            <!--    'column_alias': 'lux_listing__window_end__extract_dayofweek'}  -->
+                            <!-- col23 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),          -->
+                            <!--    'column_alias': 'lux_listing__window_end__extract_dayofyear'}  -->
+                            <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_213),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),  -->
                             <!--    'column_alias': 'listing'}                             -->
-                            <!-- col11 =                                                   -->
+                            <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_214),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_410),  -->
                             <!--    'column_alias': 'lux_listing'}                         -->
-                            <!-- col12 =                                                   -->
+                            <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_215),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
                             <!--    'column_alias': 'listing__lux_listing'}                -->
-                            <!-- col13 =                                                   -->
+                            <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_216),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_412),  -->
                             <!--    'column_alias': 'lux_listing__is_confirmed_lux'}       -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10018) -->
                             <!-- join_0 =                                                    -->
@@ -614,15 +1006,15 @@
                                 <!-- node_id = ss_10018 -->
                                 <!-- col0 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10359),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10167),  -->
                                 <!--    'column_alias': 'listing'}                               -->
                                 <!-- col1 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10360),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10168),  -->
                                 <!--    'column_alias': 'lux_listing'}                           -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10361),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10169),  -->
                                 <!--    'column_alias': 'listing__lux_listing'}                  -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10018) -->
                                 <!-- where = None -->
@@ -643,114 +1035,254 @@
                                 <!--      'window_start__month',                 -->
                                 <!--      'window_start__quarter',               -->
                                 <!--      'window_start__year',                  -->
+                                <!--      'window_start__day',                   -->
+                                <!--      'window_start__day',                   -->
+                                <!--      'window_start__day',                   -->
+                                <!--      'window_start__day',                   -->
+                                <!--      'window_start__day',                   -->
+                                <!--      'window_start__day',                   -->
+                                <!--      'window_start__day',                   -->
                                 <!--      'window_end__day',                     -->
                                 <!--      'window_end__week',                    -->
                                 <!--      'window_end__month',                   -->
                                 <!--      'window_end__quarter',                 -->
                                 <!--      'window_end__year',                    -->
+                                <!--      'window_end__day',                     -->
+                                <!--      'window_end__day',                     -->
+                                <!--      'window_end__day',                     -->
+                                <!--      'window_end__day',                     -->
+                                <!--      'window_end__day',                     -->
+                                <!--      'window_end__day',                     -->
+                                <!--      'window_end__day',                     -->
                                 <!--      'lux_listing__window_start__day',      -->
                                 <!--      'lux_listing__window_start__week',     -->
                                 <!--      'lux_listing__window_start__month',    -->
                                 <!--      'lux_listing__window_start__quarter',  -->
                                 <!--      'lux_listing__window_start__year',     -->
+                                <!--      'lux_listing__window_start__day',      -->
+                                <!--      'lux_listing__window_start__day',      -->
+                                <!--      'lux_listing__window_start__day',      -->
+                                <!--      'lux_listing__window_start__day',      -->
+                                <!--      'lux_listing__window_start__day',      -->
+                                <!--      'lux_listing__window_start__day',      -->
+                                <!--      'lux_listing__window_start__day',      -->
                                 <!--      'lux_listing__window_end__day',        -->
                                 <!--      'lux_listing__window_end__week',       -->
                                 <!--      'lux_listing__window_end__month',      -->
                                 <!--      'lux_listing__window_end__quarter',    -->
                                 <!--      'lux_listing__window_end__year',       -->
+                                <!--      'lux_listing__window_end__day',        -->
+                                <!--      'lux_listing__window_end__day',        -->
+                                <!--      'lux_listing__window_end__day',        -->
+                                <!--      'lux_listing__window_end__day',        -->
+                                <!--      'lux_listing__window_end__day',        -->
+                                <!--      'lux_listing__window_end__day',        -->
+                                <!--      'lux_listing__window_end__day',        -->
                                 <!--      'lux_listing']                         -->
                                 <!-- node_id = ss_6 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_190),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_358),  -->
                                 <!--    'column_alias': 'window_start__day'}                   -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_191),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
                                 <!--    'column_alias': 'window_start__week'}                  -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_192),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
                                 <!--    'column_alias': 'window_start__month'}                 -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_193),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
                                 <!--    'column_alias': 'window_start__quarter'}               -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_194),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_362),  -->
                                 <!--    'column_alias': 'window_start__year'}                  -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_195),  -->
-                                <!--    'column_alias': 'window_end__day'}                     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_363),  -->
+                                <!--    'column_alias': 'window_start__extract_year'}          -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_196),  -->
-                                <!--    'column_alias': 'window_end__week'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
+                                <!--    'column_alias': 'window_start__extract_quarter'}       -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_197),  -->
-                                <!--    'column_alias': 'window_end__month'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
+                                <!--    'column_alias': 'window_start__extract_month'}         -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_198),  -->
-                                <!--    'column_alias': 'window_end__quarter'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),  -->
+                                <!--    'column_alias': 'window_start__extract_week'}          -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_199),  -->
-                                <!--    'column_alias': 'window_end__year'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_367),  -->
+                                <!--    'column_alias': 'window_start__extract_day'}           -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_200),  -->
-                                <!--    'column_alias': 'lux_listing__window_start__day'}      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),  -->
+                                <!--    'column_alias': 'window_start__extract_dayofweek'}     -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_201),  -->
-                                <!--    'column_alias': 'lux_listing__window_start__week'}     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_369),  -->
+                                <!--    'column_alias': 'window_start__extract_dayofyear'}     -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_202),  -->
-                                <!--    'column_alias': 'lux_listing__window_start__month'}    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),  -->
+                                <!--    'column_alias': 'window_end__day'}                     -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_203),  -->
-                                <!--    'column_alias': 'lux_listing__window_start__quarter'}  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),  -->
+                                <!--    'column_alias': 'window_end__week'}                    -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_204),  -->
-                                <!--    'column_alias': 'lux_listing__window_start__year'}     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_372),  -->
+                                <!--    'column_alias': 'window_end__month'}                   -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_205),  -->
-                                <!--    'column_alias': 'lux_listing__window_end__day'}        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_373),  -->
+                                <!--    'column_alias': 'window_end__quarter'}                 -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_206),  -->
-                                <!--    'column_alias': 'lux_listing__window_end__week'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
+                                <!--    'column_alias': 'window_end__year'}                    -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_207),  -->
-                                <!--    'column_alias': 'lux_listing__window_end__month'}      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_375),  -->
+                                <!--    'column_alias': 'window_end__extract_year'}            -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_208),  -->
-                                <!--    'column_alias': 'lux_listing__window_end__quarter'}    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_376),  -->
+                                <!--    'column_alias': 'window_end__extract_quarter'}         -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_209),  -->
-                                <!--    'column_alias': 'lux_listing__window_end__year'}       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_377),  -->
+                                <!--    'column_alias': 'window_end__extract_month'}           -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_210),  -->
-                                <!--    'column_alias': 'lux_listing'}                         -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_378),  -->
+                                <!--    'column_alias': 'window_end__extract_week'}            -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_188),  -->
-                                <!--    'column_alias': 'is_confirmed_lux'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_379),  -->
+                                <!--    'column_alias': 'window_end__extract_day'}             -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_189),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),  -->
+                                <!--    'column_alias': 'window_end__extract_dayofweek'}       -->
+                                <!-- col23 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),  -->
+                                <!--    'column_alias': 'window_end__extract_dayofyear'}       -->
+                                <!-- col24 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
+                                <!--    'column_alias': 'lux_listing__window_start__day'}      -->
+                                <!-- col25 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
+                                <!--    'column_alias': 'lux_listing__window_start__week'}     -->
+                                <!-- col26 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
+                                <!--    'column_alias': 'lux_listing__window_start__month'}    -->
+                                <!-- col27 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
+                                <!--    'column_alias': 'lux_listing__window_start__quarter'}  -->
+                                <!-- col28 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
+                                <!--    'column_alias': 'lux_listing__window_start__year'}     -->
+                                <!-- col29 =                                                        -->
+                                <!--   {'class': 'SqlSelectColumn',                                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),       -->
+                                <!--    'column_alias': 'lux_listing__window_start__extract_year'}  -->
+                                <!-- col30 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),          -->
+                                <!--    'column_alias': 'lux_listing__window_start__extract_quarter'}  -->
+                                <!-- col31 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),        -->
+                                <!--    'column_alias': 'lux_listing__window_start__extract_month'}  -->
+                                <!-- col32 =                                                        -->
+                                <!--   {'class': 'SqlSelectColumn',                                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),       -->
+                                <!--    'column_alias': 'lux_listing__window_start__extract_week'}  -->
+                                <!-- col33 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),      -->
+                                <!--    'column_alias': 'lux_listing__window_start__extract_day'}  -->
+                                <!-- col34 =                                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),            -->
+                                <!--    'column_alias': 'lux_listing__window_start__extract_dayofweek'}  -->
+                                <!-- col35 =                                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),            -->
+                                <!--    'column_alias': 'lux_listing__window_start__extract_dayofyear'}  -->
+                                <!-- col36 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
+                                <!--    'column_alias': 'lux_listing__window_end__day'}        -->
+                                <!-- col37 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
+                                <!--    'column_alias': 'lux_listing__window_end__week'}       -->
+                                <!-- col38 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
+                                <!--    'column_alias': 'lux_listing__window_end__month'}      -->
+                                <!-- col39 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
+                                <!--    'column_alias': 'lux_listing__window_end__quarter'}    -->
+                                <!-- col40 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
+                                <!--    'column_alias': 'lux_listing__window_end__year'}       -->
+                                <!-- col41 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),     -->
+                                <!--    'column_alias': 'lux_listing__window_end__extract_year'}  -->
+                                <!-- col42 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),        -->
+                                <!--    'column_alias': 'lux_listing__window_end__extract_quarter'}  -->
+                                <!-- col43 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),      -->
+                                <!--    'column_alias': 'lux_listing__window_end__extract_month'}  -->
+                                <!-- col44 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),     -->
+                                <!--    'column_alias': 'lux_listing__window_end__extract_week'}  -->
+                                <!-- col45 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),    -->
+                                <!--    'column_alias': 'lux_listing__window_end__extract_day'}  -->
+                                <!-- col46 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),          -->
+                                <!--    'column_alias': 'lux_listing__window_end__extract_dayofweek'}  -->
+                                <!-- col47 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),          -->
+                                <!--    'column_alias': 'lux_listing__window_end__extract_dayofyear'}  -->
+                                <!-- col48 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
+                                <!--    'column_alias': 'lux_listing'}                         -->
+                                <!-- col49 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
+                                <!--    'column_alias': 'is_confirmed_lux'}                    -->
+                                <!-- col50 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_357),  -->
                                 <!--    'column_alias': 'lux_listing__is_confirmed_lux'}       -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10019) -->
                                 <!-- where = None -->
@@ -759,7 +1291,7 @@
                                     <!-- node_id = ss_10019 -->
                                     <!-- col0 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10362),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10170),  -->
                                     <!--    'column_alias': 'window_start__day'}                     -->
                                     <!-- col1 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -777,77 +1309,189 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10195),  -->
                                     <!--    'column_alias': 'window_start__year'}              -->
-                                    <!-- col5 =                                                      -->
+                                    <!-- col5 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10336),  -->
+                                    <!--    'column_alias': 'window_start__extract_year'}    -->
+                                    <!-- col6 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10337),   -->
+                                    <!--    'column_alias': 'window_start__extract_quarter'}  -->
+                                    <!-- col7 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10338),  -->
+                                    <!--    'column_alias': 'window_start__extract_month'}   -->
+                                    <!-- col8 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10339),  -->
+                                    <!--    'column_alias': 'window_start__extract_week'}    -->
+                                    <!-- col9 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10340),  -->
+                                    <!--    'column_alias': 'window_start__extract_day'}     -->
+                                    <!-- col10 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10341),     -->
+                                    <!--    'column_alias': 'window_start__extract_dayofweek'}  -->
+                                    <!-- col11 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10342),     -->
+                                    <!--    'column_alias': 'window_start__extract_dayofyear'}  -->
+                                    <!-- col12 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10367),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10171),  -->
                                     <!--    'column_alias': 'window_end__day'}                       -->
-                                    <!-- col6 =                                                -->
+                                    <!-- col13 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10196),  -->
                                     <!--    'column_alias': 'window_end__week'}                -->
-                                    <!-- col7 =                                                -->
+                                    <!-- col14 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10197),  -->
                                     <!--    'column_alias': 'window_end__month'}               -->
-                                    <!-- col8 =                                                -->
+                                    <!-- col15 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10198),  -->
                                     <!--    'column_alias': 'window_end__quarter'}             -->
-                                    <!-- col9 =                                                -->
+                                    <!-- col16 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10199),  -->
                                     <!--    'column_alias': 'window_end__year'}                -->
-                                    <!-- col10 =                                                     -->
+                                    <!-- col17 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10343),  -->
+                                    <!--    'column_alias': 'window_end__extract_year'}      -->
+                                    <!-- col18 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10344),  -->
+                                    <!--    'column_alias': 'window_end__extract_quarter'}   -->
+                                    <!-- col19 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10345),  -->
+                                    <!--    'column_alias': 'window_end__extract_month'}     -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10346),  -->
+                                    <!--    'column_alias': 'window_end__extract_week'}      -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10347),  -->
+                                    <!--    'column_alias': 'window_end__extract_day'}       -->
+                                    <!-- col22 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10348),   -->
+                                    <!--    'column_alias': 'window_end__extract_dayofweek'}  -->
+                                    <!-- col23 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10349),   -->
+                                    <!--    'column_alias': 'window_end__extract_dayofyear'}  -->
+                                    <!-- col24 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10372),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10172),  -->
                                     <!--    'column_alias': 'is_confirmed_lux'}                      -->
-                                    <!-- col11 =                                                     -->
+                                    <!-- col25 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10373),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10173),  -->
                                     <!--    'column_alias': 'lux_listing__window_start__day'}        -->
-                                    <!-- col12 =                                                -->
+                                    <!-- col26 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                         -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10200),   -->
                                     <!--    'column_alias': 'lux_listing__window_start__week'}  -->
-                                    <!-- col13 =                                                 -->
+                                    <!-- col27 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10201),    -->
                                     <!--    'column_alias': 'lux_listing__window_start__month'}  -->
-                                    <!-- col14 =                                                   -->
+                                    <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10202),      -->
                                     <!--    'column_alias': 'lux_listing__window_start__quarter'}  -->
-                                    <!-- col15 =                                                -->
+                                    <!-- col29 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                         -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10203),   -->
                                     <!--    'column_alias': 'lux_listing__window_start__year'}  -->
-                                    <!-- col16 =                                                     -->
+                                    <!-- col30 =                                                        -->
+                                    <!--   {'class': 'SqlSelectColumn',                                 -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10350),             -->
+                                    <!--    'column_alias': 'lux_listing__window_start__extract_year'}  -->
+                                    <!-- col31 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10351),                -->
+                                    <!--    'column_alias': 'lux_listing__window_start__extract_quarter'}  -->
+                                    <!-- col32 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10352),              -->
+                                    <!--    'column_alias': 'lux_listing__window_start__extract_month'}  -->
+                                    <!-- col33 =                                                        -->
+                                    <!--   {'class': 'SqlSelectColumn',                                 -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10353),             -->
+                                    <!--    'column_alias': 'lux_listing__window_start__extract_week'}  -->
+                                    <!-- col34 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10354),            -->
+                                    <!--    'column_alias': 'lux_listing__window_start__extract_day'}  -->
+                                    <!-- col35 =                                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10355),                  -->
+                                    <!--    'column_alias': 'lux_listing__window_start__extract_dayofweek'}  -->
+                                    <!-- col36 =                                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10356),                  -->
+                                    <!--    'column_alias': 'lux_listing__window_start__extract_dayofyear'}  -->
+                                    <!-- col37 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10378),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10174),  -->
                                     <!--    'column_alias': 'lux_listing__window_end__day'}          -->
-                                    <!-- col17 =                                               -->
+                                    <!-- col38 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10204),  -->
                                     <!--    'column_alias': 'lux_listing__window_end__week'}   -->
-                                    <!-- col18 =                                               -->
+                                    <!-- col39 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10205),  -->
                                     <!--    'column_alias': 'lux_listing__window_end__month'}  -->
-                                    <!-- col19 =                                                 -->
+                                    <!-- col40 =                                                 -->
                                     <!--   {'class': 'SqlSelectColumn',                          -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10206),    -->
                                     <!--    'column_alias': 'lux_listing__window_end__quarter'}  -->
-                                    <!-- col20 =                                               -->
+                                    <!-- col41 =                                               -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10207),  -->
                                     <!--    'column_alias': 'lux_listing__window_end__year'}   -->
-                                    <!-- col21 =                                                     -->
+                                    <!-- col42 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10357),           -->
+                                    <!--    'column_alias': 'lux_listing__window_end__extract_year'}  -->
+                                    <!-- col43 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10358),              -->
+                                    <!--    'column_alias': 'lux_listing__window_end__extract_quarter'}  -->
+                                    <!-- col44 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10359),            -->
+                                    <!--    'column_alias': 'lux_listing__window_end__extract_month'}  -->
+                                    <!-- col45 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10360),           -->
+                                    <!--    'column_alias': 'lux_listing__window_end__extract_week'}  -->
+                                    <!-- col46 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10361),          -->
+                                    <!--    'column_alias': 'lux_listing__window_end__extract_day'}  -->
+                                    <!-- col47 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10362),                -->
+                                    <!--    'column_alias': 'lux_listing__window_end__extract_dayofweek'}  -->
+                                    <!-- col48 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10363),                -->
+                                    <!--    'column_alias': 'lux_listing__window_end__extract_dayofyear'}  -->
+                                    <!-- col49 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10383),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10175),  -->
                                     <!--    'column_alias': 'lux_listing__is_confirmed_lux'}         -->
-                                    <!-- col22 =                                                     -->
+                                    <!-- col50 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10384),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10176),  -->
                                     <!--    'column_alias': 'lux_listing'}                           -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10019) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml
index dfaf625e64..86c66d0258 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml
@@ -60,27 +60,27 @@
                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                 <!-- col2 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                 <!--    'column_alias': 'booking_value'}                         -->
                 <!-- col3 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                 <!--    'column_alias': 'max_booking_value'}                     -->
                 <!-- col4 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                 <!--    'column_alias': 'min_booking_value'}                     -->
                 <!-- col5 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                 <!--    'column_alias': 'bookers'}                               -->
                 <!-- col6 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                 <!--    'column_alias': 'average_booking_value'}                 -->
                 <!-- col7 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                 <!--    'column_alias': 'booking_payments'}                      -->
                 <!-- col8 =                                                                                                           -->
                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -88,31 +88,31 @@
                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                 <!-- col9 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                 <!--    'column_alias': 'median_booking_value'}                  -->
                 <!-- col10 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                 <!--    'column_alias': 'booking_value_p99'}                     -->
                 <!-- col11 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                 <!-- col12 =                                                         -->
                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                 <!-- col13 =                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                 <!-- col14 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                 <!--    'column_alias': 'is_instant'}                            -->
                 <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                 <!--    'column_alias': 'ds__day'}                               -->
                 <!-- col16 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -130,133 +130,301 @@
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                 <!--    'column_alias': 'ds__year'}                        -->
-                <!-- col20 =                                                     -->
+                <!-- col20 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                <!--    'column_alias': 'ds__extract_year'}              -->
+                <!-- col21 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                <!-- col22 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                <!--    'column_alias': 'ds__extract_month'}             -->
+                <!-- col23 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                <!--    'column_alias': 'ds__extract_week'}              -->
+                <!-- col24 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                <!--    'column_alias': 'ds__extract_day'}               -->
+                <!-- col25 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!-- col26 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                <!-- col21 =                                               -->
+                <!-- col28 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                <!-- col22 =                                               -->
+                <!-- col29 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                <!-- col23 =                                               -->
+                <!-- col30 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                <!-- col24 =                                               -->
+                <!-- col31 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                <!-- col25 =                                                     -->
+                <!-- col32 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                <!-- col33 =                                                -->
+                <!--   {'class': 'SqlSelectColumn',                         -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                <!-- col34 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                <!-- col35 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                <!-- col36 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                <!-- col37 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                <!-- col38 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                <!-- col39 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                 <!--    'column_alias': 'paid_at__day'}                          -->
-                <!-- col26 =                                               -->
+                <!-- col40 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                 <!--    'column_alias': 'paid_at__week'}                   -->
-                <!-- col27 =                                               -->
+                <!-- col41 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                 <!--    'column_alias': 'paid_at__month'}                  -->
-                <!-- col28 =                                               -->
+                <!-- col42 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                <!-- col29 =                                               -->
+                <!-- col43 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                 <!--    'column_alias': 'paid_at__year'}                   -->
-                <!-- col30 =                                                     -->
+                <!-- col44 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                <!-- col45 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                <!-- col46 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                <!-- col47 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                <!-- col48 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                <!-- col49 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                <!-- col50 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                <!-- col51 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                <!-- col31 =                                                     -->
+                <!-- col52 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                <!-- col32 =                                               -->
+                <!-- col53 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                 <!--    'column_alias': 'booking__ds__week'}               -->
-                <!-- col33 =                                               -->
+                <!-- col54 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                 <!--    'column_alias': 'booking__ds__month'}              -->
-                <!-- col34 =                                               -->
+                <!-- col55 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                <!-- col35 =                                               -->
+                <!-- col56 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                 <!--    'column_alias': 'booking__ds__year'}               -->
-                <!-- col36 =                                                     -->
-                <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                <!-- col57 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                <!-- col58 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                <!-- col59 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                <!-- col60 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                <!-- col61 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                <!-- col62 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                <!-- col63 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                <!-- col64 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                <!-- col37 =                                               -->
+                <!-- col65 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                <!-- col38 =                                               -->
+                <!-- col66 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                <!-- col39 =                                                 -->
+                <!-- col67 =                                                 -->
                 <!--   {'class': 'SqlSelectColumn',                          -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                <!-- col40 =                                               -->
+                <!-- col68 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                <!-- col41 =                                                     -->
-                <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                <!-- col69 =                                                      -->
+                <!--   {'class': 'SqlSelectColumn',                               -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                <!-- col70 =                                                         -->
+                <!--   {'class': 'SqlSelectColumn',                                  -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                <!-- col71 =                                                       -->
+                <!--   {'class': 'SqlSelectColumn',                                -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                <!-- col72 =                                                      -->
+                <!--   {'class': 'SqlSelectColumn',                               -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                <!-- col73 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                <!-- col74 =                                                           -->
+                <!--   {'class': 'SqlSelectColumn',                                    -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                <!-- col75 =                                                           -->
+                <!--   {'class': 'SqlSelectColumn',                                    -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                <!-- col76 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                <!-- col42 =                                               -->
+                <!-- col77 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                <!-- col43 =                                               -->
+                <!-- col78 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                <!-- col44 =                                               -->
+                <!-- col79 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                <!-- col45 =                                               -->
+                <!-- col80 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                <!-- col46 =                                                     -->
+                <!-- col81 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                <!-- col82 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                <!-- col83 =                                                -->
+                <!--   {'class': 'SqlSelectColumn',                         -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                <!-- col84 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                <!-- col85 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                <!-- col86 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                             -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                <!-- col87 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                             -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                <!-- col88 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                 <!--    'column_alias': 'listing'}                               -->
-                <!-- col47 =                                                     -->
+                <!-- col89 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                 <!--    'column_alias': 'guest'}                                 -->
-                <!-- col48 =                                                     -->
+                <!-- col90 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                 <!--    'column_alias': 'host'}                                  -->
-                <!-- col49 =                                                     -->
+                <!-- col91 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                 <!--    'column_alias': 'booking__listing'}                      -->
-                <!-- col50 =                                                     -->
+                <!-- col92 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                 <!--    'column_alias': 'booking__guest'}                        -->
-                <!-- col51 =                                                     -->
+                <!-- col93 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                 <!--    'column_alias': 'booking__host'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                 <!-- where = None -->
@@ -291,15 +459,15 @@
                 <!--    'column_alias': 'listings'}                                 -->
                 <!-- col1 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                 <!--    'column_alias': 'largest_listing'}                       -->
                 <!-- col2 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                 <!--    'column_alias': 'smallest_listing'}                      -->
                 <!-- col3 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                 <!--    'column_alias': 'ds__day'}                               -->
                 <!-- col4 =                                                -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -317,101 +485,213 @@
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                 <!--    'column_alias': 'ds__year'}                        -->
-                <!-- col8 =                                                      -->
+                <!-- col8 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                <!--    'column_alias': 'ds__extract_year'}              -->
+                <!-- col9 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                <!-- col10 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                <!--    'column_alias': 'ds__extract_month'}             -->
+                <!-- col11 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                <!--    'column_alias': 'ds__extract_week'}              -->
+                <!-- col12 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                <!--    'column_alias': 'ds__extract_day'}               -->
+                <!-- col13 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!-- col14 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                 <!--    'column_alias': 'created_at__day'}                       -->
-                <!-- col9 =                                                -->
+                <!-- col16 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                 <!--    'column_alias': 'created_at__week'}                -->
-                <!-- col10 =                                               -->
+                <!-- col17 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                 <!--    'column_alias': 'created_at__month'}               -->
-                <!-- col11 =                                               -->
+                <!-- col18 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                 <!--    'column_alias': 'created_at__quarter'}             -->
-                <!-- col12 =                                               -->
+                <!-- col19 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                 <!--    'column_alias': 'created_at__year'}                -->
-                <!-- col13 =                                                     -->
+                <!-- col20 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                <!--    'column_alias': 'created_at__extract_year'}      -->
+                <!-- col21 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                <!-- col22 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                <!--    'column_alias': 'created_at__extract_month'}     -->
+                <!-- col23 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                <!--    'column_alias': 'created_at__extract_week'}      -->
+                <!-- col24 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                <!--    'column_alias': 'created_at__extract_day'}       -->
+                <!-- col25 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                <!-- col26 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                 <!--    'column_alias': 'country_latest'}                        -->
-                <!-- col14 =                                                     -->
+                <!-- col28 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                 <!--    'column_alias': 'is_lux_latest'}                         -->
-                <!-- col15 =                                                     -->
+                <!-- col29 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                 <!--    'column_alias': 'capacity_latest'}                       -->
-                <!-- col16 =                                                     -->
+                <!-- col30 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                 <!--    'column_alias': 'listing__ds__day'}                      -->
-                <!-- col17 =                                               -->
+                <!-- col31 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                 <!--    'column_alias': 'listing__ds__week'}               -->
-                <!-- col18 =                                               -->
+                <!-- col32 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                 <!--    'column_alias': 'listing__ds__month'}              -->
-                <!-- col19 =                                               -->
+                <!-- col33 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                 <!--    'column_alias': 'listing__ds__quarter'}            -->
-                <!-- col20 =                                               -->
+                <!-- col34 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                 <!--    'column_alias': 'listing__ds__year'}               -->
-                <!-- col21 =                                                     -->
+                <!-- col35 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                <!-- col36 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                <!-- col37 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                <!-- col38 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                <!-- col39 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                <!-- col40 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                <!-- col41 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                <!-- col42 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                 <!--    'column_alias': 'listing__created_at__day'}              -->
-                <!-- col22 =                                               -->
+                <!-- col43 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                 <!--    'column_alias': 'listing__created_at__week'}       -->
-                <!-- col23 =                                               -->
+                <!-- col44 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                 <!--    'column_alias': 'listing__created_at__month'}      -->
-                <!-- col24 =                                               -->
+                <!-- col45 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                 <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                <!-- col25 =                                               -->
+                <!-- col46 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                 <!--    'column_alias': 'listing__created_at__year'}       -->
-                <!-- col26 =                                                     -->
+                <!-- col47 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                <!-- col48 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                <!-- col49 =                                                   -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                <!-- col50 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                <!-- col51 =                                                 -->
+                <!--   {'class': 'SqlSelectColumn',                          -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                <!-- col52 =                                                       -->
+                <!--   {'class': 'SqlSelectColumn',                                -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                <!-- col53 =                                                       -->
+                <!--   {'class': 'SqlSelectColumn',                                -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                <!-- col54 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                 <!--    'column_alias': 'listing__country_latest'}               -->
-                <!-- col27 =                                                     -->
+                <!-- col55 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                 <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                <!-- col28 =                                                     -->
+                <!-- col56 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                 <!--    'column_alias': 'listing__capacity_latest'}              -->
-                <!-- col29 =                                                     -->
+                <!-- col57 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                 <!--    'column_alias': 'listing'}                               -->
-                <!-- col30 =                                                     -->
+                <!-- col58 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                 <!--    'column_alias': 'user'}                                  -->
-                <!-- col31 =                                                     -->
+                <!-- col59 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                 <!--    'column_alias': 'listing__user'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                 <!-- where = None -->
@@ -446,15 +726,15 @@
                 <!--    'column_alias': 'listings'}                                 -->
                 <!-- col1 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                 <!--    'column_alias': 'largest_listing'}                       -->
                 <!-- col2 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                 <!--    'column_alias': 'smallest_listing'}                      -->
                 <!-- col3 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                 <!--    'column_alias': 'ds__day'}                               -->
                 <!-- col4 =                                                -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -472,101 +752,213 @@
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                 <!--    'column_alias': 'ds__year'}                        -->
-                <!-- col8 =                                                      -->
+                <!-- col8 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                <!--    'column_alias': 'ds__extract_year'}              -->
+                <!-- col9 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                <!-- col10 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                <!--    'column_alias': 'ds__extract_month'}             -->
+                <!-- col11 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                <!--    'column_alias': 'ds__extract_week'}              -->
+                <!-- col12 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                <!--    'column_alias': 'ds__extract_day'}               -->
+                <!-- col13 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!-- col14 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                 <!--    'column_alias': 'created_at__day'}                       -->
-                <!-- col9 =                                                -->
+                <!-- col16 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                 <!--    'column_alias': 'created_at__week'}                -->
-                <!-- col10 =                                               -->
+                <!-- col17 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                 <!--    'column_alias': 'created_at__month'}               -->
-                <!-- col11 =                                               -->
+                <!-- col18 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                 <!--    'column_alias': 'created_at__quarter'}             -->
-                <!-- col12 =                                               -->
+                <!-- col19 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                 <!--    'column_alias': 'created_at__year'}                -->
-                <!-- col13 =                                                     -->
+                <!-- col20 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                <!--    'column_alias': 'created_at__extract_year'}      -->
+                <!-- col21 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                <!-- col22 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                <!--    'column_alias': 'created_at__extract_month'}     -->
+                <!-- col23 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                <!--    'column_alias': 'created_at__extract_week'}      -->
+                <!-- col24 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                <!--    'column_alias': 'created_at__extract_day'}       -->
+                <!-- col25 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                <!-- col26 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                 <!--    'column_alias': 'country_latest'}                        -->
-                <!-- col14 =                                                     -->
+                <!-- col28 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                 <!--    'column_alias': 'is_lux_latest'}                         -->
-                <!-- col15 =                                                     -->
+                <!-- col29 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                 <!--    'column_alias': 'capacity_latest'}                       -->
-                <!-- col16 =                                                     -->
+                <!-- col30 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                 <!--    'column_alias': 'listing__ds__day'}                      -->
-                <!-- col17 =                                               -->
+                <!-- col31 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                 <!--    'column_alias': 'listing__ds__week'}               -->
-                <!-- col18 =                                               -->
+                <!-- col32 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                 <!--    'column_alias': 'listing__ds__month'}              -->
-                <!-- col19 =                                               -->
+                <!-- col33 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                 <!--    'column_alias': 'listing__ds__quarter'}            -->
-                <!-- col20 =                                               -->
+                <!-- col34 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                 <!--    'column_alias': 'listing__ds__year'}               -->
-                <!-- col21 =                                                     -->
+                <!-- col35 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                <!-- col36 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                <!-- col37 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                <!-- col38 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                <!-- col39 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                <!-- col40 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                <!-- col41 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                <!-- col42 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                 <!--    'column_alias': 'listing__created_at__day'}              -->
-                <!-- col22 =                                               -->
+                <!-- col43 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                 <!--    'column_alias': 'listing__created_at__week'}       -->
-                <!-- col23 =                                               -->
+                <!-- col44 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                 <!--    'column_alias': 'listing__created_at__month'}      -->
-                <!-- col24 =                                               -->
+                <!-- col45 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                 <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                <!-- col25 =                                               -->
+                <!-- col46 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                 <!--    'column_alias': 'listing__created_at__year'}       -->
-                <!-- col26 =                                                     -->
+                <!-- col47 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                <!-- col48 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                <!-- col49 =                                                   -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                <!-- col50 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                <!-- col51 =                                                 -->
+                <!--   {'class': 'SqlSelectColumn',                          -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                <!-- col52 =                                                       -->
+                <!--   {'class': 'SqlSelectColumn',                                -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                <!-- col53 =                                                       -->
+                <!--   {'class': 'SqlSelectColumn',                                -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                <!-- col54 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                 <!--    'column_alias': 'listing__country_latest'}               -->
-                <!-- col27 =                                                     -->
+                <!-- col55 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                 <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                <!-- col28 =                                                     -->
+                <!-- col56 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                 <!--    'column_alias': 'listing__capacity_latest'}              -->
-                <!-- col29 =                                                     -->
+                <!-- col57 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                 <!--    'column_alias': 'listing'}                               -->
-                <!-- col30 =                                                     -->
+                <!-- col58 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                 <!--    'column_alias': 'user'}                                  -->
-                <!-- col31 =                                                     -->
+                <!-- col59 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                 <!--    'column_alias': 'listing__user'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
index c6279b9625..9f9193531e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_11 -->
         <!-- col0 =                                                        -->
         <!--   {'class': 'SqlSelectColumn',                                -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_159),      -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),      -->
         <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_160),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
         <!--    'column_alias': 'txn_count'}                           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_10 -->
             <!-- col0 =                                                        -->
             <!--   {'class': 'SqlSelectColumn',                                -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_158),      -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),      -->
             <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
             <!-- group_by0 =                                                   -->
             <!--   {'class': 'SqlSelectColumn',                                -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_158),      -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),      -->
             <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_9 -->
                 <!-- col0 =                                                        -->
                 <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_156),      -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),      -->
                 <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_155),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
                 <!--    'column_alias': 'txn_count'}                           -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                 <!-- where = None -->
@@ -49,23 +49,23 @@
                     <!-- node_id = ss_8 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_151),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
                     <!--    'column_alias': 'ds_partitioned__day'}                 -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_154),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
                     <!--    'column_alias': 'account_id__ds_partitioned__day'}     -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_152),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
                     <!--    'column_alias': 'account_id'}                          -->
                     <!-- col3 =                                                        -->
                     <!--   {'class': 'SqlSelectColumn',                                -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_153),      -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),      -->
                     <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_150),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
                     <!--    'column_alias': 'txn_count'}                           -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_4) -->
                     <!-- join_0 =                                                  -->
@@ -82,137 +82,249 @@
                         <!-- node_id = ss_4 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_191),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_101),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_192),  -->
                         <!--    'column_alias': 'account_id'}                          -->
-                        <!-- col2 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                           -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
-                        <!--    'column_alias': 'txn_count'}                          -->
+                        <!-- col2 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_190),  -->
+                        <!--    'column_alias': 'txn_count'}                           -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_3) -->
                         <!-- where = None -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_3 -->
-                            <!-- col0 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                -->
-                            <!-- col1 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}               -->
-                            <!-- col2 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_75),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}              -->
-                            <!-- col3 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_76),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}            -->
-                            <!-- col4 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_77),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}               -->
-                            <!-- col5 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_78),  -->
-                            <!--    'column_alias': 'ds__day'}                            -->
-                            <!-- col6 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_79),  -->
-                            <!--    'column_alias': 'ds__week'}                           -->
-                            <!-- col7 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_80),  -->
-                            <!--    'column_alias': 'ds__month'}                          -->
-                            <!-- col8 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_81),  -->
-                            <!--    'column_alias': 'ds__quarter'}                        -->
-                            <!-- col9 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_82),  -->
-                            <!--    'column_alias': 'ds__year'}                           -->
-                            <!-- col10 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_83),  -->
-                            <!--    'column_alias': 'account_id__ds_partitioned__day'}    -->
-                            <!-- col11 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_84),  -->
-                            <!--    'column_alias': 'account_id__ds_partitioned__week'}   -->
-                            <!-- col12 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),  -->
-                            <!--    'column_alias': 'account_id__ds_partitioned__month'}  -->
-                            <!-- col13 =                                                    -->
+                            <!-- col0 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_136),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!-- col1 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_137),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!-- col2 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_138),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!-- col3 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_139),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!-- col4 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_140),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!-- col5 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_141),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
+                            <!-- col6 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_142),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
+                            <!-- col7 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_143),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
+                            <!-- col8 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_144),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
+                            <!-- col9 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_145),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
+                            <!-- col10 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_146),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!-- col11 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_147),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!-- col12 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_148),  -->
+                            <!--    'column_alias': 'ds__day'}                             -->
+                            <!-- col13 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_149),  -->
+                            <!--    'column_alias': 'ds__week'}                            -->
+                            <!-- col14 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_150),  -->
+                            <!--    'column_alias': 'ds__month'}                           -->
+                            <!-- col15 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_151),  -->
+                            <!--    'column_alias': 'ds__quarter'}                         -->
+                            <!-- col16 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_152),  -->
+                            <!--    'column_alias': 'ds__year'}                            -->
+                            <!-- col17 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_153),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
+                            <!-- col18 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_154),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
+                            <!-- col19 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_155),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
+                            <!-- col20 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_156),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
+                            <!-- col21 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_157),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
+                            <!-- col22 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_158),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!-- col23 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_159),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!-- col24 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_160),  -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__day'}     -->
+                            <!-- col25 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_161),  -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__week'}    -->
+                            <!-- col26 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_162),  -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__month'}   -->
+                            <!-- col27 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_163),   -->
                             <!--    'column_alias': 'account_id__ds_partitioned__quarter'}  -->
-                            <!-- col14 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_87),  -->
-                            <!--    'column_alias': 'account_id__ds_partitioned__year'}   -->
-                            <!-- col15 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_88),  -->
-                            <!--    'column_alias': 'account_id__ds__day'}                -->
-                            <!-- col16 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_89),  -->
-                            <!--    'column_alias': 'account_id__ds__week'}               -->
-                            <!-- col17 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_90),  -->
-                            <!--    'column_alias': 'account_id__ds__month'}              -->
-                            <!-- col18 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_91),  -->
-                            <!--    'column_alias': 'account_id__ds__quarter'}            -->
-                            <!-- col19 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_92),  -->
-                            <!--    'column_alias': 'account_id__ds__year'}               -->
-                            <!-- col20 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_93),  -->
-                            <!--    'column_alias': 'metric_time__day'}                   -->
-                            <!-- col21 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_94),  -->
-                            <!--    'column_alias': 'metric_time__week'}                  -->
-                            <!-- col22 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_95),  -->
-                            <!--    'column_alias': 'metric_time__month'}                 -->
-                            <!-- col23 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_96),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}               -->
-                            <!-- col24 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
-                            <!--    'column_alias': 'metric_time__year'}                  -->
-                            <!-- col25 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
-                            <!--    'column_alias': 'account_id'}                         -->
-                            <!-- col26 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_71),  -->
-                            <!--    'column_alias': 'account_month'}                      -->
-                            <!-- col27 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_72),  -->
-                            <!--    'column_alias': 'account_id__account_month'}          -->
-                            <!-- col28 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_70),  -->
-                            <!--    'column_alias': 'txn_count'}                          -->
+                            <!-- col28 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_164),  -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__year'}    -->
+                            <!-- col29 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_165),        -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_year'}  -->
+                            <!-- col30 =                                                            -->
+                            <!--   {'class': 'SqlSelectColumn',                                     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_166),           -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_quarter'}  -->
+                            <!-- col31 =                                                          -->
+                            <!--   {'class': 'SqlSelectColumn',                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_167),         -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_month'}  -->
+                            <!-- col32 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_168),        -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_week'}  -->
+                            <!-- col33 =                                                        -->
+                            <!--   {'class': 'SqlSelectColumn',                                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_169),       -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_day'}  -->
+                            <!-- col34 =                                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_170),             -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col35 =                                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_171),             -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col36 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_172),  -->
+                            <!--    'column_alias': 'account_id__ds__day'}                 -->
+                            <!-- col37 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_173),  -->
+                            <!--    'column_alias': 'account_id__ds__week'}                -->
+                            <!-- col38 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_174),  -->
+                            <!--    'column_alias': 'account_id__ds__month'}               -->
+                            <!-- col39 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_175),  -->
+                            <!--    'column_alias': 'account_id__ds__quarter'}             -->
+                            <!-- col40 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_176),  -->
+                            <!--    'column_alias': 'account_id__ds__year'}                -->
+                            <!-- col41 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_177),  -->
+                            <!--    'column_alias': 'account_id__ds__extract_year'}        -->
+                            <!-- col42 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_178),  -->
+                            <!--    'column_alias': 'account_id__ds__extract_quarter'}     -->
+                            <!-- col43 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_179),  -->
+                            <!--    'column_alias': 'account_id__ds__extract_month'}       -->
+                            <!-- col44 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_180),  -->
+                            <!--    'column_alias': 'account_id__ds__extract_week'}        -->
+                            <!-- col45 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_181),  -->
+                            <!--    'column_alias': 'account_id__ds__extract_day'}         -->
+                            <!-- col46 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_182),  -->
+                            <!--    'column_alias': 'account_id__ds__extract_dayofweek'}   -->
+                            <!-- col47 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_183),  -->
+                            <!--    'column_alias': 'account_id__ds__extract_dayofyear'}   -->
+                            <!-- col48 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_184),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col49 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_185),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col50 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_186),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col51 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_187),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col52 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_188),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col53 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_189),  -->
+                            <!--    'column_alias': 'account_id'}                          -->
+                            <!-- col54 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_134),  -->
+                            <!--    'column_alias': 'account_month'}                       -->
+                            <!-- col55 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_135),  -->
+                            <!--    'column_alias': 'account_id__account_month'}           -->
+                            <!-- col56 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_133),  -->
+                            <!--    'column_alias': 'txn_count'}                           -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10010) -->
                             <!-- where = None -->
                             <SqlSelectStatementNode>
@@ -220,11 +332,11 @@
                                 <!-- node_id = ss_10010 -->
                                 <!-- col0 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10215),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10095),  -->
                                 <!--    'column_alias': 'txn_count'}                             -->
                                 <!-- col1 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10216),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10096),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
                                 <!-- col2 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -242,77 +354,189 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10123),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col6 =                                                      -->
+                                <!-- col6 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10210),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col7 =                                                 -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10211),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col8 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10212),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col9 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10213),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col10 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10214),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col11 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10215),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col12 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10216),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col13 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10221),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10097),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
-                                <!-- col7 =                                                -->
+                                <!-- col14 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10124),  -->
                                 <!--    'column_alias': 'ds__week'}                        -->
-                                <!-- col8 =                                                -->
+                                <!-- col15 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10125),  -->
                                 <!--    'column_alias': 'ds__month'}                       -->
-                                <!-- col9 =                                                -->
+                                <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10126),  -->
                                 <!--    'column_alias': 'ds__quarter'}                     -->
-                                <!-- col10 =                                               -->
+                                <!-- col17 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10127),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col11 =                                                     -->
+                                <!-- col18 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10217),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col19 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10218),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10219),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10220),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10221),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10222),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10223),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col25 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10226),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
                                 <!--    'column_alias': 'account_month'}                         -->
-                                <!-- col12 =                                                     -->
+                                <!-- col26 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10227),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
                                 <!--    'column_alias': 'account_id__ds_partitioned__day'}       -->
-                                <!-- col13 =                                                 -->
+                                <!-- col27 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10128),    -->
                                 <!--    'column_alias': 'account_id__ds_partitioned__week'}  -->
-                                <!-- col14 =                                                  -->
+                                <!-- col28 =                                                  -->
                                 <!--   {'class': 'SqlSelectColumn',                           -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10129),     -->
                                 <!--    'column_alias': 'account_id__ds_partitioned__month'}  -->
-                                <!-- col15 =                                                    -->
+                                <!-- col29 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10130),       -->
                                 <!--    'column_alias': 'account_id__ds_partitioned__quarter'}  -->
-                                <!-- col16 =                                                 -->
+                                <!-- col30 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10131),    -->
                                 <!--    'column_alias': 'account_id__ds_partitioned__year'}  -->
-                                <!-- col17 =                                                     -->
+                                <!-- col31 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10224),              -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_year'}  -->
+                                <!-- col32 =                                                            -->
+                                <!--   {'class': 'SqlSelectColumn',                                     -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10225),                 -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_quarter'}  -->
+                                <!-- col33 =                                                          -->
+                                <!--   {'class': 'SqlSelectColumn',                                   -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10226),               -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_month'}  -->
+                                <!-- col34 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10227),              -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_week'}  -->
+                                <!-- col35 =                                                        -->
+                                <!--   {'class': 'SqlSelectColumn',                                 -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10228),             -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_day'}  -->
+                                <!-- col36 =                                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10229),                   -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col37 =                                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10230),                   -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col38 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10232),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
                                 <!--    'column_alias': 'account_id__ds__day'}                   -->
-                                <!-- col18 =                                               -->
+                                <!-- col39 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10132),  -->
                                 <!--    'column_alias': 'account_id__ds__week'}            -->
-                                <!-- col19 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10133),  -->
                                 <!--    'column_alias': 'account_id__ds__month'}           -->
-                                <!-- col20 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10134),  -->
                                 <!--    'column_alias': 'account_id__ds__quarter'}         -->
-                                <!-- col21 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10135),  -->
                                 <!--    'column_alias': 'account_id__ds__year'}            -->
-                                <!-- col22 =                                                     -->
+                                <!-- col43 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10231),  -->
+                                <!--    'column_alias': 'account_id__ds__extract_year'}  -->
+                                <!-- col44 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10232),     -->
+                                <!--    'column_alias': 'account_id__ds__extract_quarter'}  -->
+                                <!-- col45 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10233),   -->
+                                <!--    'column_alias': 'account_id__ds__extract_month'}  -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10234),  -->
+                                <!--    'column_alias': 'account_id__ds__extract_week'}  -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10235),  -->
+                                <!--    'column_alias': 'account_id__ds__extract_day'}   -->
+                                <!-- col48 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10236),       -->
+                                <!--    'column_alias': 'account_id__ds__extract_dayofweek'}  -->
+                                <!-- col49 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10237),       -->
+                                <!--    'column_alias': 'account_id__ds__extract_dayofyear'}  -->
+                                <!-- col50 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10237),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10101),  -->
                                 <!--    'column_alias': 'account_id__account_month'}             -->
-                                <!-- col23 =                                                     -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10238),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10102),  -->
                                 <!--    'column_alias': 'account_id'}                            -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10010) -->
                                 <!-- where = None -->
@@ -331,15 +555,15 @@
                         <!-- node_id = ss_7 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_144),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_145),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
                         <!--    'column_alias': 'account_id'}                          -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_143),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
                         <!--    'column_alias': 'customer_id__customer_name'}          -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_6) -->
                         <!-- where = None -->
@@ -348,91 +572,175 @@
                             <!-- node_id = ss_6 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_123),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_228),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_124),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_229),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_125),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_230),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_126),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_231),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_127),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_232),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_128),  -->
-                            <!--    'column_alias': 'account_id__ds_partitioned__day'}     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_233),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_129),  -->
-                            <!--    'column_alias': 'account_id__ds_partitioned__week'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_234),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_130),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_235),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
+                            <!-- col8 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_236),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
+                            <!-- col9 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_237),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
+                            <!-- col10 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!-- col11 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!-- col12 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__day'}     -->
+                            <!-- col13 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__week'}    -->
+                            <!-- col14 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__month'}   -->
-                            <!-- col8 =                                                     -->
+                            <!-- col15 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_131),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),   -->
                             <!--    'column_alias': 'account_id__ds_partitioned__quarter'}  -->
-                            <!-- col9 =                                                    -->
+                            <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_132),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__year'}    -->
-                            <!-- col10 =                                                   -->
+                            <!-- col17 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),        -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_year'}  -->
+                            <!-- col18 =                                                            -->
+                            <!--   {'class': 'SqlSelectColumn',                                     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),           -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_quarter'}  -->
+                            <!-- col19 =                                                          -->
+                            <!--   {'class': 'SqlSelectColumn',                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),         -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_month'}  -->
+                            <!-- col20 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),        -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_week'}  -->
+                            <!-- col21 =                                                        -->
+                            <!--   {'class': 'SqlSelectColumn',                                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),       -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_day'}  -->
+                            <!-- col22 =                                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),             -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col23 =                                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),             -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_138),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__day'}    -->
-                            <!-- col11 =                                                   -->
+                            <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_139),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__week'}   -->
-                            <!-- col12 =                                                   -->
+                            <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_140),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__month'}  -->
-                            <!-- col13 =                                                     -->
+                            <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_141),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),    -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__quarter'}  -->
-                            <!-- col14 =                                                   -->
+                            <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_142),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__year'}   -->
-                            <!-- col15 =                                                   -->
+                            <!-- col29 =                                                          -->
+                            <!--   {'class': 'SqlSelectColumn',                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),         -->
+                            <!--    'column_alias': 'customer_id__ds_partitioned__extract_year'}  -->
+                            <!-- col30 =                                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),            -->
+                            <!--    'column_alias': 'customer_id__ds_partitioned__extract_quarter'}  -->
+                            <!-- col31 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),          -->
+                            <!--    'column_alias': 'customer_id__ds_partitioned__extract_month'}  -->
+                            <!-- col32 =                                                          -->
+                            <!--   {'class': 'SqlSelectColumn',                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),         -->
+                            <!--    'column_alias': 'customer_id__ds_partitioned__extract_week'}  -->
+                            <!-- col33 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),        -->
+                            <!--    'column_alias': 'customer_id__ds_partitioned__extract_day'}  -->
+                            <!-- col34 =                                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),              -->
+                            <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col35 =                                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),              -->
+                            <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_133),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
                             <!--    'column_alias': 'account_id'}                          -->
-                            <!-- col16 =                                                   -->
+                            <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_134),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
                             <!--    'column_alias': 'customer_id'}                         -->
-                            <!-- col17 =                                                   -->
+                            <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_135),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
                             <!--    'column_alias': 'account_id__customer_id'}             -->
-                            <!-- col18 =                                                   -->
+                            <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_121),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_226),  -->
                             <!--    'column_alias': 'extra_dim'}                           -->
-                            <!-- col19 =                                                   -->
+                            <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_122),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_227),  -->
                             <!--    'column_alias': 'account_id__extra_dim'}               -->
-                            <!-- col20 =                                                   -->
+                            <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_136),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
                             <!--    'column_alias': 'customer_id__customer_name'}          -->
-                            <!-- col21 =                                                    -->
+                            <!-- col42 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_137),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),   -->
                             <!--    'column_alias': 'customer_id__customer_atomic_weight'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10011) -->
                             <!-- join_0 =                                                  -->
@@ -447,11 +755,11 @@
                                 <!-- node_id = ss_10011 -->
                                 <!-- col0 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10239),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10103),  -->
                                 <!--    'column_alias': 'extra_dim'}                             -->
                                 <!-- col1 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10240),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10104),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
                                 <!-- col2 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -469,41 +777,97 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10139),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col6 =                                                      -->
+                                <!-- col6 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10238),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col7 =                                                 -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10239),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col8 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10240),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col9 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10241),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col10 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10242),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col11 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10243),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col12 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10244),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col13 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10245),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
                                 <!--    'column_alias': 'account_id__extra_dim'}                 -->
-                                <!-- col7 =                                                      -->
+                                <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10246),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10106),  -->
                                 <!--    'column_alias': 'account_id__ds_partitioned__day'}       -->
-                                <!-- col8 =                                                  -->
+                                <!-- col15 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10140),    -->
                                 <!--    'column_alias': 'account_id__ds_partitioned__week'}  -->
-                                <!-- col9 =                                                   -->
+                                <!-- col16 =                                                  -->
                                 <!--   {'class': 'SqlSelectColumn',                           -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10141),     -->
                                 <!--    'column_alias': 'account_id__ds_partitioned__month'}  -->
-                                <!-- col10 =                                                    -->
+                                <!-- col17 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10142),       -->
                                 <!--    'column_alias': 'account_id__ds_partitioned__quarter'}  -->
-                                <!-- col11 =                                                 -->
+                                <!-- col18 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10143),    -->
                                 <!--    'column_alias': 'account_id__ds_partitioned__year'}  -->
-                                <!-- col12 =                                                     -->
+                                <!-- col19 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10245),              -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_year'}  -->
+                                <!-- col20 =                                                            -->
+                                <!--   {'class': 'SqlSelectColumn',                                     -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10246),                 -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_quarter'}  -->
+                                <!-- col21 =                                                          -->
+                                <!--   {'class': 'SqlSelectColumn',                                   -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10247),               -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_month'}  -->
+                                <!-- col22 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10248),              -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_week'}  -->
+                                <!-- col23 =                                                        -->
+                                <!--   {'class': 'SqlSelectColumn',                                 -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10249),             -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_day'}  -->
+                                <!-- col24 =                                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10250),                   -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col25 =                                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10251),                   -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col26 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10251),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10107),  -->
                                 <!--    'column_alias': 'account_id'}                            -->
-                                <!-- col13 =                                                     -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10252),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10108),  -->
                                 <!--    'column_alias': 'customer_id'}                           -->
-                                <!-- col14 =                                                     -->
+                                <!-- col28 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10253),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10109),  -->
                                 <!--    'column_alias': 'account_id__customer_id'}               -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10011) -->
                                 <!-- where = None -->
@@ -525,72 +889,142 @@
                                 <!--      'ds_partitioned__month',                 -->
                                 <!--      'ds_partitioned__quarter',               -->
                                 <!--      'ds_partitioned__year',                  -->
+                                <!--      'ds_partitioned__day',                   -->
+                                <!--      'ds_partitioned__day',                   -->
+                                <!--      'ds_partitioned__day',                   -->
+                                <!--      'ds_partitioned__day',                   -->
+                                <!--      'ds_partitioned__day',                   -->
+                                <!--      'ds_partitioned__day',                   -->
+                                <!--      'ds_partitioned__day',                   -->
                                 <!--      'customer_id__ds_partitioned__day',      -->
                                 <!--      'customer_id__ds_partitioned__week',     -->
                                 <!--      'customer_id__ds_partitioned__month',    -->
                                 <!--      'customer_id__ds_partitioned__quarter',  -->
                                 <!--      'customer_id__ds_partitioned__year',     -->
+                                <!--      'customer_id__ds_partitioned__day',      -->
+                                <!--      'customer_id__ds_partitioned__day',      -->
+                                <!--      'customer_id__ds_partitioned__day',      -->
+                                <!--      'customer_id__ds_partitioned__day',      -->
+                                <!--      'customer_id__ds_partitioned__day',      -->
+                                <!--      'customer_id__ds_partitioned__day',      -->
+                                <!--      'customer_id__ds_partitioned__day',      -->
                                 <!--      'customer_id']                           -->
                                 <!-- node_id = ss_5 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_106),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_197),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_107),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_198),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_108),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_199),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_109),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_200),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_201),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_111),  -->
-                                <!--    'column_alias': 'customer_id__ds_partitioned__day'}    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_202),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_112),  -->
-                                <!--    'column_alias': 'customer_id__ds_partitioned__week'}   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_203),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_113),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_204),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
+                                <!-- col8 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_205),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
+                                <!-- col9 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_206),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
+                                <!-- col10 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_207),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                <!-- col11 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_208),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                <!-- col12 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_209),  -->
+                                <!--    'column_alias': 'customer_id__ds_partitioned__day'}    -->
+                                <!-- col13 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_210),  -->
+                                <!--    'column_alias': 'customer_id__ds_partitioned__week'}   -->
+                                <!-- col14 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_211),  -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__month'}  -->
-                                <!-- col8 =                                                      -->
+                                <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_114),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_212),    -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__quarter'}  -->
-                                <!-- col9 =                                                    -->
+                                <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_115),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_213),  -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__year'}   -->
-                                <!-- col10 =                                                   -->
+                                <!-- col17 =                                                          -->
+                                <!--   {'class': 'SqlSelectColumn',                                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_214),         -->
+                                <!--    'column_alias': 'customer_id__ds_partitioned__extract_year'}  -->
+                                <!-- col18 =                                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_215),            -->
+                                <!--    'column_alias': 'customer_id__ds_partitioned__extract_quarter'}  -->
+                                <!-- col19 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_216),          -->
+                                <!--    'column_alias': 'customer_id__ds_partitioned__extract_month'}  -->
+                                <!-- col20 =                                                          -->
+                                <!--   {'class': 'SqlSelectColumn',                                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_217),         -->
+                                <!--    'column_alias': 'customer_id__ds_partitioned__extract_week'}  -->
+                                <!-- col21 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_218),        -->
+                                <!--    'column_alias': 'customer_id__ds_partitioned__extract_day'}  -->
+                                <!-- col22 =                                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                                        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_219),              -->
+                                <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col23 =                                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                                        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_220),              -->
+                                <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_116),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_221),  -->
                                 <!--    'column_alias': 'customer_id'}                         -->
-                                <!-- col11 =                                                   -->
+                                <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_193),  -->
                                 <!--    'column_alias': 'customer_name'}                       -->
-                                <!-- col12 =                                                   -->
+                                <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_194),  -->
                                 <!--    'column_alias': 'customer_atomic_weight'}              -->
-                                <!-- col13 =                                                   -->
+                                <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_195),  -->
                                 <!--    'column_alias': 'customer_id__customer_name'}          -->
-                                <!-- col14 =                                                    -->
+                                <!-- col28 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_105),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_196),   -->
                                 <!--    'column_alias': 'customer_id__customer_atomic_weight'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10013) -->
                                 <!-- where = None -->
@@ -599,15 +1033,15 @@
                                     <!-- node_id = ss_10013 -->
                                     <!-- col0 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10261),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10117),  -->
                                     <!--    'column_alias': 'customer_name'}                         -->
                                     <!-- col1 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10262),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
                                     <!--    'column_alias': 'customer_atomic_weight'}                -->
                                     <!-- col2 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10263),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10119),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                   -->
                                     <!-- col3 =                                                -->
                                     <!--   {'class': 'SqlSelectColumn',                        -->
@@ -625,37 +1059,93 @@
                                     <!--   {'class': 'SqlSelectColumn',                        -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10147),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                    <!-- col7 =                                                      -->
+                                    <!-- col7 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10252),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                    <!-- col8 =                                                 -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10253),     -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                    <!-- col9 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10254),   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                    <!-- col10 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10255),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                    <!-- col11 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10256),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                    <!-- col12 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10257),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col13 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10258),       -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col14 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10268),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10120),  -->
                                     <!--    'column_alias': 'customer_id__customer_name'}            -->
-                                    <!-- col8 =                                                      -->
+                                    <!-- col15 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10269),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10121),  -->
                                     <!--    'column_alias': 'customer_id__customer_atomic_weight'}   -->
-                                    <!-- col9 =                                                      -->
+                                    <!-- col16 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10270),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10122),  -->
                                     <!--    'column_alias': 'customer_id__ds_partitioned__day'}      -->
-                                    <!-- col10 =                                                  -->
+                                    <!-- col17 =                                                  -->
                                     <!--   {'class': 'SqlSelectColumn',                           -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10148),     -->
                                     <!--    'column_alias': 'customer_id__ds_partitioned__week'}  -->
-                                    <!-- col11 =                                                   -->
+                                    <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10149),      -->
                                     <!--    'column_alias': 'customer_id__ds_partitioned__month'}  -->
-                                    <!-- col12 =                                                     -->
+                                    <!-- col19 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10150),        -->
                                     <!--    'column_alias': 'customer_id__ds_partitioned__quarter'}  -->
-                                    <!-- col13 =                                                  -->
+                                    <!-- col20 =                                                  -->
                                     <!--   {'class': 'SqlSelectColumn',                           -->
                                     <!--    'expr': SqlDateTruncExpression(node_id=dt_10151),     -->
                                     <!--    'column_alias': 'customer_id__ds_partitioned__year'}  -->
-                                    <!-- col14 =                                                     -->
+                                    <!-- col21 =                                                          -->
+                                    <!--   {'class': 'SqlSelectColumn',                                   -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10259),               -->
+                                    <!--    'column_alias': 'customer_id__ds_partitioned__extract_year'}  -->
+                                    <!-- col22 =                                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10260),                  -->
+                                    <!--    'column_alias': 'customer_id__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col23 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10261),                -->
+                                    <!--    'column_alias': 'customer_id__ds_partitioned__extract_month'}  -->
+                                    <!-- col24 =                                                          -->
+                                    <!--   {'class': 'SqlSelectColumn',                                   -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10262),               -->
+                                    <!--    'column_alias': 'customer_id__ds_partitioned__extract_week'}  -->
+                                    <!-- col25 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10263),              -->
+                                    <!--    'column_alias': 'customer_id__ds_partitioned__extract_day'}  -->
+                                    <!-- col26 =                                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10264),                    -->
+                                    <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col27 =                                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10265),                    -->
+                                    <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col28 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10275),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
                                     <!--    'column_alias': 'customer_id'}                           -->
                                     <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10013) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml
index 93e976b5aa..cbd37b5a97 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml
@@ -23,7 +23,7 @@
             <!-- node_id = ss_15 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_961),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
             <!-- where = None -->
@@ -43,7 +43,7 @@
                     <!-- node_id = ss_13 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_959),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                     <!-- where = None -->
@@ -53,227 +53,395 @@
                         <!-- node_id = ss_12 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_876),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_877),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_878),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_879),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
-                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_881),  -->
+                        <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
-                        <!--    'column_alias': 'ds_partitioned__week'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_882),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
-                        <!--    'column_alias': 'ds_partitioned__month'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),  -->
+                        <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
-                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),  -->
+                        <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
-                        <!--    'column_alias': 'ds_partitioned__year'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),  -->
+                        <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                        <!--    'column_alias': 'paid_at__day'}                        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                        <!--    'column_alias': 'paid_at__week'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_887),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
-                        <!--    'column_alias': 'paid_at__month'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_888),  -->
+                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
-                        <!--    'column_alias': 'paid_at__quarter'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_889),  -->
+                        <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
-                        <!--    'column_alias': 'paid_at__year'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_890),  -->
+                        <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
-                        <!--    'column_alias': 'booking__ds__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_891),  -->
+                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
-                        <!--    'column_alias': 'booking__ds__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_892),  -->
+                        <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
-                        <!--    'column_alias': 'booking__ds__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_893),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
-                        <!--    'column_alias': 'booking__ds__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_894),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
-                        <!--    'column_alias': 'booking__ds__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_895),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_898),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_899),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_900),  -->
+                        <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
-                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_901),  -->
+                        <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
-                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_902),  -->
+                        <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
-                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_903),  -->
+                        <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_904),  -->
+                        <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_905),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_906),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_907),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_908),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_909),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_910),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                        <!--    'column_alias': 'listing'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_911),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
-                        <!--    'column_alias': 'guest'}                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_912),  -->
+                        <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
-                        <!--    'column_alias': 'host'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_913),  -->
+                        <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_914),  -->
+                        <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_915),  -->
+                        <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_916),  -->
+                        <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
-                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_917),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
-                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_918),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
-                        <!--    'column_alias': 'bookings'}                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_919),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
-                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_920),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
-                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_921),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
-                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_922),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
-                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_923),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
-                        <!--    'column_alias': 'bookers'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_924),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
-                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_925),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                         <!-- col50 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
-                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_926),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                         <!-- col51 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
-                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_927),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                         <!-- col52 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_928),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!-- col53 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_929),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col54 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_930),        -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col55 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_931),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col56 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_932),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col57 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_933),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col58 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_934),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col59 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_935),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col60 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_936),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!-- col61 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_937),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!-- col62 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_938),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!-- col63 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_939),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!-- col64 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_940),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!-- col65 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_941),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                        <!-- col66 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_942),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                        <!-- col67 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_943),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                        <!-- col68 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_944),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                        <!-- col69 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_945),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                        <!-- col70 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_946),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col71 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_947),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col72 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_948),  -->
+                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!-- col73 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_949),  -->
+                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!-- col74 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_950),  -->
+                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!-- col75 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_951),  -->
+                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!-- col76 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_952),  -->
+                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!-- col77 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_953),  -->
+                        <!--    'column_alias': 'listing'}                             -->
+                        <!-- col78 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_954),  -->
+                        <!--    'column_alias': 'guest'}                               -->
+                        <!-- col79 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_955),  -->
+                        <!--    'column_alias': 'host'}                                -->
+                        <!-- col80 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_956),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!-- col81 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_957),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!-- col82 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_958),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!-- col83 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),  -->
+                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!-- col84 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_875),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!-- col85 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
+                        <!--    'column_alias': 'bookings'}                            -->
+                        <!-- col86 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
+                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!-- col87 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
+                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!-- col88 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_864),  -->
+                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!-- col89 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_865),  -->
+                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!-- col90 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_866),  -->
+                        <!--    'column_alias': 'bookers'}                             -->
+                        <!-- col91 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),  -->
+                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!-- col92 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_868),  -->
+                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!-- col93 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_869),  -->
+                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!-- col94 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_870),  -->
                         <!--    'column_alias': 'booking_value_p99'}                   -->
-                        <!-- col53 =                                                   -->
+                        <!-- col95 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                        <!-- col54 =                                                         -->
+                        <!-- col96 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col55 =                                                       -->
+                        <!-- col97 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = SqlBetweenExpression(node_id=betw_2) -->
@@ -282,227 +450,395 @@
                             <!-- node_id = ss_11 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_426),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_427),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_428),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_429),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_430),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_431),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_432),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_433),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_845),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_853),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_857),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_858),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_859),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col53 =                                                   -->
+                            <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -519,27 +855,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col8 =                                                                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -547,31 +883,31 @@
                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                 <!-- col9 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                 <!-- col12 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                 <!-- col13 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -589,133 +925,301 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col20 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col21 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col22 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col23 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col24 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col25 =                                                     -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col38 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col26 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col27 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col28 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col29 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col30 =                                                     -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col31 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col32 =                                               -->
+                                <!-- col53 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col33 =                                               -->
+                                <!-- col54 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col34 =                                               -->
+                                <!-- col55 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col35 =                                               -->
+                                <!-- col56 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col36 =                                                     -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col63 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col37 =                                               -->
+                                <!-- col65 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col38 =                                               -->
+                                <!-- col66 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col39 =                                                 -->
+                                <!-- col67 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col40 =                                               -->
+                                <!-- col68 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col41 =                                                     -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col75 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col76 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col42 =                                               -->
+                                <!-- col77 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col43 =                                               -->
+                                <!-- col78 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col44 =                                               -->
+                                <!-- col79 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col45 =                                               -->
+                                <!-- col80 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col46 =                                                     -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col87 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col47 =                                                     -->
+                                <!-- col89 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col48 =                                                     -->
+                                <!-- col90 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col49 =                                                     -->
+                                <!-- col91 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col50 =                                                     -->
+                                <!-- col92 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col51 =                                                     -->
+                                <!-- col93 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
@@ -733,10 +1237,10 @@
         <SqlSelectStatementNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = ss_20 -->
-            <!-- col0 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
-            <!--    'column_alias': 'listings'}                            -->
+            <!-- col0 =                                                     -->
+            <!--   {'class': 'SqlSelectColumn',                             -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1095),  -->
+            <!--    'column_alias': 'listings'}                             -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -753,164 +1257,276 @@
                     <!--   Pass Only Elements:  -->
                     <!--     ['listings']       -->
                     <!-- node_id = ss_18 -->
-                    <!-- col0 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
-                    <!--    'column_alias': 'listings'}                            -->
+                    <!-- col0 =                                                     -->
+                    <!--   {'class': 'SqlSelectColumn',                             -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1093),  -->
+                    <!--    'column_alias': 'listings'}                             -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
                         <!-- description =                                                         -->
                         <!--   Constrain Time Range to [2020-01-01T00:00:00, 2020-01-01T00:00:00]  -->
                         <!-- node_id = ss_17 -->
-                        <!-- col0 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
-                        <!--    'column_alias': 'ds__day'}                             -->
-                        <!-- col1 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
-                        <!--    'column_alias': 'ds__week'}                            -->
-                        <!-- col2 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
-                        <!--    'column_alias': 'ds__month'}                           -->
-                        <!-- col3 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
-                        <!--    'column_alias': 'ds__quarter'}                         -->
-                        <!-- col4 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
-                        <!--    'column_alias': 'ds__year'}                            -->
-                        <!-- col5 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
-                        <!--    'column_alias': 'created_at__day'}                     -->
-                        <!-- col6 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
-                        <!--    'column_alias': 'created_at__week'}                    -->
-                        <!-- col7 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
-                        <!--    'column_alias': 'created_at__month'}                   -->
-                        <!-- col8 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
-                        <!--    'column_alias': 'created_at__quarter'}                 -->
-                        <!-- col9 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
-                        <!--    'column_alias': 'created_at__year'}                    -->
-                        <!-- col10 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
-                        <!--    'column_alias': 'listing__ds__day'}                    -->
-                        <!-- col11 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
-                        <!--    'column_alias': 'listing__ds__week'}                   -->
-                        <!-- col12 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
-                        <!--    'column_alias': 'listing__ds__month'}                  -->
-                        <!-- col13 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
-                        <!--    'column_alias': 'listing__ds__quarter'}                -->
-                        <!-- col14 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
-                        <!--    'column_alias': 'listing__ds__year'}                   -->
-                        <!-- col15 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
-                        <!--    'column_alias': 'listing__created_at__day'}            -->
-                        <!-- col16 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
-                        <!--    'column_alias': 'listing__created_at__week'}           -->
-                        <!-- col17 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
-                        <!--    'column_alias': 'listing__created_at__month'}          -->
-                        <!-- col18 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
-                        <!--    'column_alias': 'listing__created_at__quarter'}        -->
-                        <!-- col19 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
-                        <!--    'column_alias': 'listing__created_at__year'}           -->
-                        <!-- col20 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
-                        <!--    'column_alias': 'metric_time__day'}                    -->
-                        <!-- col21 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
-                        <!--    'column_alias': 'metric_time__week'}                   -->
-                        <!-- col22 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
-                        <!--    'column_alias': 'metric_time__month'}                  -->
-                        <!-- col23 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}                -->
-                        <!-- col24 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
-                        <!--    'column_alias': 'metric_time__year'}                   -->
-                        <!-- col25 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
-                        <!--    'column_alias': 'listing'}                             -->
-                        <!-- col26 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
-                        <!--    'column_alias': 'user'}                                -->
-                        <!-- col27 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
-                        <!--    'column_alias': 'listing__user'}                       -->
-                        <!-- col28 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
-                        <!--    'column_alias': 'country_latest'}                      -->
-                        <!-- col29 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
-                        <!--    'column_alias': 'is_lux_latest'}                       -->
-                        <!-- col30 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
-                        <!--    'column_alias': 'capacity_latest'}                     -->
-                        <!-- col31 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
-                        <!--    'column_alias': 'listing__country_latest'}             -->
-                        <!-- col32 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
-                        <!--    'column_alias': 'listing__is_lux_latest'}              -->
-                        <!-- col33 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
-                        <!--    'column_alias': 'listing__capacity_latest'}            -->
-                        <!-- col34 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                        <!--    'column_alias': 'listings'}                            -->
-                        <!-- col35 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                        <!--    'column_alias': 'largest_listing'}                     -->
-                        <!-- col36 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
-                        <!--    'column_alias': 'smallest_listing'}                    -->
+                        <!-- col0 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1037),  -->
+                        <!--    'column_alias': 'ds__day'}                              -->
+                        <!-- col1 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1038),  -->
+                        <!--    'column_alias': 'ds__week'}                             -->
+                        <!-- col2 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1039),  -->
+                        <!--    'column_alias': 'ds__month'}                            -->
+                        <!-- col3 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1040),  -->
+                        <!--    'column_alias': 'ds__quarter'}                          -->
+                        <!-- col4 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1041),  -->
+                        <!--    'column_alias': 'ds__year'}                             -->
+                        <!-- col5 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1042),  -->
+                        <!--    'column_alias': 'ds__extract_year'}                     -->
+                        <!-- col6 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1043),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                  -->
+                        <!-- col7 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1044),  -->
+                        <!--    'column_alias': 'ds__extract_month'}                    -->
+                        <!-- col8 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1045),  -->
+                        <!--    'column_alias': 'ds__extract_week'}                     -->
+                        <!-- col9 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1046),  -->
+                        <!--    'column_alias': 'ds__extract_day'}                      -->
+                        <!-- col10 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1047),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}                -->
+                        <!-- col11 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1048),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}                -->
+                        <!-- col12 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1049),  -->
+                        <!--    'column_alias': 'created_at__day'}                      -->
+                        <!-- col13 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1050),  -->
+                        <!--    'column_alias': 'created_at__week'}                     -->
+                        <!-- col14 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1051),  -->
+                        <!--    'column_alias': 'created_at__month'}                    -->
+                        <!-- col15 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1052),  -->
+                        <!--    'column_alias': 'created_at__quarter'}                  -->
+                        <!-- col16 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1053),  -->
+                        <!--    'column_alias': 'created_at__year'}                     -->
+                        <!-- col17 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1054),  -->
+                        <!--    'column_alias': 'created_at__extract_year'}             -->
+                        <!-- col18 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1055),  -->
+                        <!--    'column_alias': 'created_at__extract_quarter'}          -->
+                        <!-- col19 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1056),  -->
+                        <!--    'column_alias': 'created_at__extract_month'}            -->
+                        <!-- col20 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1057),  -->
+                        <!--    'column_alias': 'created_at__extract_week'}             -->
+                        <!-- col21 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1058),  -->
+                        <!--    'column_alias': 'created_at__extract_day'}              -->
+                        <!-- col22 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1059),  -->
+                        <!--    'column_alias': 'created_at__extract_dayofweek'}        -->
+                        <!-- col23 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1060),  -->
+                        <!--    'column_alias': 'created_at__extract_dayofyear'}        -->
+                        <!-- col24 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1061),  -->
+                        <!--    'column_alias': 'listing__ds__day'}                     -->
+                        <!-- col25 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1062),  -->
+                        <!--    'column_alias': 'listing__ds__week'}                    -->
+                        <!-- col26 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1063),  -->
+                        <!--    'column_alias': 'listing__ds__month'}                   -->
+                        <!-- col27 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1064),  -->
+                        <!--    'column_alias': 'listing__ds__quarter'}                 -->
+                        <!-- col28 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1065),  -->
+                        <!--    'column_alias': 'listing__ds__year'}                    -->
+                        <!-- col29 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1066),  -->
+                        <!--    'column_alias': 'listing__ds__extract_year'}            -->
+                        <!-- col30 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1067),  -->
+                        <!--    'column_alias': 'listing__ds__extract_quarter'}         -->
+                        <!-- col31 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1068),  -->
+                        <!--    'column_alias': 'listing__ds__extract_month'}           -->
+                        <!-- col32 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1069),  -->
+                        <!--    'column_alias': 'listing__ds__extract_week'}            -->
+                        <!-- col33 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1070),  -->
+                        <!--    'column_alias': 'listing__ds__extract_day'}             -->
+                        <!-- col34 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1071),  -->
+                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}       -->
+                        <!-- col35 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1072),  -->
+                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}       -->
+                        <!-- col36 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1073),  -->
+                        <!--    'column_alias': 'listing__created_at__day'}             -->
+                        <!-- col37 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1074),  -->
+                        <!--    'column_alias': 'listing__created_at__week'}            -->
+                        <!-- col38 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1075),  -->
+                        <!--    'column_alias': 'listing__created_at__month'}           -->
+                        <!-- col39 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1076),  -->
+                        <!--    'column_alias': 'listing__created_at__quarter'}         -->
+                        <!-- col40 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1077),  -->
+                        <!--    'column_alias': 'listing__created_at__year'}            -->
+                        <!-- col41 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1078),  -->
+                        <!--    'column_alias': 'listing__created_at__extract_year'}    -->
+                        <!-- col42 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1079),   -->
+                        <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                        <!-- col43 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1080),  -->
+                        <!--    'column_alias': 'listing__created_at__extract_month'}   -->
+                        <!-- col44 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1081),  -->
+                        <!--    'column_alias': 'listing__created_at__extract_week'}    -->
+                        <!-- col45 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1082),  -->
+                        <!--    'column_alias': 'listing__created_at__extract_day'}     -->
+                        <!-- col46 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1083),     -->
+                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                        <!-- col47 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1084),     -->
+                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                        <!-- col48 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1085),  -->
+                        <!--    'column_alias': 'metric_time__day'}                     -->
+                        <!-- col49 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1086),  -->
+                        <!--    'column_alias': 'metric_time__week'}                    -->
+                        <!-- col50 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1087),  -->
+                        <!--    'column_alias': 'metric_time__month'}                   -->
+                        <!-- col51 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1088),  -->
+                        <!--    'column_alias': 'metric_time__quarter'}                 -->
+                        <!-- col52 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1089),  -->
+                        <!--    'column_alias': 'metric_time__year'}                    -->
+                        <!-- col53 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1090),  -->
+                        <!--    'column_alias': 'listing'}                              -->
+                        <!-- col54 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1091),  -->
+                        <!--    'column_alias': 'user'}                                 -->
+                        <!-- col55 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1092),  -->
+                        <!--    'column_alias': 'listing__user'}                        -->
+                        <!-- col56 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1031),  -->
+                        <!--    'column_alias': 'country_latest'}                       -->
+                        <!-- col57 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1032),  -->
+                        <!--    'column_alias': 'is_lux_latest'}                        -->
+                        <!-- col58 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1033),  -->
+                        <!--    'column_alias': 'capacity_latest'}                      -->
+                        <!-- col59 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1034),  -->
+                        <!--    'column_alias': 'listing__country_latest'}              -->
+                        <!-- col60 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1035),  -->
+                        <!--    'column_alias': 'listing__is_lux_latest'}               -->
+                        <!-- col61 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1036),  -->
+                        <!--    'column_alias': 'listing__capacity_latest'}             -->
+                        <!-- col62 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1028),  -->
+                        <!--    'column_alias': 'listings'}                             -->
+                        <!-- col63 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1029),  -->
+                        <!--    'column_alias': 'largest_listing'}                      -->
+                        <!-- col64 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1030),  -->
+                        <!--    'column_alias': 'smallest_listing'}                     -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
                         <!-- where = SqlBetweenExpression(node_id=betw_3) -->
                         <SqlSelectStatementNode>
@@ -918,151 +1534,263 @@
                             <!-- node_id = ss_16 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_971),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_972),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_973),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_974),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_975),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
-                            <!--    'column_alias': 'created_at__day'}                     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_976),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
-                            <!--    'column_alias': 'created_at__week'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_977),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
-                            <!--    'column_alias': 'created_at__month'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_978),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
-                            <!--    'column_alias': 'created_at__quarter'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_979),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
-                            <!--    'column_alias': 'created_at__year'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_980),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
-                            <!--    'column_alias': 'listing__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_981),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
-                            <!--    'column_alias': 'listing__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_982),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
-                            <!--    'column_alias': 'listing__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_983),  -->
+                            <!--    'column_alias': 'created_at__day'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
-                            <!--    'column_alias': 'listing__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_984),  -->
+                            <!--    'column_alias': 'created_at__week'}                    -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
-                            <!--    'column_alias': 'listing__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_985),  -->
+                            <!--    'column_alias': 'created_at__month'}                   -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
-                            <!--    'column_alias': 'listing__created_at__day'}            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_986),  -->
+                            <!--    'column_alias': 'created_at__quarter'}                 -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
-                            <!--    'column_alias': 'listing__created_at__week'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_987),  -->
+                            <!--    'column_alias': 'created_at__year'}                    -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
-                            <!--    'column_alias': 'listing__created_at__month'}          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_988),  -->
+                            <!--    'column_alias': 'created_at__extract_year'}            -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
-                            <!--    'column_alias': 'listing__created_at__quarter'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_989),  -->
+                            <!--    'column_alias': 'created_at__extract_quarter'}         -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
-                            <!--    'column_alias': 'listing__created_at__year'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_990),  -->
+                            <!--    'column_alias': 'created_at__extract_month'}           -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_991),  -->
+                            <!--    'column_alias': 'created_at__extract_week'}            -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_992),  -->
+                            <!--    'column_alias': 'created_at__extract_day'}             -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_993),  -->
+                            <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_994),  -->
+                            <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_995),  -->
+                            <!--    'column_alias': 'listing__ds__day'}                    -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_996),  -->
+                            <!--    'column_alias': 'listing__ds__week'}                   -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
-                            <!--    'column_alias': 'user'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_997),  -->
+                            <!--    'column_alias': 'listing__ds__month'}                  -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
-                            <!--    'column_alias': 'listing__user'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_998),  -->
+                            <!--    'column_alias': 'listing__ds__quarter'}                -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_999),  -->
+                            <!--    'column_alias': 'listing__ds__year'}                   -->
+                            <!-- col29 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1000),  -->
+                            <!--    'column_alias': 'listing__ds__extract_year'}            -->
+                            <!-- col30 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1001),  -->
+                            <!--    'column_alias': 'listing__ds__extract_quarter'}         -->
+                            <!-- col31 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1002),  -->
+                            <!--    'column_alias': 'listing__ds__extract_month'}           -->
+                            <!-- col32 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1003),  -->
+                            <!--    'column_alias': 'listing__ds__extract_week'}            -->
+                            <!-- col33 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1004),  -->
+                            <!--    'column_alias': 'listing__ds__extract_day'}             -->
+                            <!-- col34 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1005),  -->
+                            <!--    'column_alias': 'listing__ds__extract_dayofweek'}       -->
+                            <!-- col35 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1006),  -->
+                            <!--    'column_alias': 'listing__ds__extract_dayofyear'}       -->
+                            <!-- col36 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1007),  -->
+                            <!--    'column_alias': 'listing__created_at__day'}             -->
+                            <!-- col37 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1008),  -->
+                            <!--    'column_alias': 'listing__created_at__week'}            -->
+                            <!-- col38 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1009),  -->
+                            <!--    'column_alias': 'listing__created_at__month'}           -->
+                            <!-- col39 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1010),  -->
+                            <!--    'column_alias': 'listing__created_at__quarter'}         -->
+                            <!-- col40 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1011),  -->
+                            <!--    'column_alias': 'listing__created_at__year'}            -->
+                            <!-- col41 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1012),  -->
+                            <!--    'column_alias': 'listing__created_at__extract_year'}    -->
+                            <!-- col42 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1013),   -->
+                            <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                            <!-- col43 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1014),  -->
+                            <!--    'column_alias': 'listing__created_at__extract_month'}   -->
+                            <!-- col44 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1015),  -->
+                            <!--    'column_alias': 'listing__created_at__extract_week'}    -->
+                            <!-- col45 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1016),  -->
+                            <!--    'column_alias': 'listing__created_at__extract_day'}     -->
+                            <!-- col46 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1017),     -->
+                            <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                            <!-- col47 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1018),     -->
+                            <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                            <!-- col48 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1019),  -->
+                            <!--    'column_alias': 'metric_time__day'}                     -->
+                            <!-- col49 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1020),  -->
+                            <!--    'column_alias': 'metric_time__week'}                    -->
+                            <!-- col50 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1021),  -->
+                            <!--    'column_alias': 'metric_time__month'}                   -->
+                            <!-- col51 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1022),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                 -->
+                            <!-- col52 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1023),  -->
+                            <!--    'column_alias': 'metric_time__year'}                    -->
+                            <!-- col53 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1024),  -->
+                            <!--    'column_alias': 'listing'}                              -->
+                            <!-- col54 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1025),  -->
+                            <!--    'column_alias': 'user'}                                 -->
+                            <!-- col55 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1026),  -->
+                            <!--    'column_alias': 'listing__user'}                        -->
+                            <!-- col56 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_965),  -->
                             <!--    'column_alias': 'country_latest'}                      -->
-                            <!-- col29 =                                                   -->
+                            <!-- col57 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_966),  -->
                             <!--    'column_alias': 'is_lux_latest'}                       -->
-                            <!-- col30 =                                                   -->
+                            <!-- col58 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_967),  -->
                             <!--    'column_alias': 'capacity_latest'}                     -->
-                            <!-- col31 =                                                   -->
+                            <!-- col59 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_968),  -->
                             <!--    'column_alias': 'listing__country_latest'}             -->
-                            <!-- col32 =                                                   -->
+                            <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_969),  -->
                             <!--    'column_alias': 'listing__is_lux_latest'}              -->
-                            <!-- col33 =                                                   -->
+                            <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_970),  -->
                             <!--    'column_alias': 'listing__capacity_latest'}            -->
-                            <!-- col34 =                                                   -->
+                            <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_962),  -->
                             <!--    'column_alias': 'listings'}                            -->
-                            <!-- col35 =                                                   -->
+                            <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_963),  -->
                             <!--    'column_alias': 'largest_listing'}                     -->
-                            <!-- col36 =                                                   -->
+                            <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_964),  -->
                             <!--    'column_alias': 'smallest_listing'}                    -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                             <!-- where = None -->
@@ -1075,15 +1803,15 @@
                                 <!--    'column_alias': 'listings'}                                 -->
                                 <!-- col1 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                                 <!--    'column_alias': 'largest_listing'}                       -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                                 <!--    'column_alias': 'smallest_listing'}                      -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col4 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -1101,101 +1829,213 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col8 =                                                      -->
+                                <!-- col8 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col9 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col10 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col11 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col12 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col13 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col14 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                                 <!--    'column_alias': 'created_at__day'}                       -->
-                                <!-- col9 =                                                -->
+                                <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                                 <!--    'column_alias': 'created_at__week'}                -->
-                                <!-- col10 =                                               -->
+                                <!-- col17 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                                 <!--    'column_alias': 'created_at__month'}               -->
-                                <!-- col11 =                                               -->
+                                <!-- col18 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                                 <!--    'column_alias': 'created_at__quarter'}             -->
-                                <!-- col12 =                                               -->
+                                <!-- col19 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                                 <!--    'column_alias': 'created_at__year'}                -->
-                                <!-- col13 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                                <!--    'column_alias': 'created_at__extract_year'}      -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                                <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                                <!--    'column_alias': 'created_at__extract_month'}     -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                                <!--    'column_alias': 'created_at__extract_week'}      -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                                <!--    'column_alias': 'created_at__extract_day'}       -->
+                                <!-- col25 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                                <!-- col26 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                                 <!--    'column_alias': 'country_latest'}                        -->
-                                <!-- col14 =                                                     -->
+                                <!-- col28 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                                 <!--    'column_alias': 'is_lux_latest'}                         -->
-                                <!-- col15 =                                                     -->
+                                <!-- col29 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                                 <!--    'column_alias': 'capacity_latest'}                       -->
-                                <!-- col16 =                                                     -->
+                                <!-- col30 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                                 <!--    'column_alias': 'listing__ds__day'}                      -->
-                                <!-- col17 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                                 <!--    'column_alias': 'listing__ds__week'}               -->
-                                <!-- col18 =                                               -->
+                                <!-- col32 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                                 <!--    'column_alias': 'listing__ds__month'}              -->
-                                <!-- col19 =                                               -->
+                                <!-- col33 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                                 <!--    'column_alias': 'listing__ds__quarter'}            -->
-                                <!-- col20 =                                               -->
+                                <!-- col34 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                                 <!--    'column_alias': 'listing__ds__year'}               -->
-                                <!-- col21 =                                                     -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                                <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                                <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                                <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                                <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                                <!-- col39 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                                <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                                <!-- col40 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                                <!-- col41 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                <!-- col42 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                                 <!--    'column_alias': 'listing__created_at__day'}              -->
-                                <!-- col22 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                                 <!--    'column_alias': 'listing__created_at__week'}       -->
-                                <!-- col23 =                                               -->
+                                <!-- col44 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                                 <!--    'column_alias': 'listing__created_at__month'}      -->
-                                <!-- col24 =                                               -->
+                                <!-- col45 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                                 <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                                <!-- col25 =                                               -->
+                                <!-- col46 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                                 <!--    'column_alias': 'listing__created_at__year'}       -->
-                                <!-- col26 =                                                     -->
+                                <!-- col47 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                                <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                                <!-- col48 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                                <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                                <!-- col49 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                                <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                                <!-- col50 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                                <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                                <!-- col51 =                                                 -->
+                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                                <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                                <!-- col52 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                                <!-- col53 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                <!-- col54 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                                 <!--    'column_alias': 'listing__country_latest'}               -->
-                                <!-- col27 =                                                     -->
+                                <!-- col55 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                                 <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                                <!-- col28 =                                                     -->
+                                <!-- col56 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                                 <!--    'column_alias': 'listing__capacity_latest'}              -->
-                                <!-- col29 =                                                     -->
+                                <!-- col57 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col30 =                                                     -->
+                                <!-- col58 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                                 <!--    'column_alias': 'user'}                                  -->
-                                <!-- col31 =                                                     -->
+                                <!-- col59 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                                 <!--    'column_alias': 'listing__user'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml
index 5ad4e40835..ebf9d2d655 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_26 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                                             -->
         <!--   {'class': 'SqlSelectColumn',                                                                     -->
@@ -21,15 +21,15 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
             <!--    'column_alias': 'non_referred'}                        -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
             <!--    'column_alias': 'instant'}                             -->
             <!-- col3 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
             <!-- join_0 =                                                   -->
@@ -50,7 +50,7 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                                              -->
                 <!--   {'class': 'SqlSelectColumn',                                                                      -->
@@ -67,11 +67,11 @@
                     <!--    'column_alias': 'metric_time__day'}                                            -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                     <!--    'column_alias': 'ref_bookings'}                        -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                     <!-- join_0 =                                                   -->
@@ -86,11 +86,11 @@
                         <!-- node_id = ss_10 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                         <!--    'column_alias': 'ref_bookings'}                        -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                         <!-- where = None -->
@@ -99,7 +99,7 @@
                             <!-- node_id = ss_9 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -108,7 +108,7 @@
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- group_by0 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- where = None -->
                             <SqlSelectStatementNode>
@@ -118,11 +118,11 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                 <!--    'column_alias': 'referred_bookings'}                   -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
@@ -131,227 +131,395 @@
                                     <!-- node_id = ss_7 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                                    <!--    'column_alias': 'paid_at__day'}                        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                                    <!--    'column_alias': 'paid_at__week'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                                    <!--    'column_alias': 'paid_at__month'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                                    <!--    'column_alias': 'paid_at__year'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                                    <!--    'column_alias': 'booking__ds__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                                    <!--    'column_alias': 'booking__ds__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                                    <!--    'column_alias': 'booking__ds__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                                    <!--    'column_alias': 'booking__ds__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                    <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                    <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                    <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                    <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!-- col53 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col54 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col55 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col56 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col57 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col58 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col59 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col60 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!-- col61 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!-- col62 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!-- col63 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!-- col64 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!-- col65 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                    <!-- col66 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                    <!-- col67 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                    <!-- col68 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                    <!-- col69 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                    <!-- col70 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col71 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col72 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!-- col73 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!-- col74 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!-- col75 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!-- col76 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!-- col77 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!-- col78 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!-- col79 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                                    <!--    'column_alias': 'host'}                                -->
+                                    <!-- col80 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!-- col81 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!-- col82 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!-- col83 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!-- col84 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!-- col85 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!-- col86 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!-- col87 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!-- col88 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!-- col89 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!-- col90 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col91 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!-- col92 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!-- col93 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!-- col94 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                   -->
-                                    <!-- col53 =                                                   -->
+                                    <!-- col95 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                    <!-- col54 =                                                         -->
+                                    <!-- col96 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                    <!-- col55 =                                                       -->
+                                    <!-- col97 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
@@ -368,27 +536,27 @@
                                         <!--    'column_alias': 'instant_bookings'}                                                              -->
                                         <!-- col2 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                         <!--    'column_alias': 'booking_value'}                         -->
                                         <!-- col3 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                         <!--    'column_alias': 'max_booking_value'}                     -->
                                         <!-- col4 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                         <!--    'column_alias': 'min_booking_value'}                     -->
                                         <!-- col5 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                         <!--    'column_alias': 'bookers'}                               -->
                                         <!-- col6 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                         <!--    'column_alias': 'average_booking_value'}                 -->
                                         <!-- col7 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                         <!--    'column_alias': 'booking_payments'}                      -->
                                         <!-- col8 =                                                                                                           -->
                                         <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -396,31 +564,31 @@
                                         <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                         <!-- col9 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                         <!--    'column_alias': 'median_booking_value'}                  -->
                                         <!-- col10 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                         <!--    'column_alias': 'booking_value_p99'}                     -->
                                         <!-- col11 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                         <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                         <!-- col12 =                                                         -->
                                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                         <!-- col13 =                                                       -->
                                         <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                         <!-- col14 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                         <!--    'column_alias': 'is_instant'}                            -->
                                         <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                         <!--    'column_alias': 'ds__day'}                               -->
                                         <!-- col16 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -438,133 +606,301 @@
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                         <!--    'column_alias': 'ds__year'}                        -->
-                                        <!-- col20 =                                                     -->
+                                        <!-- col20 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                        <!--    'column_alias': 'ds__extract_year'}              -->
+                                        <!-- col21 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                        <!-- col22 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                        <!--    'column_alias': 'ds__extract_month'}             -->
+                                        <!-- col23 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                        <!--    'column_alias': 'ds__extract_week'}              -->
+                                        <!-- col24 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                        <!--    'column_alias': 'ds__extract_day'}               -->
+                                        <!-- col25 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!-- col26 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                         <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                        <!-- col21 =                                               -->
+                                        <!-- col28 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                         <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                        <!-- col22 =                                               -->
+                                        <!-- col29 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                         <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                        <!-- col23 =                                               -->
+                                        <!-- col30 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                        <!-- col24 =                                               -->
+                                        <!-- col31 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                         <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                        <!-- col25 =                                                     -->
+                                        <!-- col32 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                        <!-- col33 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                        <!-- col34 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                        <!-- col35 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                        <!-- col36 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                        <!-- col37 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col38 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col39 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                         <!--    'column_alias': 'paid_at__day'}                          -->
-                                        <!-- col26 =                                               -->
+                                        <!-- col40 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                         <!--    'column_alias': 'paid_at__week'}                   -->
-                                        <!-- col27 =                                               -->
+                                        <!-- col41 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                         <!--    'column_alias': 'paid_at__month'}                  -->
-                                        <!-- col28 =                                               -->
+                                        <!-- col42 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                         <!--    'column_alias': 'paid_at__quarter'}                -->
-                                        <!-- col29 =                                               -->
+                                        <!-- col43 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                         <!--    'column_alias': 'paid_at__year'}                   -->
-                                        <!-- col30 =                                                     -->
+                                        <!-- col44 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                        <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                        <!-- col45 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                        <!-- col46 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                        <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                        <!-- col47 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                        <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                        <!-- col48 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                        <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                        <!-- col49 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!-- col50 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!-- col51 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                         <!--    'column_alias': 'booking__is_instant'}                   -->
-                                        <!-- col31 =                                                     -->
+                                        <!-- col52 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                         <!--    'column_alias': 'booking__ds__day'}                      -->
-                                        <!-- col32 =                                               -->
+                                        <!-- col53 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                         <!--    'column_alias': 'booking__ds__week'}               -->
-                                        <!-- col33 =                                               -->
+                                        <!-- col54 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                         <!--    'column_alias': 'booking__ds__month'}              -->
-                                        <!-- col34 =                                               -->
+                                        <!-- col55 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                         <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                        <!-- col35 =                                               -->
+                                        <!-- col56 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                         <!--    'column_alias': 'booking__ds__year'}               -->
-                                        <!-- col36 =                                                     -->
+                                        <!-- col57 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                        <!-- col58 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                        <!-- col59 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                        <!-- col60 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                        <!-- col61 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                        <!-- col62 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                        <!-- col63 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col64 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                        <!-- col37 =                                               -->
+                                        <!-- col65 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                        <!-- col38 =                                               -->
+                                        <!-- col66 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                        <!-- col39 =                                                 -->
+                                        <!-- col67 =                                                 -->
                                         <!--   {'class': 'SqlSelectColumn',                          -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                        <!-- col40 =                                               -->
+                                        <!-- col68 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                        <!-- col41 =                                                     -->
+                                        <!-- col69 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                        <!-- col70 =                                                         -->
+                                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                        <!-- col71 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                        <!-- col72 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                        <!-- col73 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                        <!-- col74 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col75 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col76 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                         <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                        <!-- col42 =                                               -->
+                                        <!-- col77 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                         <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                        <!-- col43 =                                               -->
+                                        <!-- col78 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                         <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                        <!-- col44 =                                               -->
+                                        <!-- col79 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                         <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                        <!-- col45 =                                               -->
+                                        <!-- col80 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                         <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                        <!-- col46 =                                                     -->
+                                        <!-- col81 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                        <!-- col82 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                        <!-- col83 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                        <!-- col84 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                        <!-- col85 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                        <!-- col86 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                        <!-- col87 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col88 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                         <!--    'column_alias': 'listing'}                               -->
-                                        <!-- col47 =                                                     -->
+                                        <!-- col89 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                         <!--    'column_alias': 'guest'}                                 -->
-                                        <!-- col48 =                                                     -->
+                                        <!-- col90 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                         <!--    'column_alias': 'host'}                                  -->
-                                        <!-- col49 =                                                     -->
+                                        <!-- col91 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                         <!--    'column_alias': 'booking__listing'}                      -->
-                                        <!-- col50 =                                                     -->
+                                        <!-- col92 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                         <!--    'column_alias': 'booking__guest'}                        -->
-                                        <!-- col51 =                                                     -->
+                                        <!-- col93 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                         <!--    'column_alias': 'booking__host'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                         <!-- where = None -->
@@ -583,11 +919,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -596,7 +932,7 @@
                             <!-- node_id = ss_13 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -605,7 +941,7 @@
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                             <!-- group_by0 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- where = None -->
                             <SqlSelectStatementNode>
@@ -615,11 +951,11 @@
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_357),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                                 <!-- where = None -->
@@ -628,227 +964,395 @@
                                     <!-- node_id = ss_11 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                                    <!--    'column_alias': 'paid_at__day'}                        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                                    <!--    'column_alias': 'paid_at__week'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                                    <!--    'column_alias': 'paid_at__month'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                    <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                                    <!--    'column_alias': 'paid_at__year'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                    <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                                    <!--    'column_alias': 'booking__ds__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                                    <!--    'column_alias': 'booking__ds__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                    <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                                    <!--    'column_alias': 'booking__ds__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
-                                    <!--    'column_alias': 'booking__ds__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                    <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
-                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                    <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
-                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                    <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
-                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                    <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
-                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                    <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
-                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
-                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
-                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
-                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
-                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
-                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                    <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                                    <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                    <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                    <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                    <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
-                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
-                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
-                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
-                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
-                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                    <!-- col53 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col54 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col55 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col56 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col57 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col58 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                    <!-- col59 =                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col60 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                    <!-- col61 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                    <!-- col62 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                    <!-- col63 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                    <!-- col64 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                    <!-- col65 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                    <!-- col66 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                    <!-- col67 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                    <!-- col68 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                    <!-- col69 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                    <!-- col70 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                    <!-- col71 =                                                    -->
+                                    <!--   {'class': 'SqlSelectColumn',                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col72 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                    <!--    'column_alias': 'metric_time__day'}                    -->
+                                    <!-- col73 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                    <!--    'column_alias': 'metric_time__week'}                   -->
+                                    <!-- col74 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                    <!--    'column_alias': 'metric_time__month'}                  -->
+                                    <!-- col75 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                                    <!-- col76 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                                    <!--    'column_alias': 'metric_time__year'}                   -->
+                                    <!-- col77 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!-- col78 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!-- col79 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                                    <!--    'column_alias': 'host'}                                -->
+                                    <!-- col80 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!-- col81 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!-- col82 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!-- col83 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!-- col84 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!-- col85 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!-- col86 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!-- col87 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!-- col88 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!-- col89 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!-- col90 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col91 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!-- col92 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!-- col93 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!-- col94 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                     <!--    'column_alias': 'booking_value_p99'}                   -->
-                                    <!-- col53 =                                                   -->
+                                    <!-- col95 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                    <!-- col54 =                                                         -->
+                                    <!-- col96 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                    <!-- col55 =                                                       -->
+                                    <!-- col97 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
@@ -865,27 +1369,27 @@
                                         <!--    'column_alias': 'instant_bookings'}                                                              -->
                                         <!-- col2 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                         <!--    'column_alias': 'booking_value'}                         -->
                                         <!-- col3 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                         <!--    'column_alias': 'max_booking_value'}                     -->
                                         <!-- col4 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                         <!--    'column_alias': 'min_booking_value'}                     -->
                                         <!-- col5 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                         <!--    'column_alias': 'bookers'}                               -->
                                         <!-- col6 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                         <!--    'column_alias': 'average_booking_value'}                 -->
                                         <!-- col7 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                         <!--    'column_alias': 'booking_payments'}                      -->
                                         <!-- col8 =                                                                                                           -->
                                         <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -893,31 +1397,31 @@
                                         <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                         <!-- col9 =                                                      -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                         <!--    'column_alias': 'median_booking_value'}                  -->
                                         <!-- col10 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                         <!--    'column_alias': 'booking_value_p99'}                     -->
                                         <!-- col11 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                         <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                         <!-- col12 =                                                         -->
                                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                         <!-- col13 =                                                       -->
                                         <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                         <!-- col14 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                         <!--    'column_alias': 'is_instant'}                            -->
                                         <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                         <!--    'column_alias': 'ds__day'}                               -->
                                         <!-- col16 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -935,133 +1439,301 @@
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                         <!--    'column_alias': 'ds__year'}                        -->
-                                        <!-- col20 =                                                     -->
+                                        <!-- col20 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                        <!--    'column_alias': 'ds__extract_year'}              -->
+                                        <!-- col21 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                        <!-- col22 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                        <!--    'column_alias': 'ds__extract_month'}             -->
+                                        <!-- col23 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                        <!--    'column_alias': 'ds__extract_week'}              -->
+                                        <!-- col24 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                        <!--    'column_alias': 'ds__extract_day'}               -->
+                                        <!-- col25 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!-- col26 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                         <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                        <!-- col21 =                                               -->
+                                        <!-- col28 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                         <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                        <!-- col22 =                                               -->
+                                        <!-- col29 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                         <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                        <!-- col23 =                                               -->
+                                        <!-- col30 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                        <!-- col24 =                                               -->
+                                        <!-- col31 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                         <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                        <!-- col25 =                                                     -->
+                                        <!-- col32 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                        <!-- col33 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                        <!-- col34 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                        <!-- col35 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                        <!-- col36 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                        <!-- col37 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col38 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col39 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                         <!--    'column_alias': 'paid_at__day'}                          -->
-                                        <!-- col26 =                                               -->
+                                        <!-- col40 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                         <!--    'column_alias': 'paid_at__week'}                   -->
-                                        <!-- col27 =                                               -->
+                                        <!-- col41 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                         <!--    'column_alias': 'paid_at__month'}                  -->
-                                        <!-- col28 =                                               -->
+                                        <!-- col42 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                         <!--    'column_alias': 'paid_at__quarter'}                -->
-                                        <!-- col29 =                                               -->
+                                        <!-- col43 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                         <!--    'column_alias': 'paid_at__year'}                   -->
-                                        <!-- col30 =                                                     -->
+                                        <!-- col44 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                        <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                        <!-- col45 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                        <!-- col46 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                        <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                        <!-- col47 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                        <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                        <!-- col48 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                        <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                        <!-- col49 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!-- col50 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!-- col51 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                         <!--    'column_alias': 'booking__is_instant'}                   -->
-                                        <!-- col31 =                                                     -->
+                                        <!-- col52 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                         <!--    'column_alias': 'booking__ds__day'}                      -->
-                                        <!-- col32 =                                               -->
+                                        <!-- col53 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                         <!--    'column_alias': 'booking__ds__week'}               -->
-                                        <!-- col33 =                                               -->
+                                        <!-- col54 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                         <!--    'column_alias': 'booking__ds__month'}              -->
-                                        <!-- col34 =                                               -->
+                                        <!-- col55 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                         <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                        <!-- col35 =                                               -->
+                                        <!-- col56 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                         <!--    'column_alias': 'booking__ds__year'}               -->
-                                        <!-- col36 =                                                     -->
+                                        <!-- col57 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                        <!-- col58 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                        <!-- col59 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                        <!-- col60 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                        <!-- col61 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                        <!-- col62 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                        <!-- col63 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col64 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                        <!-- col37 =                                               -->
+                                        <!-- col65 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                        <!-- col38 =                                               -->
+                                        <!-- col66 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                        <!-- col39 =                                                 -->
+                                        <!-- col67 =                                                 -->
                                         <!--   {'class': 'SqlSelectColumn',                          -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                        <!-- col40 =                                               -->
+                                        <!-- col68 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                         <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                        <!-- col41 =                                                     -->
+                                        <!-- col69 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                        <!-- col70 =                                                         -->
+                                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                        <!-- col71 =                                                       -->
+                                        <!--   {'class': 'SqlSelectColumn',                                -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                        <!-- col72 =                                                      -->
+                                        <!--   {'class': 'SqlSelectColumn',                               -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                        <!-- col73 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                        <!-- col74 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                        <!-- col75 =                                                           -->
+                                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col76 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                         <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                        <!-- col42 =                                               -->
+                                        <!-- col77 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                         <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                        <!-- col43 =                                               -->
+                                        <!-- col78 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                         <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                        <!-- col44 =                                               -->
+                                        <!-- col79 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                         <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                        <!-- col45 =                                               -->
+                                        <!-- col80 =                                               -->
                                         <!--   {'class': 'SqlSelectColumn',                        -->
                                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                         <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                        <!-- col46 =                                                     -->
+                                        <!-- col81 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                        <!-- col82 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                        <!-- col83 =                                                -->
+                                        <!--   {'class': 'SqlSelectColumn',                         -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                        <!-- col84 =                                               -->
+                                        <!--   {'class': 'SqlSelectColumn',                        -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                        <!-- col85 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                        <!-- col86 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                        <!-- col87 =                                                    -->
+                                        <!--   {'class': 'SqlSelectColumn',                             -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col88 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                         <!--    'column_alias': 'listing'}                               -->
-                                        <!-- col47 =                                                     -->
+                                        <!-- col89 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                         <!--    'column_alias': 'guest'}                                 -->
-                                        <!-- col48 =                                                     -->
+                                        <!-- col90 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                         <!--    'column_alias': 'host'}                                  -->
-                                        <!-- col49 =                                                     -->
+                                        <!-- col91 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                         <!--    'column_alias': 'booking__listing'}                      -->
-                                        <!-- col50 =                                                     -->
+                                        <!-- col92 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                         <!--    'column_alias': 'booking__guest'}                        -->
-                                        <!-- col51 =                                                     -->
+                                        <!-- col93 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                         <!--    'column_alias': 'booking__host'}                         -->
                                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                         <!-- where = None -->
@@ -1082,11 +1754,11 @@
                 <!-- node_id = ss_20 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_429),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_430),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
                 <!--    'column_alias': 'instant'}                             -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
                 <!-- where = None -->
@@ -1095,7 +1767,7 @@
                     <!-- node_id = ss_19 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_428),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -1104,7 +1776,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_18) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_428),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -1114,11 +1786,11 @@
                         <!-- node_id = ss_18 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_426),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_425),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
                         <!--    'column_alias': 'instant_bookings'}                    -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                         <!-- where = None -->
@@ -1127,227 +1799,395 @@
                             <!-- node_id = ss_17 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
-                            <!-- col17 =                                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!-- col17 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
+                            <!-- col18 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
+                            <!-- col19 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
+                            <!-- col20 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
+                            <!-- col21 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
+                            <!-- col22 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!-- col23 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!-- col24 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!-- col25 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!-- col26 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!-- col27 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!-- col28 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!-- col29 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
+                            <!-- col30 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
+                            <!-- col31 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
+                            <!-- col32 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
+                            <!-- col33 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
+                            <!-- col34 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!-- col35 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!-- col36 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!-- col37 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!-- col38 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!-- col39 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!-- col40 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!-- col41 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
+                            <!-- col42 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
+                            <!-- col43 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
+                            <!-- col44 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
+                            <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
-                            <!-- col18 =                                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
+                            <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
-                            <!-- col19 =                                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
-                            <!-- col20 =                                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
-                            <!-- col21 =                                                   -->
+                            <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
-                            <!-- col22 =                                                   -->
+                            <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
-                            <!-- col23 =                                                   -->
+                            <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_407),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
-                            <!-- col24 =                                                   -->
+                            <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_408),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
-                            <!-- col25 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),  -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
-                            <!-- col26 =                                                   -->
+                            <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_410),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
-                            <!-- col27 =                                                   -->
+                            <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
-                            <!-- col28 =                                                   -->
+                            <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_412),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
-                            <!-- col29 =                                                   -->
+                            <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_413),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
-                            <!-- col30 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
-                            <!-- col31 =                                                   -->
+                            <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
-                            <!-- col32 =                                                   -->
+                            <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_416),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
-                            <!-- col33 =                                                   -->
+                            <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_417),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
-                            <!-- col34 =                                                   -->
+                            <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_418),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
-                            <!-- col35 =                                                   -->
+                            <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_419),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
                             <!--    'column_alias': 'listing'}                             -->
-                            <!-- col36 =                                                   -->
+                            <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_420),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
                             <!--    'column_alias': 'guest'}                               -->
-                            <!-- col37 =                                                   -->
+                            <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_421),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
                             <!--    'column_alias': 'host'}                                -->
-                            <!-- col38 =                                                   -->
+                            <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_422),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                             <!--    'column_alias': 'booking__listing'}                    -->
-                            <!-- col39 =                                                   -->
+                            <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_423),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
                             <!--    'column_alias': 'booking__guest'}                      -->
-                            <!-- col40 =                                                   -->
+                            <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_424),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
                             <!--    'column_alias': 'booking__host'}                       -->
-                            <!-- col41 =                                                   -->
+                            <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
                             <!--    'column_alias': 'is_instant'}                          -->
-                            <!-- col42 =                                                   -->
+                            <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
-                            <!-- col43 =                                                   -->
+                            <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_369),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                             <!--    'column_alias': 'bookings'}                            -->
-                            <!-- col44 =                                                   -->
+                            <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                             <!--    'column_alias': 'instant_bookings'}                    -->
-                            <!-- col45 =                                                   -->
+                            <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                             <!--    'column_alias': 'booking_value'}                       -->
-                            <!-- col46 =                                                   -->
+                            <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_372),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                             <!--    'column_alias': 'max_booking_value'}                   -->
-                            <!-- col47 =                                                   -->
+                            <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_373),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                             <!--    'column_alias': 'min_booking_value'}                   -->
-                            <!-- col48 =                                                   -->
+                            <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                             <!--    'column_alias': 'bookers'}                             -->
-                            <!-- col49 =                                                   -->
+                            <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_375),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
-                            <!-- col50 =                                                   -->
+                            <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_376),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                             <!--    'column_alias': 'referred_bookings'}                   -->
-                            <!-- col51 =                                                   -->
+                            <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_377),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                             <!--    'column_alias': 'median_booking_value'}                -->
-                            <!-- col52 =                                                   -->
+                            <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_378),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col53 =                                                   -->
+                            <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_379),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -1364,27 +2204,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col8 =                                                                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -1392,31 +2232,31 @@
                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                 <!-- col9 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                 <!-- col12 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                 <!-- col13 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -1434,133 +2274,301 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col20 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col21 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col22 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col23 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col24 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col25 =                                                     -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col38 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col26 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col27 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col28 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col29 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col30 =                                                     -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col31 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col32 =                                               -->
+                                <!-- col53 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col33 =                                               -->
+                                <!-- col54 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col34 =                                               -->
+                                <!-- col55 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col35 =                                               -->
+                                <!-- col56 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col36 =                                                     -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col63 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col37 =                                               -->
+                                <!-- col65 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col38 =                                               -->
+                                <!-- col66 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col39 =                                                 -->
+                                <!-- col67 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col40 =                                               -->
+                                <!-- col68 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col41 =                                                     -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col75 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col42 =                                               -->
+                                <!-- col77 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col43 =                                               -->
+                                <!-- col78 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col44 =                                               -->
+                                <!-- col79 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col45 =                                               -->
+                                <!-- col80 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col46 =                                                     -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col87 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col47 =                                                     -->
+                                <!-- col89 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col48 =                                                     -->
+                                <!-- col90 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col49 =                                                     -->
+                                <!-- col91 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col50 =                                                     -->
+                                <!-- col92 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col51 =                                                     -->
+                                <!-- col93 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
@@ -1579,11 +2587,11 @@
                 <!-- node_id = ss_24 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_23) -->
                 <!-- where = None -->
@@ -1592,7 +2600,7 @@
                     <!-- node_id = ss_23 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -1601,7 +2609,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_22) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -1611,11 +2619,11 @@
                         <!-- node_id = ss_22 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_21) -->
                         <!-- where = None -->
@@ -1624,227 +2632,395 @@
                             <!-- node_id = ss_21 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
-                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
-                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
-                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
-                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
-                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
-                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
-                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
-                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
-                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
-                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
-                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
-                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
-                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
-                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
-                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
-                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
-                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
-                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
-                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
-                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
-                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_431),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_432),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_433),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col59 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_845),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
-                            <!-- col53 =                                                   -->
+                            <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col54 =                                                         -->
+                            <!-- col96 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col55 =                                                       -->
+                            <!-- col97 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -1861,27 +3037,27 @@
                                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                                 <!-- col2 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                                 <!--    'column_alias': 'booking_value'}                         -->
                                 <!-- col3 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                                 <!--    'column_alias': 'max_booking_value'}                     -->
                                 <!-- col4 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                                 <!--    'column_alias': 'min_booking_value'}                     -->
                                 <!-- col5 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                                 <!--    'column_alias': 'bookers'}                               -->
                                 <!-- col6 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                                 <!--    'column_alias': 'average_booking_value'}                 -->
                                 <!-- col7 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                                 <!--    'column_alias': 'booking_payments'}                      -->
                                 <!-- col8 =                                                                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -1889,31 +3065,31 @@
                                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                                 <!-- col9 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                                 <!--    'column_alias': 'median_booking_value'}                  -->
                                 <!-- col10 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                                 <!--    'column_alias': 'booking_value_p99'}                     -->
                                 <!-- col11 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                                 <!-- col12 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                                 <!-- col13 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- col14 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                                 <!--    'column_alias': 'is_instant'}                            -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -1931,133 +3107,301 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col20 =                                                     -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col21 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col22 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col23 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col24 =                                               -->
+                                <!-- col31 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col25 =                                                     -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col38 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                                 <!--    'column_alias': 'paid_at__day'}                          -->
-                                <!-- col26 =                                               -->
+                                <!-- col40 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                                 <!--    'column_alias': 'paid_at__week'}                   -->
-                                <!-- col27 =                                               -->
+                                <!-- col41 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                                 <!--    'column_alias': 'paid_at__month'}                  -->
-                                <!-- col28 =                                               -->
+                                <!-- col42 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                                <!-- col29 =                                               -->
+                                <!-- col43 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                                 <!--    'column_alias': 'paid_at__year'}                   -->
-                                <!-- col30 =                                                     -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                                <!-- col31 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                                <!-- col32 =                                               -->
+                                <!-- col53 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                                 <!--    'column_alias': 'booking__ds__week'}               -->
-                                <!-- col33 =                                               -->
+                                <!-- col54 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                                 <!--    'column_alias': 'booking__ds__month'}              -->
-                                <!-- col34 =                                               -->
+                                <!-- col55 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                                <!-- col35 =                                               -->
+                                <!-- col56 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                                 <!--    'column_alias': 'booking__ds__year'}               -->
-                                <!-- col36 =                                                     -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                                <!-- col63 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                                <!-- col37 =                                               -->
+                                <!-- col65 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                                <!-- col38 =                                               -->
+                                <!-- col66 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                                <!-- col39 =                                                 -->
+                                <!-- col67 =                                                 -->
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                                <!-- col40 =                                               -->
+                                <!-- col68 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                                <!-- col41 =                                                     -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col75 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col76 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                                <!-- col42 =                                               -->
+                                <!-- col77 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                                <!-- col43 =                                               -->
+                                <!-- col78 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                                <!-- col44 =                                               -->
+                                <!-- col79 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                                <!-- col45 =                                               -->
+                                <!-- col80 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                                <!-- col46 =                                                     -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                                <!-- col87 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                                 <!--    'column_alias': 'listing'}                               -->
-                                <!-- col47 =                                                     -->
+                                <!-- col89 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                                 <!--    'column_alias': 'guest'}                                 -->
-                                <!-- col48 =                                                     -->
+                                <!-- col90 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                                 <!--    'column_alias': 'host'}                                  -->
-                                <!-- col49 =                                                     -->
+                                <!-- col91 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                                 <!--    'column_alias': 'booking__listing'}                      -->
-                                <!-- col50 =                                                     -->
+                                <!-- col92 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                                 <!--    'column_alias': 'booking__guest'}                        -->
-                                <!-- col51 =                                                     -->
+                                <!-- col93 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                                 <!--    'column_alias': 'booking__host'}                         -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml
index 8a1b7def27..dd1374fbd4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml
@@ -98,27 +98,27 @@
                         <!--    'column_alias': 'instant_bookings'}                                                              -->
                         <!-- col2 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                         <!--    'column_alias': 'booking_value'}                         -->
                         <!-- col3 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                         <!--    'column_alias': 'max_booking_value'}                     -->
                         <!-- col4 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                         <!--    'column_alias': 'min_booking_value'}                     -->
                         <!-- col5 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                         <!--    'column_alias': 'bookers'}                               -->
                         <!-- col6 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                         <!--    'column_alias': 'average_booking_value'}                 -->
                         <!-- col7 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                         <!--    'column_alias': 'booking_payments'}                      -->
                         <!-- col8 =                                                                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -126,31 +126,31 @@
                         <!--    'column_alias': 'referred_bookings'}                                                                          -->
                         <!-- col9 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                         <!--    'column_alias': 'median_booking_value'}                  -->
                         <!-- col10 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                         <!--    'column_alias': 'booking_value_p99'}                     -->
                         <!-- col11 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                         <!-- col12 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                         <!-- col13 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- col14 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                         <!--    'column_alias': 'is_instant'}                            -->
                         <!-- col15 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                         <!--    'column_alias': 'ds__day'}                               -->
                         <!-- col16 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -168,133 +168,301 @@
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                         <!--    'column_alias': 'ds__year'}                        -->
-                        <!-- col20 =                                                     -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col25 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!-- col26 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                        <!-- col21 =                                               -->
+                        <!-- col28 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                         <!--    'column_alias': 'ds_partitioned__week'}            -->
-                        <!-- col22 =                                               -->
+                        <!-- col29 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                         <!--    'column_alias': 'ds_partitioned__month'}           -->
-                        <!-- col23 =                                               -->
+                        <!-- col30 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                        <!-- col24 =                                               -->
+                        <!-- col31 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                         <!--    'column_alias': 'ds_partitioned__year'}            -->
-                        <!-- col25 =                                                     -->
+                        <!-- col32 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                        <!-- col33 =                                                -->
+                        <!--   {'class': 'SqlSelectColumn',                         -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                        <!-- col34 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                        <!-- col35 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                        <!-- col36 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                        <!-- col37 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col38 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col39 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                         <!--    'column_alias': 'paid_at__day'}                          -->
-                        <!-- col26 =                                               -->
+                        <!-- col40 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                         <!--    'column_alias': 'paid_at__week'}                   -->
-                        <!-- col27 =                                               -->
+                        <!-- col41 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                         <!--    'column_alias': 'paid_at__month'}                  -->
-                        <!-- col28 =                                               -->
+                        <!-- col42 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                         <!--    'column_alias': 'paid_at__quarter'}                -->
-                        <!-- col29 =                                               -->
+                        <!-- col43 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                         <!--    'column_alias': 'paid_at__year'}                   -->
-                        <!-- col30 =                                                     -->
+                        <!-- col44 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}         -->
+                        <!-- col45 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                        <!-- col46 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}        -->
+                        <!-- col47 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}         -->
+                        <!-- col48 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}          -->
+                        <!-- col49 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                        <!-- col50 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                        <!-- col51 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                         <!--    'column_alias': 'booking__is_instant'}                   -->
-                        <!-- col31 =                                                     -->
+                        <!-- col52 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                         <!--    'column_alias': 'booking__ds__day'}                      -->
-                        <!-- col32 =                                               -->
+                        <!-- col53 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                         <!--    'column_alias': 'booking__ds__week'}               -->
-                        <!-- col33 =                                               -->
+                        <!-- col54 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                         <!--    'column_alias': 'booking__ds__month'}              -->
-                        <!-- col34 =                                               -->
+                        <!-- col55 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                         <!--    'column_alias': 'booking__ds__quarter'}            -->
-                        <!-- col35 =                                               -->
+                        <!-- col56 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                         <!--    'column_alias': 'booking__ds__year'}               -->
-                        <!-- col36 =                                                     -->
+                        <!-- col57 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                        <!-- col58 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                        <!-- col59 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                        <!-- col60 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                        <!-- col61 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                        <!-- col62 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                        <!-- col63 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                        <!-- col64 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                        <!-- col37 =                                               -->
+                        <!-- col65 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                        <!-- col38 =                                               -->
+                        <!-- col66 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                        <!-- col39 =                                                 -->
+                        <!-- col67 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                        <!-- col40 =                                               -->
+                        <!-- col68 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                        <!-- col41 =                                                     -->
+                        <!-- col69 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col70 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col71 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col72 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col73 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col74 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col75 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col76 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                         <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                        <!-- col42 =                                               -->
+                        <!-- col77 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                         <!--    'column_alias': 'booking__paid_at__week'}          -->
-                        <!-- col43 =                                               -->
+                        <!-- col78 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                         <!--    'column_alias': 'booking__paid_at__month'}         -->
-                        <!-- col44 =                                               -->
+                        <!-- col79 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                         <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                        <!-- col45 =                                               -->
+                        <!-- col80 =                                               -->
                         <!--   {'class': 'SqlSelectColumn',                        -->
                         <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                         <!--    'column_alias': 'booking__paid_at__year'}          -->
-                        <!-- col46 =                                                     -->
+                        <!-- col81 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                        <!-- col82 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                        <!-- col83 =                                                -->
+                        <!--   {'class': 'SqlSelectColumn',                         -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                        <!-- col84 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                        <!-- col85 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                        <!-- col86 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col87 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col88 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                         <!--    'column_alias': 'listing'}                               -->
-                        <!-- col47 =                                                     -->
+                        <!-- col89 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                         <!--    'column_alias': 'guest'}                                 -->
-                        <!-- col48 =                                                     -->
+                        <!-- col90 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                         <!--    'column_alias': 'host'}                                  -->
-                        <!-- col49 =                                                     -->
+                        <!-- col91 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                         <!--    'column_alias': 'booking__listing'}                      -->
-                        <!-- col50 =                                                     -->
+                        <!-- col92 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                         <!--    'column_alias': 'booking__guest'}                        -->
-                        <!-- col51 =                                                     -->
+                        <!-- col93 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                         <!--    'column_alias': 'booking__host'}                         -->
                         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml
index 26789f01a6..175032c65b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_13 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
         <!--    'column_alias': 'user__home_state'}                    -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
         <!--    'column_alias': 'identity_verifications'}              -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_12 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
             <!--    'column_alias': 'user__home_state'}                    -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
             <!--    'column_alias': 'user__home_state'}                    -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_11 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                 <!--    'column_alias': 'user__home_state'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                 <!--    'column_alias': 'identity_verifications'}              -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                 <!-- where = None -->
@@ -49,23 +49,23 @@
                     <!-- node_id = ss_10 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                     <!--    'column_alias': 'ds_partitioned__day'}                 -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                     <!--    'column_alias': 'user__ds_partitioned__day'}           -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                     <!--    'column_alias': 'user'}                                -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                     <!--    'column_alias': 'user__home_state'}                    -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                     <!--    'column_alias': 'identity_verifications'}              -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                     <!-- join_0 =                                                  -->
@@ -82,15 +82,15 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
                         <!--    'column_alias': 'user'}                                -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                         <!--    'column_alias': 'identity_verifications'}              -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -99,127 +99,239 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
-                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
-                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),  -->
-                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),  -->
-                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                            <!--    'column_alias': 'verification__ds__day'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                            <!--    'column_alias': 'verification__ds__week'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
-                            <!--    'column_alias': 'verification__ds__month'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
-                            <!--    'column_alias': 'verification__ds__quarter'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
-                            <!--    'column_alias': 'verification__ds__year'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
-                            <!--    'column_alias': 'verification__ds_partitioned__day'}   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!-- col17 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
+                            <!-- col18 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
+                            <!-- col19 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
+                            <!-- col20 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
+                            <!-- col21 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
+                            <!-- col22 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!-- col23 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!-- col24 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'column_alias': 'verification__ds__day'}               -->
+                            <!-- col25 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'column_alias': 'verification__ds__week'}              -->
+                            <!-- col26 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'column_alias': 'verification__ds__month'}             -->
+                            <!-- col27 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'column_alias': 'verification__ds__quarter'}           -->
+                            <!-- col28 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'column_alias': 'verification__ds__year'}              -->
+                            <!-- col29 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'column_alias': 'verification__ds__extract_year'}      -->
+                            <!-- col30 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'column_alias': 'verification__ds__extract_quarter'}   -->
+                            <!-- col31 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'column_alias': 'verification__ds__extract_month'}     -->
+                            <!-- col32 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'column_alias': 'verification__ds__extract_week'}      -->
+                            <!-- col33 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'column_alias': 'verification__ds__extract_day'}       -->
+                            <!-- col34 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),   -->
+                            <!--    'column_alias': 'verification__ds__extract_dayofweek'}  -->
+                            <!-- col35 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),   -->
+                            <!--    'column_alias': 'verification__ds__extract_dayofyear'}  -->
+                            <!-- col36 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'column_alias': 'verification__ds_partitioned__day'}   -->
+                            <!-- col37 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
                             <!--    'column_alias': 'verification__ds_partitioned__week'}  -->
-                            <!-- col17 =                                                    -->
+                            <!-- col38 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),   -->
                             <!--    'column_alias': 'verification__ds_partitioned__month'}  -->
-                            <!-- col18 =                                                      -->
+                            <!-- col39 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),     -->
                             <!--    'column_alias': 'verification__ds_partitioned__quarter'}  -->
-                            <!-- col19 =                                                   -->
+                            <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
                             <!--    'column_alias': 'verification__ds_partitioned__year'}  -->
-                            <!-- col20 =                                                   -->
+                            <!-- col41 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),          -->
+                            <!--    'column_alias': 'verification__ds_partitioned__extract_year'}  -->
+                            <!-- col42 =                                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),             -->
+                            <!--    'column_alias': 'verification__ds_partitioned__extract_quarter'}  -->
+                            <!-- col43 =                                                            -->
+                            <!--   {'class': 'SqlSelectColumn',                                     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),           -->
+                            <!--    'column_alias': 'verification__ds_partitioned__extract_month'}  -->
+                            <!-- col44 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),          -->
+                            <!--    'column_alias': 'verification__ds_partitioned__extract_week'}  -->
+                            <!-- col45 =                                                          -->
+                            <!--   {'class': 'SqlSelectColumn',                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),         -->
+                            <!--    'column_alias': 'verification__ds_partitioned__extract_day'}  -->
+                            <!-- col46 =                                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                                         -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),               -->
+                            <!--    'column_alias': 'verification__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col47 =                                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                                         -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),               -->
+                            <!--    'column_alias': 'verification__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
-                            <!-- col21 =                                                   -->
+                            <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
-                            <!-- col22 =                                                   -->
+                            <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
-                            <!-- col23 =                                                   -->
+                            <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
-                            <!-- col24 =                                                   -->
+                            <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
-                            <!-- col25 =                                                   -->
+                            <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
                             <!--    'column_alias': 'verification'}                        -->
-                            <!-- col26 =                                                   -->
+                            <!-- col54 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
                             <!--    'column_alias': 'user'}                                -->
-                            <!-- col27 =                                                   -->
+                            <!-- col55 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
                             <!--    'column_alias': 'verification__user'}                  -->
-                            <!-- col28 =                                                   -->
+                            <!-- col56 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
                             <!--    'column_alias': 'verification_type'}                   -->
-                            <!-- col29 =                                                   -->
+                            <!-- col57 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
                             <!--    'column_alias': 'verification__verification_type'}     -->
-                            <!-- col30 =                                                   -->
+                            <!-- col58 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
                             <!--    'column_alias': 'identity_verifications'}              -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10003) -->
                             <!-- where = None -->
@@ -232,7 +344,7 @@
                                 <!--    'column_alias': 'identity_verifications'}                   -->
                                 <!-- col1 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10073),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10041),  -->
                                 <!--    'column_alias': 'ds__day'}                               -->
                                 <!-- col2 =                                                -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -250,85 +362,197 @@
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10035),  -->
                                 <!--    'column_alias': 'ds__year'}                        -->
-                                <!-- col6 =                                                      -->
+                                <!-- col6 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10056),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col7 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10057),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col8 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10058),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col9 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10059),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col10 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10060),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col11 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10061),  -->
+                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!-- col12 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10062),  -->
+                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!-- col13 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10078),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10042),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                                <!-- col7 =                                                -->
+                                <!-- col14 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10036),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                                <!-- col8 =                                                -->
+                                <!-- col15 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10037),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                                <!-- col9 =                                                -->
+                                <!-- col16 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10038),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                                <!-- col10 =                                               -->
+                                <!-- col17 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10039),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                                <!-- col11 =                                                     -->
+                                <!-- col18 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10063),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col19 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10064),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col20 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10065),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10066),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10067),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col23 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10068),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col24 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10069),       -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col25 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10083),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10043),  -->
                                 <!--    'column_alias': 'verification_type'}                     -->
-                                <!-- col12 =                                                     -->
+                                <!-- col26 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10084),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
                                 <!--    'column_alias': 'verification__ds__day'}                 -->
-                                <!-- col13 =                                               -->
+                                <!-- col27 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10040),  -->
                                 <!--    'column_alias': 'verification__ds__week'}          -->
-                                <!-- col14 =                                               -->
+                                <!-- col28 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10041),  -->
                                 <!--    'column_alias': 'verification__ds__month'}         -->
-                                <!-- col15 =                                               -->
+                                <!-- col29 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10042),  -->
                                 <!--    'column_alias': 'verification__ds__quarter'}       -->
-                                <!-- col16 =                                               -->
+                                <!-- col30 =                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                        -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10043),  -->
                                 <!--    'column_alias': 'verification__ds__year'}          -->
-                                <!-- col17 =                                                     -->
+                                <!-- col31 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10070),    -->
+                                <!--    'column_alias': 'verification__ds__extract_year'}  -->
+                                <!-- col32 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10071),       -->
+                                <!--    'column_alias': 'verification__ds__extract_quarter'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10072),     -->
+                                <!--    'column_alias': 'verification__ds__extract_month'}  -->
+                                <!-- col34 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10073),    -->
+                                <!--    'column_alias': 'verification__ds__extract_week'}  -->
+                                <!-- col35 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10074),   -->
+                                <!--    'column_alias': 'verification__ds__extract_day'}  -->
+                                <!-- col36 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10075),         -->
+                                <!--    'column_alias': 'verification__ds__extract_dayofweek'}  -->
+                                <!-- col37 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                             -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10076),         -->
+                                <!--    'column_alias': 'verification__ds__extract_dayofyear'}  -->
+                                <!-- col38 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10089),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
                                 <!--    'column_alias': 'verification__ds_partitioned__day'}     -->
-                                <!-- col18 =                                                   -->
+                                <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10044),      -->
                                 <!--    'column_alias': 'verification__ds_partitioned__week'}  -->
-                                <!-- col19 =                                                    -->
+                                <!-- col40 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10045),       -->
                                 <!--    'column_alias': 'verification__ds_partitioned__month'}  -->
-                                <!-- col20 =                                                      -->
+                                <!-- col41 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10046),         -->
                                 <!--    'column_alias': 'verification__ds_partitioned__quarter'}  -->
-                                <!-- col21 =                                                   -->
+                                <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10047),      -->
                                 <!--    'column_alias': 'verification__ds_partitioned__year'}  -->
-                                <!-- col22 =                                                     -->
+                                <!-- col43 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10077),                -->
+                                <!--    'column_alias': 'verification__ds_partitioned__extract_year'}  -->
+                                <!-- col44 =                                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10078),                   -->
+                                <!--    'column_alias': 'verification__ds_partitioned__extract_quarter'}  -->
+                                <!-- col45 =                                                            -->
+                                <!--   {'class': 'SqlSelectColumn',                                     -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10079),                 -->
+                                <!--    'column_alias': 'verification__ds_partitioned__extract_month'}  -->
+                                <!-- col46 =                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                    -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10080),                -->
+                                <!--    'column_alias': 'verification__ds_partitioned__extract_week'}  -->
+                                <!-- col47 =                                                          -->
+                                <!--   {'class': 'SqlSelectColumn',                                   -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10081),               -->
+                                <!--    'column_alias': 'verification__ds_partitioned__extract_day'}  -->
+                                <!-- col48 =                                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10082),                     -->
+                                <!--    'column_alias': 'verification__ds_partitioned__extract_dayofweek'}  -->
+                                <!-- col49 =                                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10083),                     -->
+                                <!--    'column_alias': 'verification__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col50 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10094),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10046),  -->
                                 <!--    'column_alias': 'verification__verification_type'}       -->
-                                <!-- col23 =                                                     -->
+                                <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10095),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10047),  -->
                                 <!--    'column_alias': 'verification'}                          -->
-                                <!-- col24 =                                                     -->
+                                <!-- col52 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10096),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10048),  -->
                                 <!--    'column_alias': 'user'}                                  -->
-                                <!-- col25 =                                                     -->
+                                <!-- col53 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10097),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10049),  -->
                                 <!--    'column_alias': 'verification__user'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10003) -->
                                 <!-- where = None -->
@@ -347,15 +571,15 @@
                         <!-- node_id = ss_9 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                         <!--    'column_alias': 'user'}                                -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
                         <!--    'column_alias': 'home_state'}                          -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10007) -->
                         <!-- where = None -->
@@ -364,7 +588,7 @@
                             <!-- node_id = ss_10007 -->
                             <!-- col0 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10145),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10073),  -->
                             <!--    'column_alias': 'ds__day'}                               -->
                             <!-- col1 =                                                -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -382,117 +606,285 @@
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10075),  -->
                             <!--    'column_alias': 'ds__year'}                        -->
-                            <!-- col5 =                                                      -->
+                            <!-- col5 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10126),  -->
+                            <!--    'column_alias': 'ds__extract_year'}              -->
+                            <!-- col6 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10127),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}           -->
+                            <!-- col7 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10128),  -->
+                            <!--    'column_alias': 'ds__extract_month'}             -->
+                            <!-- col8 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10129),  -->
+                            <!--    'column_alias': 'ds__extract_week'}              -->
+                            <!-- col9 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10130),  -->
+                            <!--    'column_alias': 'ds__extract_day'}               -->
+                            <!-- col10 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10131),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!-- col11 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10132),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!-- col12 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10150),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10074),  -->
                             <!--    'column_alias': 'created_at__day'}                       -->
-                            <!-- col6 =                                                -->
+                            <!-- col13 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10076),  -->
                             <!--    'column_alias': 'created_at__week'}                -->
-                            <!-- col7 =                                                -->
+                            <!-- col14 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10077),  -->
                             <!--    'column_alias': 'created_at__month'}               -->
-                            <!-- col8 =                                                -->
+                            <!-- col15 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10078),  -->
                             <!--    'column_alias': 'created_at__quarter'}             -->
-                            <!-- col9 =                                                -->
+                            <!-- col16 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10079),  -->
                             <!--    'column_alias': 'created_at__year'}                -->
-                            <!-- col10 =                                                     -->
+                            <!-- col17 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10133),  -->
+                            <!--    'column_alias': 'created_at__extract_year'}      -->
+                            <!-- col18 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10134),  -->
+                            <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                            <!-- col19 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10135),  -->
+                            <!--    'column_alias': 'created_at__extract_month'}     -->
+                            <!-- col20 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10136),  -->
+                            <!--    'column_alias': 'created_at__extract_week'}      -->
+                            <!-- col21 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10137),  -->
+                            <!--    'column_alias': 'created_at__extract_day'}       -->
+                            <!-- col22 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10138),   -->
+                            <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                            <!-- col23 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10139),   -->
+                            <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                            <!-- col24 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10155),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10075),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                            <!-- col11 =                                               -->
+                            <!-- col25 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10080),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}            -->
-                            <!-- col12 =                                               -->
+                            <!-- col26 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10081),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}           -->
-                            <!-- col13 =                                               -->
+                            <!-- col27 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10082),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                            <!-- col14 =                                               -->
+                            <!-- col28 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10083),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}            -->
-                            <!-- col15 =                                                     -->
+                            <!-- col29 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10140),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                            <!-- col30 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10141),     -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                            <!-- col31 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10142),   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                            <!-- col32 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10143),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                            <!-- col33 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10144),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                            <!-- col34 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10145),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col35 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10146),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col36 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10160),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10076),  -->
                             <!--    'column_alias': 'home_state'}                            -->
-                            <!-- col16 =                                                     -->
+                            <!-- col37 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10161),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10077),  -->
                             <!--    'column_alias': 'user__ds__day'}                         -->
-                            <!-- col17 =                                               -->
+                            <!-- col38 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10084),  -->
                             <!--    'column_alias': 'user__ds__week'}                  -->
-                            <!-- col18 =                                               -->
+                            <!-- col39 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10085),  -->
                             <!--    'column_alias': 'user__ds__month'}                 -->
-                            <!-- col19 =                                               -->
+                            <!-- col40 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10086),  -->
                             <!--    'column_alias': 'user__ds__quarter'}               -->
-                            <!-- col20 =                                               -->
+                            <!-- col41 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10087),  -->
                             <!--    'column_alias': 'user__ds__year'}                  -->
-                            <!-- col21 =                                                     -->
+                            <!-- col42 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10147),  -->
+                            <!--    'column_alias': 'user__ds__extract_year'}        -->
+                            <!-- col43 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10148),  -->
+                            <!--    'column_alias': 'user__ds__extract_quarter'}     -->
+                            <!-- col44 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10149),  -->
+                            <!--    'column_alias': 'user__ds__extract_month'}       -->
+                            <!-- col45 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10150),  -->
+                            <!--    'column_alias': 'user__ds__extract_week'}        -->
+                            <!-- col46 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10151),  -->
+                            <!--    'column_alias': 'user__ds__extract_day'}         -->
+                            <!-- col47 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10152),  -->
+                            <!--    'column_alias': 'user__ds__extract_dayofweek'}   -->
+                            <!-- col48 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10153),  -->
+                            <!--    'column_alias': 'user__ds__extract_dayofyear'}   -->
+                            <!-- col49 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10166),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10078),  -->
                             <!--    'column_alias': 'user__created_at__day'}                 -->
-                            <!-- col22 =                                               -->
+                            <!-- col50 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10088),  -->
                             <!--    'column_alias': 'user__created_at__week'}          -->
-                            <!-- col23 =                                               -->
+                            <!-- col51 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10089),  -->
                             <!--    'column_alias': 'user__created_at__month'}         -->
-                            <!-- col24 =                                               -->
+                            <!-- col52 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10090),  -->
                             <!--    'column_alias': 'user__created_at__quarter'}       -->
-                            <!-- col25 =                                               -->
+                            <!-- col53 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10091),  -->
                             <!--    'column_alias': 'user__created_at__year'}          -->
-                            <!-- col26 =                                                     -->
+                            <!-- col54 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10154),    -->
+                            <!--    'column_alias': 'user__created_at__extract_year'}  -->
+                            <!-- col55 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10155),       -->
+                            <!--    'column_alias': 'user__created_at__extract_quarter'}  -->
+                            <!-- col56 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10156),     -->
+                            <!--    'column_alias': 'user__created_at__extract_month'}  -->
+                            <!-- col57 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10157),    -->
+                            <!--    'column_alias': 'user__created_at__extract_week'}  -->
+                            <!-- col58 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10158),   -->
+                            <!--    'column_alias': 'user__created_at__extract_day'}  -->
+                            <!-- col59 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10159),         -->
+                            <!--    'column_alias': 'user__created_at__extract_dayofweek'}  -->
+                            <!-- col60 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10160),         -->
+                            <!--    'column_alias': 'user__created_at__extract_dayofyear'}  -->
+                            <!-- col61 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10171),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10079),  -->
                             <!--    'column_alias': 'user__ds_partitioned__day'}             -->
-                            <!-- col27 =                                               -->
+                            <!-- col62 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10092),  -->
                             <!--    'column_alias': 'user__ds_partitioned__week'}      -->
-                            <!-- col28 =                                               -->
+                            <!-- col63 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10093),  -->
                             <!--    'column_alias': 'user__ds_partitioned__month'}     -->
-                            <!-- col29 =                                               -->
+                            <!-- col64 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10094),  -->
                             <!--    'column_alias': 'user__ds_partitioned__quarter'}   -->
-                            <!-- col30 =                                               -->
+                            <!-- col65 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10095),  -->
                             <!--    'column_alias': 'user__ds_partitioned__year'}      -->
-                            <!-- col31 =                                                     -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10161),        -->
+                            <!--    'column_alias': 'user__ds_partitioned__extract_year'}  -->
+                            <!-- col67 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10162),           -->
+                            <!--    'column_alias': 'user__ds_partitioned__extract_quarter'}  -->
+                            <!-- col68 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10163),         -->
+                            <!--    'column_alias': 'user__ds_partitioned__extract_month'}  -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10164),        -->
+                            <!--    'column_alias': 'user__ds_partitioned__extract_week'}  -->
+                            <!-- col70 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10165),       -->
+                            <!--    'column_alias': 'user__ds_partitioned__extract_day'}  -->
+                            <!-- col71 =                                                        -->
+                            <!--   {'class': 'SqlSelectColumn',                                 -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10166),             -->
+                            <!--    'column_alias': 'user__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col72 =                                                        -->
+                            <!--   {'class': 'SqlSelectColumn',                                 -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10167),             -->
+                            <!--    'column_alias': 'user__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col73 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10176),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10080),  -->
                             <!--    'column_alias': 'user__home_state'}                      -->
-                            <!-- col32 =                                                     -->
+                            <!-- col74 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10177),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10081),  -->
                             <!--    'column_alias': 'user'}                                  -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10007) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml
index ea9d4375ce..132ec029e6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml
@@ -25,48 +25,104 @@
         <!-- col5 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_13),  -->
-        <!--    'column_alias': 'account__ds__day'}                   -->
+        <!--    'column_alias': 'ds__extract_year'}                   -->
         <!-- col6 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_14),  -->
-        <!--    'column_alias': 'account__ds__week'}                  -->
+        <!--    'column_alias': 'ds__extract_quarter'}                -->
         <!-- col7 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_15),  -->
-        <!--    'column_alias': 'account__ds__month'}                 -->
+        <!--    'column_alias': 'ds__extract_month'}                  -->
         <!-- col8 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_16),  -->
-        <!--    'column_alias': 'account__ds__quarter'}               -->
+        <!--    'column_alias': 'ds__extract_week'}                   -->
         <!-- col9 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_17),  -->
-        <!--    'column_alias': 'account__ds__year'}                  -->
+        <!--    'column_alias': 'ds__extract_day'}                    -->
         <!-- col10 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_18),  -->
-        <!--    'column_alias': 'user'}                               -->
+        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
         <!-- col11 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_19),  -->
+        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
+        <!-- col12 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_20),  -->
+        <!--    'column_alias': 'account__ds__day'}                   -->
+        <!-- col13 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_21),  -->
+        <!--    'column_alias': 'account__ds__week'}                  -->
+        <!-- col14 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_22),  -->
+        <!--    'column_alias': 'account__ds__month'}                 -->
+        <!-- col15 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_23),  -->
+        <!--    'column_alias': 'account__ds__quarter'}               -->
+        <!-- col16 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_24),  -->
+        <!--    'column_alias': 'account__ds__year'}                  -->
+        <!-- col17 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_25),  -->
+        <!--    'column_alias': 'account__ds__extract_year'}          -->
+        <!-- col18 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_26),  -->
+        <!--    'column_alias': 'account__ds__extract_quarter'}       -->
+        <!-- col19 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_27),  -->
+        <!--    'column_alias': 'account__ds__extract_month'}         -->
+        <!-- col20 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_28),  -->
+        <!--    'column_alias': 'account__ds__extract_week'}          -->
+        <!-- col21 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_29),  -->
+        <!--    'column_alias': 'account__ds__extract_day'}           -->
+        <!-- col22 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_30),  -->
+        <!--    'column_alias': 'account__ds__extract_dayofweek'}     -->
+        <!-- col23 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_31),  -->
+        <!--    'column_alias': 'account__ds__extract_dayofyear'}     -->
+        <!-- col24 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_32),  -->
+        <!--    'column_alias': 'user'}                               -->
+        <!-- col25 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_33),  -->
         <!--    'column_alias': 'account__user'}                      -->
-        <!-- col12 =                                                 -->
+        <!-- col26 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_6),  -->
         <!--    'column_alias': 'account_type'}                      -->
-        <!-- col13 =                                                 -->
+        <!-- col27 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_7),  -->
         <!--    'column_alias': 'account__account_type'}             -->
-        <!-- col14 =                                                 -->
+        <!-- col28 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_3),  -->
         <!--    'column_alias': 'account_balance'}                   -->
-        <!-- col15 =                                                 -->
+        <!-- col29 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_4),  -->
         <!--    'column_alias': 'total_account_balance_first_day'}   -->
-        <!-- col16 =                                                 -->
+        <!-- col30 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_5),  -->
         <!--    'column_alias': 'current_account_balance_by_user'}   -->
@@ -113,41 +169,97 @@
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10003),  -->
             <!--    'column_alias': 'ds__year'}                        -->
-            <!-- col8 =                                                      -->
+            <!-- col8 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10000),  -->
+            <!--    'column_alias': 'ds__extract_year'}              -->
+            <!-- col9 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10001),  -->
+            <!--    'column_alias': 'ds__extract_quarter'}           -->
+            <!-- col10 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10002),  -->
+            <!--    'column_alias': 'ds__extract_month'}             -->
+            <!-- col11 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10003),  -->
+            <!--    'column_alias': 'ds__extract_week'}              -->
+            <!-- col12 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10004),  -->
+            <!--    'column_alias': 'ds__extract_day'}               -->
+            <!-- col13 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10005),  -->
+            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+            <!-- col14 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10006),  -->
+            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+            <!-- col15 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10008),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10004),  -->
             <!--    'column_alias': 'account_type'}                          -->
-            <!-- col9 =                                                      -->
+            <!-- col16 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10005),  -->
             <!--    'column_alias': 'account__ds__day'}                      -->
-            <!-- col10 =                                               -->
+            <!-- col17 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10004),  -->
             <!--    'column_alias': 'account__ds__week'}               -->
-            <!-- col11 =                                               -->
+            <!-- col18 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10005),  -->
             <!--    'column_alias': 'account__ds__month'}              -->
-            <!-- col12 =                                               -->
+            <!-- col19 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10006),  -->
             <!--    'column_alias': 'account__ds__quarter'}            -->
-            <!-- col13 =                                               -->
+            <!-- col20 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10007),  -->
             <!--    'column_alias': 'account__ds__year'}               -->
-            <!-- col14 =                                                     -->
+            <!-- col21 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10007),  -->
+            <!--    'column_alias': 'account__ds__extract_year'}     -->
+            <!-- col22 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10008),  -->
+            <!--    'column_alias': 'account__ds__extract_quarter'}  -->
+            <!-- col23 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10009),  -->
+            <!--    'column_alias': 'account__ds__extract_month'}    -->
+            <!-- col24 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10010),  -->
+            <!--    'column_alias': 'account__ds__extract_week'}     -->
+            <!-- col25 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10011),  -->
+            <!--    'column_alias': 'account__ds__extract_day'}      -->
+            <!-- col26 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10012),    -->
+            <!--    'column_alias': 'account__ds__extract_dayofweek'}  -->
+            <!-- col27 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10013),    -->
+            <!--    'column_alias': 'account__ds__extract_dayofyear'}  -->
+            <!-- col28 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10006),  -->
             <!--    'column_alias': 'account__account_type'}                 -->
-            <!-- col15 =                                                     -->
+            <!-- col29 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10007),  -->
             <!--    'column_alias': 'user'}                                  -->
-            <!-- col16 =                                                     -->
+            <!-- col30 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10008),  -->
             <!--    'column_alias': 'account__user'}                         -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10000) -->
             <!-- where = None -->
@@ -201,41 +313,97 @@
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10003),  -->
                 <!--    'column_alias': 'ds__year'}                        -->
-                <!-- col8 =                                                      -->
+                <!-- col8 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10000),  -->
+                <!--    'column_alias': 'ds__extract_year'}              -->
+                <!-- col9 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10001),  -->
+                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                <!-- col10 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10002),  -->
+                <!--    'column_alias': 'ds__extract_month'}             -->
+                <!-- col11 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10003),  -->
+                <!--    'column_alias': 'ds__extract_week'}              -->
+                <!-- col12 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10004),  -->
+                <!--    'column_alias': 'ds__extract_day'}               -->
+                <!-- col13 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10005),  -->
+                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!-- col14 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10006),  -->
+                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10008),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10004),  -->
                 <!--    'column_alias': 'account_type'}                          -->
-                <!-- col9 =                                                      -->
+                <!-- col16 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10005),  -->
                 <!--    'column_alias': 'account__ds__day'}                      -->
-                <!-- col10 =                                               -->
+                <!-- col17 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10004),  -->
                 <!--    'column_alias': 'account__ds__week'}               -->
-                <!-- col11 =                                               -->
+                <!-- col18 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10005),  -->
                 <!--    'column_alias': 'account__ds__month'}              -->
-                <!-- col12 =                                               -->
+                <!-- col19 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10006),  -->
                 <!--    'column_alias': 'account__ds__quarter'}            -->
-                <!-- col13 =                                               -->
+                <!-- col20 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10007),  -->
                 <!--    'column_alias': 'account__ds__year'}               -->
-                <!-- col14 =                                                     -->
+                <!-- col21 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10007),  -->
+                <!--    'column_alias': 'account__ds__extract_year'}     -->
+                <!-- col22 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10008),  -->
+                <!--    'column_alias': 'account__ds__extract_quarter'}  -->
+                <!-- col23 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10009),  -->
+                <!--    'column_alias': 'account__ds__extract_month'}    -->
+                <!-- col24 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10010),  -->
+                <!--    'column_alias': 'account__ds__extract_week'}     -->
+                <!-- col25 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10011),  -->
+                <!--    'column_alias': 'account__ds__extract_day'}      -->
+                <!-- col26 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10012),    -->
+                <!--    'column_alias': 'account__ds__extract_dayofweek'}  -->
+                <!-- col27 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10013),    -->
+                <!--    'column_alias': 'account__ds__extract_dayofyear'}  -->
+                <!-- col28 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10006),  -->
                 <!--    'column_alias': 'account__account_type'}                 -->
-                <!-- col15 =                                                     -->
+                <!-- col29 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10007),  -->
                 <!--    'column_alias': 'user'}                                  -->
-                <!-- col16 =                                                     -->
+                <!-- col30 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10008),  -->
                 <!--    'column_alias': 'account__user'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10000) -->
                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml
index e3e3940b46..cceeec487f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml
@@ -25,48 +25,104 @@
         <!-- col5 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_16),  -->
-        <!--    'column_alias': 'account__ds__day'}                   -->
+        <!--    'column_alias': 'ds__extract_year'}                   -->
         <!-- col6 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_17),  -->
-        <!--    'column_alias': 'account__ds__week'}                  -->
+        <!--    'column_alias': 'ds__extract_quarter'}                -->
         <!-- col7 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_18),  -->
-        <!--    'column_alias': 'account__ds__month'}                 -->
+        <!--    'column_alias': 'ds__extract_month'}                  -->
         <!-- col8 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_19),  -->
-        <!--    'column_alias': 'account__ds__quarter'}               -->
+        <!--    'column_alias': 'ds__extract_week'}                   -->
         <!-- col9 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_20),  -->
-        <!--    'column_alias': 'account__ds__year'}                  -->
+        <!--    'column_alias': 'ds__extract_day'}                    -->
         <!-- col10 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_21),  -->
-        <!--    'column_alias': 'user'}                               -->
+        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
         <!-- col11 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_22),  -->
+        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
+        <!-- col12 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_23),  -->
+        <!--    'column_alias': 'account__ds__day'}                   -->
+        <!-- col13 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_24),  -->
+        <!--    'column_alias': 'account__ds__week'}                  -->
+        <!-- col14 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_25),  -->
+        <!--    'column_alias': 'account__ds__month'}                 -->
+        <!-- col15 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_26),  -->
+        <!--    'column_alias': 'account__ds__quarter'}               -->
+        <!-- col16 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_27),  -->
+        <!--    'column_alias': 'account__ds__year'}                  -->
+        <!-- col17 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_28),  -->
+        <!--    'column_alias': 'account__ds__extract_year'}          -->
+        <!-- col18 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_29),  -->
+        <!--    'column_alias': 'account__ds__extract_quarter'}       -->
+        <!-- col19 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_30),  -->
+        <!--    'column_alias': 'account__ds__extract_month'}         -->
+        <!-- col20 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_31),  -->
+        <!--    'column_alias': 'account__ds__extract_week'}          -->
+        <!-- col21 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_32),  -->
+        <!--    'column_alias': 'account__ds__extract_day'}           -->
+        <!-- col22 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_33),  -->
+        <!--    'column_alias': 'account__ds__extract_dayofweek'}     -->
+        <!-- col23 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_34),  -->
+        <!--    'column_alias': 'account__ds__extract_dayofyear'}     -->
+        <!-- col24 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_35),  -->
+        <!--    'column_alias': 'user'}                               -->
+        <!-- col25 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_36),  -->
         <!--    'column_alias': 'account__user'}                      -->
-        <!-- col12 =                                                 -->
+        <!-- col26 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_9),  -->
         <!--    'column_alias': 'account_type'}                      -->
-        <!-- col13 =                                                  -->
+        <!-- col27 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10),  -->
         <!--    'column_alias': 'account__account_type'}              -->
-        <!-- col14 =                                                 -->
+        <!-- col28 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_6),  -->
         <!--    'column_alias': 'account_balance'}                   -->
-        <!-- col15 =                                                 -->
+        <!-- col29 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_7),  -->
         <!--    'column_alias': 'total_account_balance_first_day'}   -->
-        <!-- col16 =                                                 -->
+        <!-- col30 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_8),  -->
         <!--    'column_alias': 'current_account_balance_by_user'}   -->
@@ -113,41 +169,97 @@
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10003),  -->
             <!--    'column_alias': 'ds__year'}                        -->
-            <!-- col8 =                                                      -->
+            <!-- col8 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10000),  -->
+            <!--    'column_alias': 'ds__extract_year'}              -->
+            <!-- col9 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10001),  -->
+            <!--    'column_alias': 'ds__extract_quarter'}           -->
+            <!-- col10 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10002),  -->
+            <!--    'column_alias': 'ds__extract_month'}             -->
+            <!-- col11 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10003),  -->
+            <!--    'column_alias': 'ds__extract_week'}              -->
+            <!-- col12 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10004),  -->
+            <!--    'column_alias': 'ds__extract_day'}               -->
+            <!-- col13 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10005),  -->
+            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+            <!-- col14 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10006),  -->
+            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+            <!-- col15 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10008),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10004),  -->
             <!--    'column_alias': 'account_type'}                          -->
-            <!-- col9 =                                                      -->
+            <!-- col16 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10005),  -->
             <!--    'column_alias': 'account__ds__day'}                      -->
-            <!-- col10 =                                               -->
+            <!-- col17 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10004),  -->
             <!--    'column_alias': 'account__ds__week'}               -->
-            <!-- col11 =                                               -->
+            <!-- col18 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10005),  -->
             <!--    'column_alias': 'account__ds__month'}              -->
-            <!-- col12 =                                               -->
+            <!-- col19 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10006),  -->
             <!--    'column_alias': 'account__ds__quarter'}            -->
-            <!-- col13 =                                               -->
+            <!-- col20 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10007),  -->
             <!--    'column_alias': 'account__ds__year'}               -->
-            <!-- col14 =                                                     -->
+            <!-- col21 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10007),  -->
+            <!--    'column_alias': 'account__ds__extract_year'}     -->
+            <!-- col22 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10008),  -->
+            <!--    'column_alias': 'account__ds__extract_quarter'}  -->
+            <!-- col23 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10009),  -->
+            <!--    'column_alias': 'account__ds__extract_month'}    -->
+            <!-- col24 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10010),  -->
+            <!--    'column_alias': 'account__ds__extract_week'}     -->
+            <!-- col25 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10011),  -->
+            <!--    'column_alias': 'account__ds__extract_day'}      -->
+            <!-- col26 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10012),    -->
+            <!--    'column_alias': 'account__ds__extract_dayofweek'}  -->
+            <!-- col27 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10013),    -->
+            <!--    'column_alias': 'account__ds__extract_dayofyear'}  -->
+            <!-- col28 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10006),  -->
             <!--    'column_alias': 'account__account_type'}                 -->
-            <!-- col15 =                                                     -->
+            <!-- col29 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10007),  -->
             <!--    'column_alias': 'user'}                                  -->
-            <!-- col16 =                                                     -->
+            <!-- col30 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10008),  -->
             <!--    'column_alias': 'account__user'}                         -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10000) -->
             <!-- where = None -->
@@ -209,41 +321,97 @@
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10003),  -->
                 <!--    'column_alias': 'ds__year'}                        -->
-                <!-- col8 =                                                      -->
+                <!-- col8 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10000),  -->
+                <!--    'column_alias': 'ds__extract_year'}              -->
+                <!-- col9 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10001),  -->
+                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                <!-- col10 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10002),  -->
+                <!--    'column_alias': 'ds__extract_month'}             -->
+                <!-- col11 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10003),  -->
+                <!--    'column_alias': 'ds__extract_week'}              -->
+                <!-- col12 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10004),  -->
+                <!--    'column_alias': 'ds__extract_day'}               -->
+                <!-- col13 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10005),  -->
+                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!-- col14 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10006),  -->
+                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10008),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10004),  -->
                 <!--    'column_alias': 'account_type'}                          -->
-                <!-- col9 =                                                      -->
+                <!-- col16 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10005),  -->
                 <!--    'column_alias': 'account__ds__day'}                      -->
-                <!-- col10 =                                               -->
+                <!-- col17 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10004),  -->
                 <!--    'column_alias': 'account__ds__week'}               -->
-                <!-- col11 =                                               -->
+                <!-- col18 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10005),  -->
                 <!--    'column_alias': 'account__ds__month'}              -->
-                <!-- col12 =                                               -->
+                <!-- col19 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10006),  -->
                 <!--    'column_alias': 'account__ds__quarter'}            -->
-                <!-- col13 =                                               -->
+                <!-- col20 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10007),  -->
                 <!--    'column_alias': 'account__ds__year'}               -->
-                <!-- col14 =                                                     -->
+                <!-- col21 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10007),  -->
+                <!--    'column_alias': 'account__ds__extract_year'}     -->
+                <!-- col22 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10008),  -->
+                <!--    'column_alias': 'account__ds__extract_quarter'}  -->
+                <!-- col23 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10009),  -->
+                <!--    'column_alias': 'account__ds__extract_month'}    -->
+                <!-- col24 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10010),  -->
+                <!--    'column_alias': 'account__ds__extract_week'}     -->
+                <!-- col25 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10011),  -->
+                <!--    'column_alias': 'account__ds__extract_day'}      -->
+                <!-- col26 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10012),    -->
+                <!--    'column_alias': 'account__ds__extract_dayofweek'}  -->
+                <!-- col27 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10013),    -->
+                <!--    'column_alias': 'account__ds__extract_dayofyear'}  -->
+                <!-- col28 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10006),  -->
                 <!--    'column_alias': 'account__account_type'}                 -->
-                <!-- col15 =                                                     -->
+                <!-- col29 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10007),  -->
                 <!--    'column_alias': 'user'}                                  -->
-                <!-- col16 =                                                     -->
+                <!-- col30 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10008),  -->
                 <!--    'column_alias': 'account__user'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10000) -->
                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
index 22a9628ef1..f030246e44 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
@@ -25,48 +25,104 @@
         <!-- col5 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_14),  -->
-        <!--    'column_alias': 'account__ds__day'}                   -->
+        <!--    'column_alias': 'ds__extract_year'}                   -->
         <!-- col6 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_15),  -->
-        <!--    'column_alias': 'account__ds__week'}                  -->
+        <!--    'column_alias': 'ds__extract_quarter'}                -->
         <!-- col7 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_16),  -->
-        <!--    'column_alias': 'account__ds__month'}                 -->
+        <!--    'column_alias': 'ds__extract_month'}                  -->
         <!-- col8 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_17),  -->
-        <!--    'column_alias': 'account__ds__quarter'}               -->
+        <!--    'column_alias': 'ds__extract_week'}                   -->
         <!-- col9 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_18),  -->
-        <!--    'column_alias': 'account__ds__year'}                  -->
+        <!--    'column_alias': 'ds__extract_day'}                    -->
         <!-- col10 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_19),  -->
-        <!--    'column_alias': 'user'}                               -->
+        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
         <!-- col11 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_20),  -->
+        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
+        <!-- col12 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_21),  -->
+        <!--    'column_alias': 'account__ds__day'}                   -->
+        <!-- col13 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_22),  -->
+        <!--    'column_alias': 'account__ds__week'}                  -->
+        <!-- col14 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_23),  -->
+        <!--    'column_alias': 'account__ds__month'}                 -->
+        <!-- col15 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_24),  -->
+        <!--    'column_alias': 'account__ds__quarter'}               -->
+        <!-- col16 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_25),  -->
+        <!--    'column_alias': 'account__ds__year'}                  -->
+        <!-- col17 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_26),  -->
+        <!--    'column_alias': 'account__ds__extract_year'}          -->
+        <!-- col18 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_27),  -->
+        <!--    'column_alias': 'account__ds__extract_quarter'}       -->
+        <!-- col19 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_28),  -->
+        <!--    'column_alias': 'account__ds__extract_month'}         -->
+        <!-- col20 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_29),  -->
+        <!--    'column_alias': 'account__ds__extract_week'}          -->
+        <!-- col21 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_30),  -->
+        <!--    'column_alias': 'account__ds__extract_day'}           -->
+        <!-- col22 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_31),  -->
+        <!--    'column_alias': 'account__ds__extract_dayofweek'}     -->
+        <!-- col23 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_32),  -->
+        <!--    'column_alias': 'account__ds__extract_dayofyear'}     -->
+        <!-- col24 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_33),  -->
+        <!--    'column_alias': 'user'}                               -->
+        <!-- col25 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_34),  -->
         <!--    'column_alias': 'account__user'}                      -->
-        <!-- col12 =                                                 -->
+        <!-- col26 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_7),  -->
         <!--    'column_alias': 'account_type'}                      -->
-        <!-- col13 =                                                 -->
+        <!-- col27 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_8),  -->
         <!--    'column_alias': 'account__account_type'}             -->
-        <!-- col14 =                                                 -->
+        <!-- col28 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_4),  -->
         <!--    'column_alias': 'account_balance'}                   -->
-        <!-- col15 =                                                 -->
+        <!-- col29 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_5),  -->
         <!--    'column_alias': 'total_account_balance_first_day'}   -->
-        <!-- col16 =                                                 -->
+        <!-- col30 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_6),  -->
         <!--    'column_alias': 'current_account_balance_by_user'}   -->
@@ -113,41 +169,97 @@
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10003),  -->
             <!--    'column_alias': 'ds__year'}                        -->
-            <!-- col8 =                                                      -->
+            <!-- col8 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10000),  -->
+            <!--    'column_alias': 'ds__extract_year'}              -->
+            <!-- col9 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10001),  -->
+            <!--    'column_alias': 'ds__extract_quarter'}           -->
+            <!-- col10 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10002),  -->
+            <!--    'column_alias': 'ds__extract_month'}             -->
+            <!-- col11 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10003),  -->
+            <!--    'column_alias': 'ds__extract_week'}              -->
+            <!-- col12 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10004),  -->
+            <!--    'column_alias': 'ds__extract_day'}               -->
+            <!-- col13 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10005),  -->
+            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+            <!-- col14 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10006),  -->
+            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+            <!-- col15 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10008),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10004),  -->
             <!--    'column_alias': 'account_type'}                          -->
-            <!-- col9 =                                                      -->
+            <!-- col16 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10005),  -->
             <!--    'column_alias': 'account__ds__day'}                      -->
-            <!-- col10 =                                               -->
+            <!-- col17 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10004),  -->
             <!--    'column_alias': 'account__ds__week'}               -->
-            <!-- col11 =                                               -->
+            <!-- col18 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10005),  -->
             <!--    'column_alias': 'account__ds__month'}              -->
-            <!-- col12 =                                               -->
+            <!-- col19 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10006),  -->
             <!--    'column_alias': 'account__ds__quarter'}            -->
-            <!-- col13 =                                               -->
+            <!-- col20 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10007),  -->
             <!--    'column_alias': 'account__ds__year'}               -->
-            <!-- col14 =                                                     -->
+            <!-- col21 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10007),  -->
+            <!--    'column_alias': 'account__ds__extract_year'}     -->
+            <!-- col22 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10008),  -->
+            <!--    'column_alias': 'account__ds__extract_quarter'}  -->
+            <!-- col23 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10009),  -->
+            <!--    'column_alias': 'account__ds__extract_month'}    -->
+            <!-- col24 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10010),  -->
+            <!--    'column_alias': 'account__ds__extract_week'}     -->
+            <!-- col25 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10011),  -->
+            <!--    'column_alias': 'account__ds__extract_day'}      -->
+            <!-- col26 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10012),    -->
+            <!--    'column_alias': 'account__ds__extract_dayofweek'}  -->
+            <!-- col27 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10013),    -->
+            <!--    'column_alias': 'account__ds__extract_dayofyear'}  -->
+            <!-- col28 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10006),  -->
             <!--    'column_alias': 'account__account_type'}                 -->
-            <!-- col15 =                                                     -->
+            <!-- col29 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10007),  -->
             <!--    'column_alias': 'user'}                                  -->
-            <!-- col16 =                                                     -->
+            <!-- col30 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10008),  -->
             <!--    'column_alias': 'account__user'}                         -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10000) -->
             <!-- where = None -->
@@ -209,41 +321,97 @@
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10003),  -->
                 <!--    'column_alias': 'ds__year'}                        -->
-                <!-- col8 =                                                      -->
+                <!-- col8 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10000),  -->
+                <!--    'column_alias': 'ds__extract_year'}              -->
+                <!-- col9 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10001),  -->
+                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                <!-- col10 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10002),  -->
+                <!--    'column_alias': 'ds__extract_month'}             -->
+                <!-- col11 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10003),  -->
+                <!--    'column_alias': 'ds__extract_week'}              -->
+                <!-- col12 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10004),  -->
+                <!--    'column_alias': 'ds__extract_day'}               -->
+                <!-- col13 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10005),  -->
+                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!-- col14 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10006),  -->
+                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10008),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10004),  -->
                 <!--    'column_alias': 'account_type'}                          -->
-                <!-- col9 =                                                      -->
+                <!-- col16 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10005),  -->
                 <!--    'column_alias': 'account__ds__day'}                      -->
-                <!-- col10 =                                               -->
+                <!-- col17 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10004),  -->
                 <!--    'column_alias': 'account__ds__week'}               -->
-                <!-- col11 =                                               -->
+                <!-- col18 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10005),  -->
                 <!--    'column_alias': 'account__ds__month'}              -->
-                <!-- col12 =                                               -->
+                <!-- col19 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10006),  -->
                 <!--    'column_alias': 'account__ds__quarter'}            -->
-                <!-- col13 =                                               -->
+                <!-- col20 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10007),  -->
                 <!--    'column_alias': 'account__ds__year'}               -->
-                <!-- col14 =                                                     -->
+                <!-- col21 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10007),  -->
+                <!--    'column_alias': 'account__ds__extract_year'}     -->
+                <!-- col22 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10008),  -->
+                <!--    'column_alias': 'account__ds__extract_quarter'}  -->
+                <!-- col23 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10009),  -->
+                <!--    'column_alias': 'account__ds__extract_month'}    -->
+                <!-- col24 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10010),  -->
+                <!--    'column_alias': 'account__ds__extract_week'}     -->
+                <!-- col25 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10011),  -->
+                <!--    'column_alias': 'account__ds__extract_day'}      -->
+                <!-- col26 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10012),    -->
+                <!--    'column_alias': 'account__ds__extract_dayofweek'}  -->
+                <!-- col27 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10013),    -->
+                <!--    'column_alias': 'account__ds__extract_dayofyear'}  -->
+                <!-- col28 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10006),  -->
                 <!--    'column_alias': 'account__account_type'}                 -->
-                <!-- col15 =                                                     -->
+                <!-- col29 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10007),  -->
                 <!--    'column_alias': 'user'}                                  -->
-                <!-- col16 =                                                     -->
+                <!-- col30 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10008),  -->
                 <!--    'column_alias': 'account__user'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10000) -->
                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml
index 23bf64d5f1..e1cc885427 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml
@@ -46,27 +46,27 @@
                 <!--    'column_alias': 'instant_bookings'}                                                              -->
                 <!-- col2 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                 <!--    'column_alias': 'booking_value'}                         -->
                 <!-- col3 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                 <!--    'column_alias': 'max_booking_value'}                     -->
                 <!-- col4 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                 <!--    'column_alias': 'min_booking_value'}                     -->
                 <!-- col5 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                 <!--    'column_alias': 'bookers'}                               -->
                 <!-- col6 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                 <!--    'column_alias': 'average_booking_value'}                 -->
                 <!-- col7 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                 <!--    'column_alias': 'booking_payments'}                      -->
                 <!-- col8 =                                                                                                           -->
                 <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -74,31 +74,31 @@
                 <!--    'column_alias': 'referred_bookings'}                                                                          -->
                 <!-- col9 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                 <!--    'column_alias': 'median_booking_value'}                  -->
                 <!-- col10 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                 <!--    'column_alias': 'booking_value_p99'}                     -->
                 <!-- col11 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                 <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                 <!-- col12 =                                                         -->
                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                 <!-- col13 =                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                 <!-- col14 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                 <!--    'column_alias': 'is_instant'}                            -->
                 <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                 <!--    'column_alias': 'ds__day'}                               -->
                 <!-- col16 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -116,133 +116,301 @@
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                 <!--    'column_alias': 'ds__year'}                        -->
-                <!-- col20 =                                                     -->
+                <!-- col20 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                <!--    'column_alias': 'ds__extract_year'}              -->
+                <!-- col21 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                <!-- col22 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                <!--    'column_alias': 'ds__extract_month'}             -->
+                <!-- col23 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                <!--    'column_alias': 'ds__extract_week'}              -->
+                <!-- col24 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                <!--    'column_alias': 'ds__extract_day'}               -->
+                <!-- col25 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!-- col26 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                 <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                <!-- col21 =                                               -->
+                <!-- col28 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                 <!--    'column_alias': 'ds_partitioned__week'}            -->
-                <!-- col22 =                                               -->
+                <!-- col29 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                 <!--    'column_alias': 'ds_partitioned__month'}           -->
-                <!-- col23 =                                               -->
+                <!-- col30 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                 <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                <!-- col24 =                                               -->
+                <!-- col31 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                 <!--    'column_alias': 'ds_partitioned__year'}            -->
-                <!-- col25 =                                                     -->
+                <!-- col32 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                <!-- col33 =                                                -->
+                <!--   {'class': 'SqlSelectColumn',                         -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                <!-- col34 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                <!-- col35 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                <!-- col36 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                <!-- col37 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                <!-- col38 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                <!-- col39 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                 <!--    'column_alias': 'paid_at__day'}                          -->
-                <!-- col26 =                                               -->
+                <!-- col40 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                 <!--    'column_alias': 'paid_at__week'}                   -->
-                <!-- col27 =                                               -->
+                <!-- col41 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                 <!--    'column_alias': 'paid_at__month'}                  -->
-                <!-- col28 =                                               -->
+                <!-- col42 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                 <!--    'column_alias': 'paid_at__quarter'}                -->
-                <!-- col29 =                                               -->
+                <!-- col43 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                 <!--    'column_alias': 'paid_at__year'}                   -->
-                <!-- col30 =                                                     -->
+                <!-- col44 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                <!-- col45 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                <!-- col46 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                <!-- col47 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                <!-- col48 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                <!-- col49 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                <!-- col50 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                <!-- col51 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                 <!--    'column_alias': 'booking__is_instant'}                   -->
-                <!-- col31 =                                                     -->
+                <!-- col52 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                 <!--    'column_alias': 'booking__ds__day'}                      -->
-                <!-- col32 =                                               -->
+                <!-- col53 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                 <!--    'column_alias': 'booking__ds__week'}               -->
-                <!-- col33 =                                               -->
+                <!-- col54 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                 <!--    'column_alias': 'booking__ds__month'}              -->
-                <!-- col34 =                                               -->
+                <!-- col55 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                 <!--    'column_alias': 'booking__ds__quarter'}            -->
-                <!-- col35 =                                               -->
+                <!-- col56 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                 <!--    'column_alias': 'booking__ds__year'}               -->
-                <!-- col36 =                                                     -->
-                <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                <!-- col57 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                <!-- col58 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                <!-- col59 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                <!-- col60 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                <!-- col61 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                <!-- col62 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                <!-- col63 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                <!-- col64 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                <!-- col37 =                                               -->
+                <!-- col65 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                <!-- col38 =                                               -->
+                <!-- col66 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                <!-- col39 =                                                 -->
+                <!-- col67 =                                                 -->
                 <!--   {'class': 'SqlSelectColumn',                          -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                <!-- col40 =                                               -->
+                <!-- col68 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                 <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                <!-- col41 =                                                     -->
-                <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                <!-- col69 =                                                      -->
+                <!--   {'class': 'SqlSelectColumn',                               -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                <!-- col70 =                                                         -->
+                <!--   {'class': 'SqlSelectColumn',                                  -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                <!-- col71 =                                                       -->
+                <!--   {'class': 'SqlSelectColumn',                                -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                <!-- col72 =                                                      -->
+                <!--   {'class': 'SqlSelectColumn',                               -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                <!-- col73 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                <!-- col74 =                                                           -->
+                <!--   {'class': 'SqlSelectColumn',                                    -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                <!-- col75 =                                                           -->
+                <!--   {'class': 'SqlSelectColumn',                                    -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                <!-- col76 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                 <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                <!-- col42 =                                               -->
+                <!-- col77 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                 <!--    'column_alias': 'booking__paid_at__week'}          -->
-                <!-- col43 =                                               -->
+                <!-- col78 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                 <!--    'column_alias': 'booking__paid_at__month'}         -->
-                <!-- col44 =                                               -->
+                <!-- col79 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                 <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                <!-- col45 =                                               -->
+                <!-- col80 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                 <!--    'column_alias': 'booking__paid_at__year'}          -->
-                <!-- col46 =                                                     -->
+                <!-- col81 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                <!-- col82 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                <!-- col83 =                                                -->
+                <!--   {'class': 'SqlSelectColumn',                         -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                <!-- col84 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                <!-- col85 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                <!-- col86 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                             -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                <!-- col87 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                             -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                <!-- col88 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                 <!--    'column_alias': 'listing'}                               -->
-                <!-- col47 =                                                     -->
+                <!-- col89 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                 <!--    'column_alias': 'guest'}                                 -->
-                <!-- col48 =                                                     -->
+                <!-- col90 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                 <!--    'column_alias': 'host'}                                  -->
-                <!-- col49 =                                                     -->
+                <!-- col91 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                 <!--    'column_alias': 'booking__listing'}                      -->
-                <!-- col50 =                                                     -->
+                <!-- col92 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                 <!--    'column_alias': 'booking__guest'}                        -->
-                <!-- col51 =                                                     -->
+                <!-- col93 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                 <!--    'column_alias': 'booking__host'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                 <!-- where = None -->
@@ -277,15 +445,15 @@
                 <!--    'column_alias': 'listings'}                                 -->
                 <!-- col1 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
                 <!--    'column_alias': 'largest_listing'}                       -->
                 <!-- col2 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10099),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10051),  -->
                 <!--    'column_alias': 'smallest_listing'}                      -->
                 <!-- col3 =                                                      -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10052),  -->
                 <!--    'column_alias': 'ds__day'}                               -->
                 <!-- col4 =                                                -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
@@ -303,101 +471,213 @@
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10051),  -->
                 <!--    'column_alias': 'ds__year'}                        -->
-                <!-- col8 =                                                      -->
+                <!-- col8 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10084),  -->
+                <!--    'column_alias': 'ds__extract_year'}              -->
+                <!-- col9 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10085),  -->
+                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                <!-- col10 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10086),  -->
+                <!--    'column_alias': 'ds__extract_month'}             -->
+                <!-- col11 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10087),  -->
+                <!--    'column_alias': 'ds__extract_week'}              -->
+                <!-- col12 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10088),  -->
+                <!--    'column_alias': 'ds__extract_day'}               -->
+                <!-- col13 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
+                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!-- col14 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
+                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
                 <!--    'column_alias': 'created_at__day'}                       -->
-                <!-- col9 =                                                -->
+                <!-- col16 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10052),  -->
                 <!--    'column_alias': 'created_at__week'}                -->
-                <!-- col10 =                                               -->
+                <!-- col17 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10053),  -->
                 <!--    'column_alias': 'created_at__month'}               -->
-                <!-- col11 =                                               -->
+                <!-- col18 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10054),  -->
                 <!--    'column_alias': 'created_at__quarter'}             -->
-                <!-- col12 =                                               -->
+                <!-- col19 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10055),  -->
                 <!--    'column_alias': 'created_at__year'}                -->
-                <!-- col13 =                                                     -->
+                <!-- col20 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10091),  -->
+                <!--    'column_alias': 'created_at__extract_year'}      -->
+                <!-- col21 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10092),  -->
+                <!--    'column_alias': 'created_at__extract_quarter'}   -->
+                <!-- col22 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10093),  -->
+                <!--    'column_alias': 'created_at__extract_month'}     -->
+                <!-- col23 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10094),  -->
+                <!--    'column_alias': 'created_at__extract_week'}      -->
+                <!-- col24 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
+                <!--    'column_alias': 'created_at__extract_day'}       -->
+                <!-- col25 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
+                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
+                <!-- col26 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
+                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10110),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
                 <!--    'column_alias': 'country_latest'}                        -->
-                <!-- col14 =                                                     -->
+                <!-- col28 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10111),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
                 <!--    'column_alias': 'is_lux_latest'}                         -->
-                <!-- col15 =                                                     -->
+                <!-- col29 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10112),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10056),  -->
                 <!--    'column_alias': 'capacity_latest'}                       -->
-                <!-- col16 =                                                     -->
+                <!-- col30 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10113),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10057),  -->
                 <!--    'column_alias': 'listing__ds__day'}                      -->
-                <!-- col17 =                                               -->
+                <!-- col31 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10056),  -->
                 <!--    'column_alias': 'listing__ds__week'}               -->
-                <!-- col18 =                                               -->
+                <!-- col32 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10057),  -->
                 <!--    'column_alias': 'listing__ds__month'}              -->
-                <!-- col19 =                                               -->
+                <!-- col33 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10058),  -->
                 <!--    'column_alias': 'listing__ds__quarter'}            -->
-                <!-- col20 =                                               -->
+                <!-- col34 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10059),  -->
                 <!--    'column_alias': 'listing__ds__year'}               -->
-                <!-- col21 =                                                     -->
+                <!-- col35 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10098),  -->
+                <!--    'column_alias': 'listing__ds__extract_year'}     -->
+                <!-- col36 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10099),  -->
+                <!--    'column_alias': 'listing__ds__extract_quarter'}  -->
+                <!-- col37 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10100),  -->
+                <!--    'column_alias': 'listing__ds__extract_month'}    -->
+                <!-- col38 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10101),  -->
+                <!--    'column_alias': 'listing__ds__extract_week'}     -->
+                <!-- col39 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
+                <!--    'column_alias': 'listing__ds__extract_day'}      -->
+                <!-- col40 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
+                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
+                <!-- col41 =                                               -->
+                <!--   {'class': 'SqlSelectColumn',                        -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
+                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                <!-- col42 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10118),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
                 <!--    'column_alias': 'listing__created_at__day'}              -->
-                <!-- col22 =                                               -->
+                <!-- col43 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10060),  -->
                 <!--    'column_alias': 'listing__created_at__week'}       -->
-                <!-- col23 =                                               -->
+                <!-- col44 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10061),  -->
                 <!--    'column_alias': 'listing__created_at__month'}      -->
-                <!-- col24 =                                               -->
+                <!-- col45 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10062),  -->
                 <!--    'column_alias': 'listing__created_at__quarter'}    -->
-                <!-- col25 =                                               -->
+                <!-- col46 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                        -->
                 <!--    'expr': SqlDateTruncExpression(node_id=dt_10063),  -->
                 <!--    'column_alias': 'listing__created_at__year'}       -->
-                <!-- col26 =                                                     -->
+                <!-- col47 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10105),       -->
+                <!--    'column_alias': 'listing__created_at__extract_year'}  -->
+                <!-- col48 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10106),          -->
+                <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
+                <!-- col49 =                                                   -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10107),        -->
+                <!--    'column_alias': 'listing__created_at__extract_month'}  -->
+                <!-- col50 =                                                  -->
+                <!--   {'class': 'SqlSelectColumn',                           -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10108),       -->
+                <!--    'column_alias': 'listing__created_at__extract_week'}  -->
+                <!-- col51 =                                                 -->
+                <!--   {'class': 'SqlSelectColumn',                          -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
+                <!--    'column_alias': 'listing__created_at__extract_day'}  -->
+                <!-- col52 =                                                       -->
+                <!--   {'class': 'SqlSelectColumn',                                -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
+                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
+                <!-- col53 =                                                       -->
+                <!--   {'class': 'SqlSelectColumn',                                -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
+                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                <!-- col54 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
                 <!--    'column_alias': 'listing__country_latest'}               -->
-                <!-- col27 =                                                     -->
+                <!-- col55 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10124),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
                 <!--    'column_alias': 'listing__is_lux_latest'}                -->
-                <!-- col28 =                                                     -->
+                <!-- col56 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10125),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
                 <!--    'column_alias': 'listing__capacity_latest'}              -->
-                <!-- col29 =                                                     -->
+                <!-- col57 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10126),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
                 <!--    'column_alias': 'listing'}                               -->
-                <!-- col30 =                                                     -->
+                <!-- col58 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10127),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
                 <!--    'column_alias': 'user'}                                  -->
-                <!-- col31 =                                                     -->
+                <!-- col59 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10128),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
                 <!--    'column_alias': 'listing__user'}                         -->
                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10004) -->
                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml
index 9b0610cf8b..c497bc5f85 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml
@@ -12,27 +12,27 @@
         <!--    'column_alias': 'instant_bookings'}                                                              -->
         <!-- col2 =                                                      -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
         <!--    'column_alias': 'booking_value'}                         -->
         <!-- col3 =                                                      -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
         <!--    'column_alias': 'max_booking_value'}                     -->
         <!-- col4 =                                                      -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
         <!--    'column_alias': 'min_booking_value'}                     -->
         <!-- col5 =                                                      -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
         <!--    'column_alias': 'bookers'}                               -->
         <!-- col6 =                                                      -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
         <!--    'column_alias': 'average_booking_value'}                 -->
         <!-- col7 =                                                      -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
         <!--    'column_alias': 'booking_payments'}                      -->
         <!-- col8 =                                                                                                           -->
         <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -40,31 +40,31 @@
         <!--    'column_alias': 'referred_bookings'}                                                                          -->
         <!-- col9 =                                                      -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
         <!--    'column_alias': 'median_booking_value'}                  -->
         <!-- col10 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
         <!--    'column_alias': 'booking_value_p99'}                     -->
         <!-- col11 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
         <!--    'column_alias': 'discrete_booking_value_p99'}            -->
         <!-- col12 =                                                         -->
         <!--   {'class': 'SqlSelectColumn',                                  -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
         <!-- col13 =                                                       -->
         <!--   {'class': 'SqlSelectColumn',                                -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
         <!-- col14 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
         <!--    'column_alias': 'is_instant'}                            -->
         <!-- col15 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
         <!--    'column_alias': 'ds__day'}                               -->
         <!-- col16 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
@@ -82,133 +82,301 @@
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
         <!--    'column_alias': 'ds__year'}                        -->
-        <!-- col20 =                                                     -->
+        <!-- col20 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+        <!--    'column_alias': 'ds__extract_year'}              -->
+        <!-- col21 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+        <!--    'column_alias': 'ds__extract_quarter'}           -->
+        <!-- col22 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+        <!--    'column_alias': 'ds__extract_month'}             -->
+        <!-- col23 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+        <!--    'column_alias': 'ds__extract_week'}              -->
+        <!-- col24 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+        <!--    'column_alias': 'ds__extract_day'}               -->
+        <!-- col25 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+        <!-- col26 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+        <!-- col27 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
         <!--    'column_alias': 'ds_partitioned__day'}                   -->
-        <!-- col21 =                                               -->
+        <!-- col28 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
         <!--    'column_alias': 'ds_partitioned__week'}            -->
-        <!-- col22 =                                               -->
+        <!-- col29 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
         <!--    'column_alias': 'ds_partitioned__month'}           -->
-        <!-- col23 =                                               -->
+        <!-- col30 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
         <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-        <!-- col24 =                                               -->
+        <!-- col31 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
         <!--    'column_alias': 'ds_partitioned__year'}            -->
-        <!-- col25 =                                                     -->
+        <!-- col32 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+        <!-- col33 =                                                -->
+        <!--   {'class': 'SqlSelectColumn',                         -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+        <!-- col34 =                                              -->
+        <!--   {'class': 'SqlSelectColumn',                       -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+        <!-- col35 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+        <!-- col36 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+        <!-- col37 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+        <!-- col38 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+        <!-- col39 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
         <!--    'column_alias': 'paid_at__day'}                          -->
-        <!-- col26 =                                               -->
+        <!-- col40 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
         <!--    'column_alias': 'paid_at__week'}                   -->
-        <!-- col27 =                                               -->
+        <!-- col41 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
         <!--    'column_alias': 'paid_at__month'}                  -->
-        <!-- col28 =                                               -->
+        <!-- col42 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
         <!--    'column_alias': 'paid_at__quarter'}                -->
-        <!-- col29 =                                               -->
+        <!-- col43 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
         <!--    'column_alias': 'paid_at__year'}                   -->
-        <!-- col30 =                                                     -->
+        <!-- col44 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+        <!--    'column_alias': 'paid_at__extract_year'}         -->
+        <!-- col45 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+        <!-- col46 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+        <!--    'column_alias': 'paid_at__extract_month'}        -->
+        <!-- col47 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+        <!--    'column_alias': 'paid_at__extract_week'}         -->
+        <!-- col48 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+        <!--    'column_alias': 'paid_at__extract_day'}          -->
+        <!-- col49 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+        <!-- col50 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+        <!-- col51 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
         <!--    'column_alias': 'booking__is_instant'}                   -->
-        <!-- col31 =                                                     -->
+        <!-- col52 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
         <!--    'column_alias': 'booking__ds__day'}                      -->
-        <!-- col32 =                                               -->
+        <!-- col53 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
         <!--    'column_alias': 'booking__ds__week'}               -->
-        <!-- col33 =                                               -->
+        <!-- col54 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
         <!--    'column_alias': 'booking__ds__month'}              -->
-        <!-- col34 =                                               -->
+        <!-- col55 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
         <!--    'column_alias': 'booking__ds__quarter'}            -->
-        <!-- col35 =                                               -->
+        <!-- col56 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
         <!--    'column_alias': 'booking__ds__year'}               -->
-        <!-- col36 =                                                     -->
+        <!-- col57 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+        <!-- col58 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+        <!-- col59 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+        <!-- col60 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+        <!-- col61 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+        <!-- col62 =                                               -->
+        <!--   {'class': 'SqlSelectColumn',                        -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+        <!-- col63 =                                               -->
+        <!--   {'class': 'SqlSelectColumn',                        -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+        <!-- col64 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
         <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-        <!-- col37 =                                               -->
+        <!-- col65 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
         <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-        <!-- col38 =                                               -->
+        <!-- col66 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
         <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-        <!-- col39 =                                                 -->
+        <!-- col67 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
         <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-        <!-- col40 =                                               -->
+        <!-- col68 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
         <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-        <!-- col41 =                                                     -->
+        <!-- col69 =                                                      -->
+        <!--   {'class': 'SqlSelectColumn',                               -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+        <!-- col70 =                                                         -->
+        <!--   {'class': 'SqlSelectColumn',                                  -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+        <!-- col71 =                                                       -->
+        <!--   {'class': 'SqlSelectColumn',                                -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+        <!-- col72 =                                                      -->
+        <!--   {'class': 'SqlSelectColumn',                               -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+        <!-- col73 =                                                     -->
+        <!--   {'class': 'SqlSelectColumn',                              -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+        <!-- col74 =                                                           -->
+        <!--   {'class': 'SqlSelectColumn',                                    -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+        <!-- col75 =                                                           -->
+        <!--   {'class': 'SqlSelectColumn',                                    -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+        <!-- col76 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
         <!--    'column_alias': 'booking__paid_at__day'}                 -->
-        <!-- col42 =                                               -->
+        <!-- col77 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
         <!--    'column_alias': 'booking__paid_at__week'}          -->
-        <!-- col43 =                                               -->
+        <!-- col78 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
         <!--    'column_alias': 'booking__paid_at__month'}         -->
-        <!-- col44 =                                               -->
+        <!-- col79 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
         <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-        <!-- col45 =                                               -->
+        <!-- col80 =                                               -->
         <!--   {'class': 'SqlSelectColumn',                        -->
         <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
         <!--    'column_alias': 'booking__paid_at__year'}          -->
-        <!-- col46 =                                                     -->
+        <!-- col81 =                                               -->
+        <!--   {'class': 'SqlSelectColumn',                        -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+        <!-- col82 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+        <!-- col83 =                                                -->
+        <!--   {'class': 'SqlSelectColumn',                         -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+        <!-- col84 =                                               -->
+        <!--   {'class': 'SqlSelectColumn',                        -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+        <!-- col85 =                                              -->
+        <!--   {'class': 'SqlSelectColumn',                       -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+        <!-- col86 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                             -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+        <!-- col87 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                             -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+        <!-- col88 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
         <!--    'column_alias': 'listing'}                               -->
-        <!-- col47 =                                                     -->
+        <!-- col89 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
         <!--    'column_alias': 'guest'}                                 -->
-        <!-- col48 =                                                     -->
+        <!-- col90 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
         <!--    'column_alias': 'host'}                                  -->
-        <!-- col49 =                                                     -->
+        <!-- col91 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
         <!--    'column_alias': 'booking__listing'}                      -->
-        <!-- col50 =                                                     -->
+        <!-- col92 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
         <!--    'column_alias': 'booking__guest'}                        -->
-        <!-- col51 =                                                     -->
+        <!-- col93 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
         <!--    'column_alias': 'booking__host'}                         -->
         <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 0438bcd3c2..343e8eb274 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -5,31 +5,73 @@ SELECT
   , subq_0.ds__month
   , subq_0.ds__quarter
   , subq_0.ds__year
+  , subq_0.ds__extract_year
+  , subq_0.ds__extract_quarter
+  , subq_0.ds__extract_month
+  , subq_0.ds__extract_week
+  , subq_0.ds__extract_day
+  , subq_0.ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
   , subq_0.ds_partitioned__quarter
   , subq_0.ds_partitioned__year
+  , subq_0.ds_partitioned__extract_year
+  , subq_0.ds_partitioned__extract_quarter
+  , subq_0.ds_partitioned__extract_month
+  , subq_0.ds_partitioned__extract_week
+  , subq_0.ds_partitioned__extract_day
+  , subq_0.ds_partitioned__extract_dayofweek
+  , subq_0.ds_partitioned__extract_dayofyear
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
   , subq_0.paid_at__quarter
   , subq_0.paid_at__year
+  , subq_0.paid_at__extract_year
+  , subq_0.paid_at__extract_quarter
+  , subq_0.paid_at__extract_month
+  , subq_0.paid_at__extract_week
+  , subq_0.paid_at__extract_day
+  , subq_0.paid_at__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
   , subq_0.booking__ds__quarter
   , subq_0.booking__ds__year
+  , subq_0.booking__ds__extract_year
+  , subq_0.booking__ds__extract_quarter
+  , subq_0.booking__ds__extract_month
+  , subq_0.booking__ds__extract_week
+  , subq_0.booking__ds__extract_day
+  , subq_0.booking__ds__extract_dayofweek
+  , subq_0.booking__ds__extract_dayofyear
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
   , subq_0.booking__ds_partitioned__quarter
   , subq_0.booking__ds_partitioned__year
+  , subq_0.booking__ds_partitioned__extract_year
+  , subq_0.booking__ds_partitioned__extract_quarter
+  , subq_0.booking__ds_partitioned__extract_month
+  , subq_0.booking__ds_partitioned__extract_week
+  , subq_0.booking__ds_partitioned__extract_day
+  , subq_0.booking__ds_partitioned__extract_dayofweek
+  , subq_0.booking__ds_partitioned__extract_dayofyear
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
   , subq_0.booking__paid_at__quarter
   , subq_0.booking__paid_at__year
+  , subq_0.booking__paid_at__extract_year
+  , subq_0.booking__paid_at__extract_quarter
+  , subq_0.booking__paid_at__extract_month
+  , subq_0.booking__paid_at__extract_week
+  , subq_0.booking__paid_at__extract_day
+  , subq_0.booking__paid_at__extract_dayofweek
+  , subq_0.booking__paid_at__extract_dayofyear
   , subq_0.paid_at__day AS metric_time__day
   , subq_0.paid_at__week AS metric_time__week
   , subq_0.paid_at__month AS metric_time__month
@@ -67,32 +109,74 @@ FROM (
     , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
     , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
     , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
     , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
     , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
     , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
     , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
     , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index be6e7930be..6e9ffdb258 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -6,31 +6,73 @@ SELECT
   , DATE_TRUNC(ds, month) AS ds__month
   , DATE_TRUNC(ds, quarter) AS ds__quarter
   , DATE_TRUNC(ds, year) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS ds_partitioned__month
   , DATE_TRUNC(ds_partitioned, quarter) AS ds_partitioned__quarter
   , DATE_TRUNC(ds_partitioned, year) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS paid_at__week
   , DATE_TRUNC(paid_at, month) AS paid_at__month
   , DATE_TRUNC(paid_at, quarter) AS paid_at__quarter
   , DATE_TRUNC(paid_at, year) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , ds AS booking__ds__day
   , DATE_TRUNC(ds, isoweek) AS booking__ds__week
   , DATE_TRUNC(ds, month) AS booking__ds__month
   , DATE_TRUNC(ds, quarter) AS booking__ds__quarter
   , DATE_TRUNC(ds, year) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS booking__ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS booking__ds_partitioned__month
   , DATE_TRUNC(ds_partitioned, quarter) AS booking__ds_partitioned__quarter
   , DATE_TRUNC(ds_partitioned, year) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS booking__paid_at__week
   , DATE_TRUNC(paid_at, month) AS booking__paid_at__month
   , DATE_TRUNC(paid_at, quarter) AS booking__paid_at__quarter
   , DATE_TRUNC(paid_at, year) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , paid_at AS metric_time__day
   , DATE_TRUNC(paid_at, isoweek) AS metric_time__week
   , DATE_TRUNC(paid_at, month) AS metric_time__month
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index dfebc400e0..1d6c177790 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -5,31 +5,73 @@ SELECT
   , subq_0.ds__month
   , subq_0.ds__quarter
   , subq_0.ds__year
+  , subq_0.ds__extract_year
+  , subq_0.ds__extract_quarter
+  , subq_0.ds__extract_month
+  , subq_0.ds__extract_week
+  , subq_0.ds__extract_day
+  , subq_0.ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
   , subq_0.ds_partitioned__quarter
   , subq_0.ds_partitioned__year
+  , subq_0.ds_partitioned__extract_year
+  , subq_0.ds_partitioned__extract_quarter
+  , subq_0.ds_partitioned__extract_month
+  , subq_0.ds_partitioned__extract_week
+  , subq_0.ds_partitioned__extract_day
+  , subq_0.ds_partitioned__extract_dayofweek
+  , subq_0.ds_partitioned__extract_dayofyear
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
   , subq_0.paid_at__quarter
   , subq_0.paid_at__year
+  , subq_0.paid_at__extract_year
+  , subq_0.paid_at__extract_quarter
+  , subq_0.paid_at__extract_month
+  , subq_0.paid_at__extract_week
+  , subq_0.paid_at__extract_day
+  , subq_0.paid_at__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
   , subq_0.booking__ds__quarter
   , subq_0.booking__ds__year
+  , subq_0.booking__ds__extract_year
+  , subq_0.booking__ds__extract_quarter
+  , subq_0.booking__ds__extract_month
+  , subq_0.booking__ds__extract_week
+  , subq_0.booking__ds__extract_day
+  , subq_0.booking__ds__extract_dayofweek
+  , subq_0.booking__ds__extract_dayofyear
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
   , subq_0.booking__ds_partitioned__quarter
   , subq_0.booking__ds_partitioned__year
+  , subq_0.booking__ds_partitioned__extract_year
+  , subq_0.booking__ds_partitioned__extract_quarter
+  , subq_0.booking__ds_partitioned__extract_month
+  , subq_0.booking__ds_partitioned__extract_week
+  , subq_0.booking__ds_partitioned__extract_day
+  , subq_0.booking__ds_partitioned__extract_dayofweek
+  , subq_0.booking__ds_partitioned__extract_dayofyear
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
   , subq_0.booking__paid_at__quarter
   , subq_0.booking__paid_at__year
+  , subq_0.booking__paid_at__extract_year
+  , subq_0.booking__paid_at__extract_quarter
+  , subq_0.booking__paid_at__extract_month
+  , subq_0.booking__paid_at__extract_week
+  , subq_0.booking__paid_at__extract_day
+  , subq_0.booking__paid_at__extract_dayofweek
+  , subq_0.booking__paid_at__extract_dayofyear
   , subq_0.ds__day AS metric_time__day
   , subq_0.ds__week AS metric_time__week
   , subq_0.ds__month AS metric_time__month
@@ -79,32 +121,74 @@ FROM (
     , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
     , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
     , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
     , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
     , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
     , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
     , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
     , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index d014cb232e..ac5f560577 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -6,31 +6,73 @@ SELECT
   , DATE_TRUNC(ds, month) AS ds__month
   , DATE_TRUNC(ds, quarter) AS ds__quarter
   , DATE_TRUNC(ds, year) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS ds_partitioned__month
   , DATE_TRUNC(ds_partitioned, quarter) AS ds_partitioned__quarter
   , DATE_TRUNC(ds_partitioned, year) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS paid_at__week
   , DATE_TRUNC(paid_at, month) AS paid_at__month
   , DATE_TRUNC(paid_at, quarter) AS paid_at__quarter
   , DATE_TRUNC(paid_at, year) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , ds AS booking__ds__day
   , DATE_TRUNC(ds, isoweek) AS booking__ds__week
   , DATE_TRUNC(ds, month) AS booking__ds__month
   , DATE_TRUNC(ds, quarter) AS booking__ds__quarter
   , DATE_TRUNC(ds, year) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS booking__ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS booking__ds_partitioned__month
   , DATE_TRUNC(ds_partitioned, quarter) AS booking__ds_partitioned__quarter
   , DATE_TRUNC(ds_partitioned, year) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS booking__paid_at__week
   , DATE_TRUNC(paid_at, month) AS booking__paid_at__month
   , DATE_TRUNC(paid_at, quarter) AS booking__paid_at__quarter
   , DATE_TRUNC(paid_at, year) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , ds AS metric_time__day
   , DATE_TRUNC(ds, isoweek) AS metric_time__week
   , DATE_TRUNC(ds, month) AS metric_time__month
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
index da1967d18d..95a2765eec 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -165,31 +249,73 @@ FULL OUTER JOIN (
           , subq_5.ds__month
           , subq_5.ds__quarter
           , subq_5.ds__year
+          , subq_5.ds__extract_year
+          , subq_5.ds__extract_quarter
+          , subq_5.ds__extract_month
+          , subq_5.ds__extract_week
+          , subq_5.ds__extract_day
+          , subq_5.ds__extract_dayofweek
+          , subq_5.ds__extract_dayofyear
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
           , subq_5.ds_partitioned__quarter
           , subq_5.ds_partitioned__year
+          , subq_5.ds_partitioned__extract_year
+          , subq_5.ds_partitioned__extract_quarter
+          , subq_5.ds_partitioned__extract_month
+          , subq_5.ds_partitioned__extract_week
+          , subq_5.ds_partitioned__extract_day
+          , subq_5.ds_partitioned__extract_dayofweek
+          , subq_5.ds_partitioned__extract_dayofyear
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
           , subq_5.paid_at__quarter
           , subq_5.paid_at__year
+          , subq_5.paid_at__extract_year
+          , subq_5.paid_at__extract_quarter
+          , subq_5.paid_at__extract_month
+          , subq_5.paid_at__extract_week
+          , subq_5.paid_at__extract_day
+          , subq_5.paid_at__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
           , subq_5.booking__ds__quarter
           , subq_5.booking__ds__year
+          , subq_5.booking__ds__extract_year
+          , subq_5.booking__ds__extract_quarter
+          , subq_5.booking__ds__extract_month
+          , subq_5.booking__ds__extract_week
+          , subq_5.booking__ds__extract_day
+          , subq_5.booking__ds__extract_dayofweek
+          , subq_5.booking__ds__extract_dayofyear
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
           , subq_5.booking__ds_partitioned__quarter
           , subq_5.booking__ds_partitioned__year
+          , subq_5.booking__ds_partitioned__extract_year
+          , subq_5.booking__ds_partitioned__extract_quarter
+          , subq_5.booking__ds_partitioned__extract_month
+          , subq_5.booking__ds_partitioned__extract_week
+          , subq_5.booking__ds_partitioned__extract_day
+          , subq_5.booking__ds_partitioned__extract_dayofweek
+          , subq_5.booking__ds_partitioned__extract_dayofyear
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
           , subq_5.booking__paid_at__quarter
           , subq_5.booking__paid_at__year
+          , subq_5.booking__paid_at__extract_year
+          , subq_5.booking__paid_at__extract_quarter
+          , subq_5.booking__paid_at__extract_month
+          , subq_5.booking__paid_at__extract_week
+          , subq_5.booking__paid_at__extract_day
+          , subq_5.booking__paid_at__extract_dayofweek
+          , subq_5.booking__paid_at__extract_dayofyear
           , subq_5.paid_at__day AS metric_time__day
           , subq_5.paid_at__week AS metric_time__week
           , subq_5.paid_at__month AS metric_time__month
@@ -227,32 +353,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index d85b98c372..7546e82b35 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -5,31 +5,73 @@ SELECT
   , subq_0.ds__month
   , subq_0.ds__quarter
   , subq_0.ds__year
+  , subq_0.ds__extract_year
+  , subq_0.ds__extract_quarter
+  , subq_0.ds__extract_month
+  , subq_0.ds__extract_week
+  , subq_0.ds__extract_day
+  , subq_0.ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
   , subq_0.ds_partitioned__quarter
   , subq_0.ds_partitioned__year
+  , subq_0.ds_partitioned__extract_year
+  , subq_0.ds_partitioned__extract_quarter
+  , subq_0.ds_partitioned__extract_month
+  , subq_0.ds_partitioned__extract_week
+  , subq_0.ds_partitioned__extract_day
+  , subq_0.ds_partitioned__extract_dayofweek
+  , subq_0.ds_partitioned__extract_dayofyear
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
   , subq_0.paid_at__quarter
   , subq_0.paid_at__year
+  , subq_0.paid_at__extract_year
+  , subq_0.paid_at__extract_quarter
+  , subq_0.paid_at__extract_month
+  , subq_0.paid_at__extract_week
+  , subq_0.paid_at__extract_day
+  , subq_0.paid_at__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
   , subq_0.booking__ds__quarter
   , subq_0.booking__ds__year
+  , subq_0.booking__ds__extract_year
+  , subq_0.booking__ds__extract_quarter
+  , subq_0.booking__ds__extract_month
+  , subq_0.booking__ds__extract_week
+  , subq_0.booking__ds__extract_day
+  , subq_0.booking__ds__extract_dayofweek
+  , subq_0.booking__ds__extract_dayofyear
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
   , subq_0.booking__ds_partitioned__quarter
   , subq_0.booking__ds_partitioned__year
+  , subq_0.booking__ds_partitioned__extract_year
+  , subq_0.booking__ds_partitioned__extract_quarter
+  , subq_0.booking__ds_partitioned__extract_month
+  , subq_0.booking__ds_partitioned__extract_week
+  , subq_0.booking__ds_partitioned__extract_day
+  , subq_0.booking__ds_partitioned__extract_dayofweek
+  , subq_0.booking__ds_partitioned__extract_dayofyear
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
   , subq_0.booking__paid_at__quarter
   , subq_0.booking__paid_at__year
+  , subq_0.booking__paid_at__extract_year
+  , subq_0.booking__paid_at__extract_quarter
+  , subq_0.booking__paid_at__extract_month
+  , subq_0.booking__paid_at__extract_week
+  , subq_0.booking__paid_at__extract_day
+  , subq_0.booking__paid_at__extract_dayofweek
+  , subq_0.booking__paid_at__extract_dayofyear
   , subq_0.paid_at__day AS metric_time__day
   , subq_0.paid_at__week AS metric_time__week
   , subq_0.paid_at__month AS metric_time__month
@@ -67,32 +109,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 8f68ad52d4..dd88a042dc 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -6,31 +6,73 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DOY FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DOY FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DOY FROM paid_at) AS paid_at__extract_dayofyear
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DOY FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DOY FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DOY FROM paid_at) AS booking__paid_at__extract_dayofyear
   , paid_at AS metric_time__day
   , DATE_TRUNC('week', paid_at) AS metric_time__week
   , DATE_TRUNC('month', paid_at) AS metric_time__month
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 7c20f14f7c..e3908e0d03 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -5,31 +5,73 @@ SELECT
   , subq_0.ds__month
   , subq_0.ds__quarter
   , subq_0.ds__year
+  , subq_0.ds__extract_year
+  , subq_0.ds__extract_quarter
+  , subq_0.ds__extract_month
+  , subq_0.ds__extract_week
+  , subq_0.ds__extract_day
+  , subq_0.ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
   , subq_0.ds_partitioned__quarter
   , subq_0.ds_partitioned__year
+  , subq_0.ds_partitioned__extract_year
+  , subq_0.ds_partitioned__extract_quarter
+  , subq_0.ds_partitioned__extract_month
+  , subq_0.ds_partitioned__extract_week
+  , subq_0.ds_partitioned__extract_day
+  , subq_0.ds_partitioned__extract_dayofweek
+  , subq_0.ds_partitioned__extract_dayofyear
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
   , subq_0.paid_at__quarter
   , subq_0.paid_at__year
+  , subq_0.paid_at__extract_year
+  , subq_0.paid_at__extract_quarter
+  , subq_0.paid_at__extract_month
+  , subq_0.paid_at__extract_week
+  , subq_0.paid_at__extract_day
+  , subq_0.paid_at__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
   , subq_0.booking__ds__quarter
   , subq_0.booking__ds__year
+  , subq_0.booking__ds__extract_year
+  , subq_0.booking__ds__extract_quarter
+  , subq_0.booking__ds__extract_month
+  , subq_0.booking__ds__extract_week
+  , subq_0.booking__ds__extract_day
+  , subq_0.booking__ds__extract_dayofweek
+  , subq_0.booking__ds__extract_dayofyear
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
   , subq_0.booking__ds_partitioned__quarter
   , subq_0.booking__ds_partitioned__year
+  , subq_0.booking__ds_partitioned__extract_year
+  , subq_0.booking__ds_partitioned__extract_quarter
+  , subq_0.booking__ds_partitioned__extract_month
+  , subq_0.booking__ds_partitioned__extract_week
+  , subq_0.booking__ds_partitioned__extract_day
+  , subq_0.booking__ds_partitioned__extract_dayofweek
+  , subq_0.booking__ds_partitioned__extract_dayofyear
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
   , subq_0.booking__paid_at__quarter
   , subq_0.booking__paid_at__year
+  , subq_0.booking__paid_at__extract_year
+  , subq_0.booking__paid_at__extract_quarter
+  , subq_0.booking__paid_at__extract_month
+  , subq_0.booking__paid_at__extract_week
+  , subq_0.booking__paid_at__extract_day
+  , subq_0.booking__paid_at__extract_dayofweek
+  , subq_0.booking__paid_at__extract_dayofyear
   , subq_0.ds__day AS metric_time__day
   , subq_0.ds__week AS metric_time__week
   , subq_0.ds__month AS metric_time__month
@@ -79,32 +121,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 7c661d75a0..e739399f60 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -6,31 +6,73 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DOY FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DOY FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DOY FROM paid_at) AS paid_at__extract_dayofyear
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DOY FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DOY FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DOY FROM paid_at) AS booking__paid_at__extract_dayofyear
   , ds AS metric_time__day
   , DATE_TRUNC('week', ds) AS metric_time__week
   , DATE_TRUNC('month', ds) AS metric_time__month
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
index 4141b83082..08e9c6f6fa 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -165,31 +249,73 @@ FULL OUTER JOIN (
           , subq_5.ds__month
           , subq_5.ds__quarter
           , subq_5.ds__year
+          , subq_5.ds__extract_year
+          , subq_5.ds__extract_quarter
+          , subq_5.ds__extract_month
+          , subq_5.ds__extract_week
+          , subq_5.ds__extract_day
+          , subq_5.ds__extract_dayofweek
+          , subq_5.ds__extract_dayofyear
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
           , subq_5.ds_partitioned__quarter
           , subq_5.ds_partitioned__year
+          , subq_5.ds_partitioned__extract_year
+          , subq_5.ds_partitioned__extract_quarter
+          , subq_5.ds_partitioned__extract_month
+          , subq_5.ds_partitioned__extract_week
+          , subq_5.ds_partitioned__extract_day
+          , subq_5.ds_partitioned__extract_dayofweek
+          , subq_5.ds_partitioned__extract_dayofyear
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
           , subq_5.paid_at__quarter
           , subq_5.paid_at__year
+          , subq_5.paid_at__extract_year
+          , subq_5.paid_at__extract_quarter
+          , subq_5.paid_at__extract_month
+          , subq_5.paid_at__extract_week
+          , subq_5.paid_at__extract_day
+          , subq_5.paid_at__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
           , subq_5.booking__ds__quarter
           , subq_5.booking__ds__year
+          , subq_5.booking__ds__extract_year
+          , subq_5.booking__ds__extract_quarter
+          , subq_5.booking__ds__extract_month
+          , subq_5.booking__ds__extract_week
+          , subq_5.booking__ds__extract_day
+          , subq_5.booking__ds__extract_dayofweek
+          , subq_5.booking__ds__extract_dayofyear
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
           , subq_5.booking__ds_partitioned__quarter
           , subq_5.booking__ds_partitioned__year
+          , subq_5.booking__ds_partitioned__extract_year
+          , subq_5.booking__ds_partitioned__extract_quarter
+          , subq_5.booking__ds_partitioned__extract_month
+          , subq_5.booking__ds_partitioned__extract_week
+          , subq_5.booking__ds_partitioned__extract_day
+          , subq_5.booking__ds_partitioned__extract_dayofweek
+          , subq_5.booking__ds_partitioned__extract_dayofyear
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
           , subq_5.booking__paid_at__quarter
           , subq_5.booking__paid_at__year
+          , subq_5.booking__paid_at__extract_year
+          , subq_5.booking__paid_at__extract_quarter
+          , subq_5.booking__paid_at__extract_month
+          , subq_5.booking__paid_at__extract_week
+          , subq_5.booking__paid_at__extract_day
+          , subq_5.booking__paid_at__extract_dayofweek
+          , subq_5.booking__paid_at__extract_dayofyear
           , subq_5.paid_at__day AS metric_time__day
           , subq_5.paid_at__week AS metric_time__week
           , subq_5.paid_at__month AS metric_time__month
@@ -227,32 +353,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index d85b98c372..4f359630e6 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -5,31 +5,73 @@ SELECT
   , subq_0.ds__month
   , subq_0.ds__quarter
   , subq_0.ds__year
+  , subq_0.ds__extract_year
+  , subq_0.ds__extract_quarter
+  , subq_0.ds__extract_month
+  , subq_0.ds__extract_week
+  , subq_0.ds__extract_day
+  , subq_0.ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
   , subq_0.ds_partitioned__quarter
   , subq_0.ds_partitioned__year
+  , subq_0.ds_partitioned__extract_year
+  , subq_0.ds_partitioned__extract_quarter
+  , subq_0.ds_partitioned__extract_month
+  , subq_0.ds_partitioned__extract_week
+  , subq_0.ds_partitioned__extract_day
+  , subq_0.ds_partitioned__extract_dayofweek
+  , subq_0.ds_partitioned__extract_dayofyear
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
   , subq_0.paid_at__quarter
   , subq_0.paid_at__year
+  , subq_0.paid_at__extract_year
+  , subq_0.paid_at__extract_quarter
+  , subq_0.paid_at__extract_month
+  , subq_0.paid_at__extract_week
+  , subq_0.paid_at__extract_day
+  , subq_0.paid_at__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
   , subq_0.booking__ds__quarter
   , subq_0.booking__ds__year
+  , subq_0.booking__ds__extract_year
+  , subq_0.booking__ds__extract_quarter
+  , subq_0.booking__ds__extract_month
+  , subq_0.booking__ds__extract_week
+  , subq_0.booking__ds__extract_day
+  , subq_0.booking__ds__extract_dayofweek
+  , subq_0.booking__ds__extract_dayofyear
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
   , subq_0.booking__ds_partitioned__quarter
   , subq_0.booking__ds_partitioned__year
+  , subq_0.booking__ds_partitioned__extract_year
+  , subq_0.booking__ds_partitioned__extract_quarter
+  , subq_0.booking__ds_partitioned__extract_month
+  , subq_0.booking__ds_partitioned__extract_week
+  , subq_0.booking__ds_partitioned__extract_day
+  , subq_0.booking__ds_partitioned__extract_dayofweek
+  , subq_0.booking__ds_partitioned__extract_dayofyear
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
   , subq_0.booking__paid_at__quarter
   , subq_0.booking__paid_at__year
+  , subq_0.booking__paid_at__extract_year
+  , subq_0.booking__paid_at__extract_quarter
+  , subq_0.booking__paid_at__extract_month
+  , subq_0.booking__paid_at__extract_week
+  , subq_0.booking__paid_at__extract_day
+  , subq_0.booking__paid_at__extract_dayofweek
+  , subq_0.booking__paid_at__extract_dayofyear
   , subq_0.paid_at__day AS metric_time__day
   , subq_0.paid_at__week AS metric_time__week
   , subq_0.paid_at__month AS metric_time__month
@@ -67,32 +109,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 8f68ad52d4..ed2c8def7c 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -6,31 +6,73 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , paid_at AS metric_time__day
   , DATE_TRUNC('week', paid_at) AS metric_time__week
   , DATE_TRUNC('month', paid_at) AS metric_time__month
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 7c20f14f7c..3acc2d08e5 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -5,31 +5,73 @@ SELECT
   , subq_0.ds__month
   , subq_0.ds__quarter
   , subq_0.ds__year
+  , subq_0.ds__extract_year
+  , subq_0.ds__extract_quarter
+  , subq_0.ds__extract_month
+  , subq_0.ds__extract_week
+  , subq_0.ds__extract_day
+  , subq_0.ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
   , subq_0.ds_partitioned__quarter
   , subq_0.ds_partitioned__year
+  , subq_0.ds_partitioned__extract_year
+  , subq_0.ds_partitioned__extract_quarter
+  , subq_0.ds_partitioned__extract_month
+  , subq_0.ds_partitioned__extract_week
+  , subq_0.ds_partitioned__extract_day
+  , subq_0.ds_partitioned__extract_dayofweek
+  , subq_0.ds_partitioned__extract_dayofyear
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
   , subq_0.paid_at__quarter
   , subq_0.paid_at__year
+  , subq_0.paid_at__extract_year
+  , subq_0.paid_at__extract_quarter
+  , subq_0.paid_at__extract_month
+  , subq_0.paid_at__extract_week
+  , subq_0.paid_at__extract_day
+  , subq_0.paid_at__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
   , subq_0.booking__ds__quarter
   , subq_0.booking__ds__year
+  , subq_0.booking__ds__extract_year
+  , subq_0.booking__ds__extract_quarter
+  , subq_0.booking__ds__extract_month
+  , subq_0.booking__ds__extract_week
+  , subq_0.booking__ds__extract_day
+  , subq_0.booking__ds__extract_dayofweek
+  , subq_0.booking__ds__extract_dayofyear
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
   , subq_0.booking__ds_partitioned__quarter
   , subq_0.booking__ds_partitioned__year
+  , subq_0.booking__ds_partitioned__extract_year
+  , subq_0.booking__ds_partitioned__extract_quarter
+  , subq_0.booking__ds_partitioned__extract_month
+  , subq_0.booking__ds_partitioned__extract_week
+  , subq_0.booking__ds_partitioned__extract_day
+  , subq_0.booking__ds_partitioned__extract_dayofweek
+  , subq_0.booking__ds_partitioned__extract_dayofyear
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
   , subq_0.booking__paid_at__quarter
   , subq_0.booking__paid_at__year
+  , subq_0.booking__paid_at__extract_year
+  , subq_0.booking__paid_at__extract_quarter
+  , subq_0.booking__paid_at__extract_month
+  , subq_0.booking__paid_at__extract_week
+  , subq_0.booking__paid_at__extract_day
+  , subq_0.booking__paid_at__extract_dayofweek
+  , subq_0.booking__paid_at__extract_dayofyear
   , subq_0.ds__day AS metric_time__day
   , subq_0.ds__week AS metric_time__week
   , subq_0.ds__month AS metric_time__month
@@ -79,32 +121,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 7c661d75a0..541c754a5a 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -6,31 +6,73 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , ds AS metric_time__day
   , DATE_TRUNC('week', ds) AS metric_time__week
   , DATE_TRUNC('month', ds) AS metric_time__month
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
index 4141b83082..9a64eefccb 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -165,31 +249,73 @@ FULL OUTER JOIN (
           , subq_5.ds__month
           , subq_5.ds__quarter
           , subq_5.ds__year
+          , subq_5.ds__extract_year
+          , subq_5.ds__extract_quarter
+          , subq_5.ds__extract_month
+          , subq_5.ds__extract_week
+          , subq_5.ds__extract_day
+          , subq_5.ds__extract_dayofweek
+          , subq_5.ds__extract_dayofyear
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
           , subq_5.ds_partitioned__quarter
           , subq_5.ds_partitioned__year
+          , subq_5.ds_partitioned__extract_year
+          , subq_5.ds_partitioned__extract_quarter
+          , subq_5.ds_partitioned__extract_month
+          , subq_5.ds_partitioned__extract_week
+          , subq_5.ds_partitioned__extract_day
+          , subq_5.ds_partitioned__extract_dayofweek
+          , subq_5.ds_partitioned__extract_dayofyear
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
           , subq_5.paid_at__quarter
           , subq_5.paid_at__year
+          , subq_5.paid_at__extract_year
+          , subq_5.paid_at__extract_quarter
+          , subq_5.paid_at__extract_month
+          , subq_5.paid_at__extract_week
+          , subq_5.paid_at__extract_day
+          , subq_5.paid_at__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
           , subq_5.booking__ds__quarter
           , subq_5.booking__ds__year
+          , subq_5.booking__ds__extract_year
+          , subq_5.booking__ds__extract_quarter
+          , subq_5.booking__ds__extract_month
+          , subq_5.booking__ds__extract_week
+          , subq_5.booking__ds__extract_day
+          , subq_5.booking__ds__extract_dayofweek
+          , subq_5.booking__ds__extract_dayofyear
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
           , subq_5.booking__ds_partitioned__quarter
           , subq_5.booking__ds_partitioned__year
+          , subq_5.booking__ds_partitioned__extract_year
+          , subq_5.booking__ds_partitioned__extract_quarter
+          , subq_5.booking__ds_partitioned__extract_month
+          , subq_5.booking__ds_partitioned__extract_week
+          , subq_5.booking__ds_partitioned__extract_day
+          , subq_5.booking__ds_partitioned__extract_dayofweek
+          , subq_5.booking__ds_partitioned__extract_dayofyear
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
           , subq_5.booking__paid_at__quarter
           , subq_5.booking__paid_at__year
+          , subq_5.booking__paid_at__extract_year
+          , subq_5.booking__paid_at__extract_quarter
+          , subq_5.booking__paid_at__extract_month
+          , subq_5.booking__paid_at__extract_week
+          , subq_5.booking__paid_at__extract_day
+          , subq_5.booking__paid_at__extract_dayofweek
+          , subq_5.booking__paid_at__extract_dayofyear
           , subq_5.paid_at__day AS metric_time__day
           , subq_5.paid_at__week AS metric_time__week
           , subq_5.paid_at__month AS metric_time__month
@@ -227,32 +353,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index d85b98c372..4f359630e6 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -5,31 +5,73 @@ SELECT
   , subq_0.ds__month
   , subq_0.ds__quarter
   , subq_0.ds__year
+  , subq_0.ds__extract_year
+  , subq_0.ds__extract_quarter
+  , subq_0.ds__extract_month
+  , subq_0.ds__extract_week
+  , subq_0.ds__extract_day
+  , subq_0.ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
   , subq_0.ds_partitioned__quarter
   , subq_0.ds_partitioned__year
+  , subq_0.ds_partitioned__extract_year
+  , subq_0.ds_partitioned__extract_quarter
+  , subq_0.ds_partitioned__extract_month
+  , subq_0.ds_partitioned__extract_week
+  , subq_0.ds_partitioned__extract_day
+  , subq_0.ds_partitioned__extract_dayofweek
+  , subq_0.ds_partitioned__extract_dayofyear
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
   , subq_0.paid_at__quarter
   , subq_0.paid_at__year
+  , subq_0.paid_at__extract_year
+  , subq_0.paid_at__extract_quarter
+  , subq_0.paid_at__extract_month
+  , subq_0.paid_at__extract_week
+  , subq_0.paid_at__extract_day
+  , subq_0.paid_at__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
   , subq_0.booking__ds__quarter
   , subq_0.booking__ds__year
+  , subq_0.booking__ds__extract_year
+  , subq_0.booking__ds__extract_quarter
+  , subq_0.booking__ds__extract_month
+  , subq_0.booking__ds__extract_week
+  , subq_0.booking__ds__extract_day
+  , subq_0.booking__ds__extract_dayofweek
+  , subq_0.booking__ds__extract_dayofyear
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
   , subq_0.booking__ds_partitioned__quarter
   , subq_0.booking__ds_partitioned__year
+  , subq_0.booking__ds_partitioned__extract_year
+  , subq_0.booking__ds_partitioned__extract_quarter
+  , subq_0.booking__ds_partitioned__extract_month
+  , subq_0.booking__ds_partitioned__extract_week
+  , subq_0.booking__ds_partitioned__extract_day
+  , subq_0.booking__ds_partitioned__extract_dayofweek
+  , subq_0.booking__ds_partitioned__extract_dayofyear
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
   , subq_0.booking__paid_at__quarter
   , subq_0.booking__paid_at__year
+  , subq_0.booking__paid_at__extract_year
+  , subq_0.booking__paid_at__extract_quarter
+  , subq_0.booking__paid_at__extract_month
+  , subq_0.booking__paid_at__extract_week
+  , subq_0.booking__paid_at__extract_day
+  , subq_0.booking__paid_at__extract_dayofweek
+  , subq_0.booking__paid_at__extract_dayofyear
   , subq_0.paid_at__day AS metric_time__day
   , subq_0.paid_at__week AS metric_time__week
   , subq_0.paid_at__month AS metric_time__month
@@ -67,32 +109,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 8f68ad52d4..ed2c8def7c 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -6,31 +6,73 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , paid_at AS metric_time__day
   , DATE_TRUNC('week', paid_at) AS metric_time__week
   , DATE_TRUNC('month', paid_at) AS metric_time__month
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 7c20f14f7c..3acc2d08e5 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -5,31 +5,73 @@ SELECT
   , subq_0.ds__month
   , subq_0.ds__quarter
   , subq_0.ds__year
+  , subq_0.ds__extract_year
+  , subq_0.ds__extract_quarter
+  , subq_0.ds__extract_month
+  , subq_0.ds__extract_week
+  , subq_0.ds__extract_day
+  , subq_0.ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
   , subq_0.ds_partitioned__quarter
   , subq_0.ds_partitioned__year
+  , subq_0.ds_partitioned__extract_year
+  , subq_0.ds_partitioned__extract_quarter
+  , subq_0.ds_partitioned__extract_month
+  , subq_0.ds_partitioned__extract_week
+  , subq_0.ds_partitioned__extract_day
+  , subq_0.ds_partitioned__extract_dayofweek
+  , subq_0.ds_partitioned__extract_dayofyear
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
   , subq_0.paid_at__quarter
   , subq_0.paid_at__year
+  , subq_0.paid_at__extract_year
+  , subq_0.paid_at__extract_quarter
+  , subq_0.paid_at__extract_month
+  , subq_0.paid_at__extract_week
+  , subq_0.paid_at__extract_day
+  , subq_0.paid_at__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
   , subq_0.booking__ds__quarter
   , subq_0.booking__ds__year
+  , subq_0.booking__ds__extract_year
+  , subq_0.booking__ds__extract_quarter
+  , subq_0.booking__ds__extract_month
+  , subq_0.booking__ds__extract_week
+  , subq_0.booking__ds__extract_day
+  , subq_0.booking__ds__extract_dayofweek
+  , subq_0.booking__ds__extract_dayofyear
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
   , subq_0.booking__ds_partitioned__quarter
   , subq_0.booking__ds_partitioned__year
+  , subq_0.booking__ds_partitioned__extract_year
+  , subq_0.booking__ds_partitioned__extract_quarter
+  , subq_0.booking__ds_partitioned__extract_month
+  , subq_0.booking__ds_partitioned__extract_week
+  , subq_0.booking__ds_partitioned__extract_day
+  , subq_0.booking__ds_partitioned__extract_dayofweek
+  , subq_0.booking__ds_partitioned__extract_dayofyear
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
   , subq_0.booking__paid_at__quarter
   , subq_0.booking__paid_at__year
+  , subq_0.booking__paid_at__extract_year
+  , subq_0.booking__paid_at__extract_quarter
+  , subq_0.booking__paid_at__extract_month
+  , subq_0.booking__paid_at__extract_week
+  , subq_0.booking__paid_at__extract_day
+  , subq_0.booking__paid_at__extract_dayofweek
+  , subq_0.booking__paid_at__extract_dayofyear
   , subq_0.ds__day AS metric_time__day
   , subq_0.ds__week AS metric_time__week
   , subq_0.ds__month AS metric_time__month
@@ -79,32 +121,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 7c661d75a0..541c754a5a 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -6,31 +6,73 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , ds AS metric_time__day
   , DATE_TRUNC('week', ds) AS metric_time__week
   , DATE_TRUNC('month', ds) AS metric_time__month
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
index 4141b83082..9a64eefccb 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -165,31 +249,73 @@ FULL OUTER JOIN (
           , subq_5.ds__month
           , subq_5.ds__quarter
           , subq_5.ds__year
+          , subq_5.ds__extract_year
+          , subq_5.ds__extract_quarter
+          , subq_5.ds__extract_month
+          , subq_5.ds__extract_week
+          , subq_5.ds__extract_day
+          , subq_5.ds__extract_dayofweek
+          , subq_5.ds__extract_dayofyear
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
           , subq_5.ds_partitioned__quarter
           , subq_5.ds_partitioned__year
+          , subq_5.ds_partitioned__extract_year
+          , subq_5.ds_partitioned__extract_quarter
+          , subq_5.ds_partitioned__extract_month
+          , subq_5.ds_partitioned__extract_week
+          , subq_5.ds_partitioned__extract_day
+          , subq_5.ds_partitioned__extract_dayofweek
+          , subq_5.ds_partitioned__extract_dayofyear
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
           , subq_5.paid_at__quarter
           , subq_5.paid_at__year
+          , subq_5.paid_at__extract_year
+          , subq_5.paid_at__extract_quarter
+          , subq_5.paid_at__extract_month
+          , subq_5.paid_at__extract_week
+          , subq_5.paid_at__extract_day
+          , subq_5.paid_at__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
           , subq_5.booking__ds__quarter
           , subq_5.booking__ds__year
+          , subq_5.booking__ds__extract_year
+          , subq_5.booking__ds__extract_quarter
+          , subq_5.booking__ds__extract_month
+          , subq_5.booking__ds__extract_week
+          , subq_5.booking__ds__extract_day
+          , subq_5.booking__ds__extract_dayofweek
+          , subq_5.booking__ds__extract_dayofyear
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
           , subq_5.booking__ds_partitioned__quarter
           , subq_5.booking__ds_partitioned__year
+          , subq_5.booking__ds_partitioned__extract_year
+          , subq_5.booking__ds_partitioned__extract_quarter
+          , subq_5.booking__ds_partitioned__extract_month
+          , subq_5.booking__ds_partitioned__extract_week
+          , subq_5.booking__ds_partitioned__extract_day
+          , subq_5.booking__ds_partitioned__extract_dayofweek
+          , subq_5.booking__ds_partitioned__extract_dayofyear
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
           , subq_5.booking__paid_at__quarter
           , subq_5.booking__paid_at__year
+          , subq_5.booking__paid_at__extract_year
+          , subq_5.booking__paid_at__extract_quarter
+          , subq_5.booking__paid_at__extract_month
+          , subq_5.booking__paid_at__extract_week
+          , subq_5.booking__paid_at__extract_day
+          , subq_5.booking__paid_at__extract_dayofweek
+          , subq_5.booking__paid_at__extract_dayofyear
           , subq_5.paid_at__day AS metric_time__day
           , subq_5.paid_at__week AS metric_time__week
           , subq_5.paid_at__month AS metric_time__month
@@ -227,32 +353,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index d85b98c372..4f359630e6 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -5,31 +5,73 @@ SELECT
   , subq_0.ds__month
   , subq_0.ds__quarter
   , subq_0.ds__year
+  , subq_0.ds__extract_year
+  , subq_0.ds__extract_quarter
+  , subq_0.ds__extract_month
+  , subq_0.ds__extract_week
+  , subq_0.ds__extract_day
+  , subq_0.ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
   , subq_0.ds_partitioned__quarter
   , subq_0.ds_partitioned__year
+  , subq_0.ds_partitioned__extract_year
+  , subq_0.ds_partitioned__extract_quarter
+  , subq_0.ds_partitioned__extract_month
+  , subq_0.ds_partitioned__extract_week
+  , subq_0.ds_partitioned__extract_day
+  , subq_0.ds_partitioned__extract_dayofweek
+  , subq_0.ds_partitioned__extract_dayofyear
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
   , subq_0.paid_at__quarter
   , subq_0.paid_at__year
+  , subq_0.paid_at__extract_year
+  , subq_0.paid_at__extract_quarter
+  , subq_0.paid_at__extract_month
+  , subq_0.paid_at__extract_week
+  , subq_0.paid_at__extract_day
+  , subq_0.paid_at__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
   , subq_0.booking__ds__quarter
   , subq_0.booking__ds__year
+  , subq_0.booking__ds__extract_year
+  , subq_0.booking__ds__extract_quarter
+  , subq_0.booking__ds__extract_month
+  , subq_0.booking__ds__extract_week
+  , subq_0.booking__ds__extract_day
+  , subq_0.booking__ds__extract_dayofweek
+  , subq_0.booking__ds__extract_dayofyear
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
   , subq_0.booking__ds_partitioned__quarter
   , subq_0.booking__ds_partitioned__year
+  , subq_0.booking__ds_partitioned__extract_year
+  , subq_0.booking__ds_partitioned__extract_quarter
+  , subq_0.booking__ds_partitioned__extract_month
+  , subq_0.booking__ds_partitioned__extract_week
+  , subq_0.booking__ds_partitioned__extract_day
+  , subq_0.booking__ds_partitioned__extract_dayofweek
+  , subq_0.booking__ds_partitioned__extract_dayofyear
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
   , subq_0.booking__paid_at__quarter
   , subq_0.booking__paid_at__year
+  , subq_0.booking__paid_at__extract_year
+  , subq_0.booking__paid_at__extract_quarter
+  , subq_0.booking__paid_at__extract_month
+  , subq_0.booking__paid_at__extract_week
+  , subq_0.booking__paid_at__extract_day
+  , subq_0.booking__paid_at__extract_dayofweek
+  , subq_0.booking__paid_at__extract_dayofyear
   , subq_0.paid_at__day AS metric_time__day
   , subq_0.paid_at__week AS metric_time__week
   , subq_0.paid_at__month AS metric_time__month
@@ -67,32 +109,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 8f68ad52d4..ed2c8def7c 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -6,31 +6,73 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , paid_at AS metric_time__day
   , DATE_TRUNC('week', paid_at) AS metric_time__week
   , DATE_TRUNC('month', paid_at) AS metric_time__month
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 7c20f14f7c..3acc2d08e5 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -5,31 +5,73 @@ SELECT
   , subq_0.ds__month
   , subq_0.ds__quarter
   , subq_0.ds__year
+  , subq_0.ds__extract_year
+  , subq_0.ds__extract_quarter
+  , subq_0.ds__extract_month
+  , subq_0.ds__extract_week
+  , subq_0.ds__extract_day
+  , subq_0.ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
   , subq_0.ds_partitioned__quarter
   , subq_0.ds_partitioned__year
+  , subq_0.ds_partitioned__extract_year
+  , subq_0.ds_partitioned__extract_quarter
+  , subq_0.ds_partitioned__extract_month
+  , subq_0.ds_partitioned__extract_week
+  , subq_0.ds_partitioned__extract_day
+  , subq_0.ds_partitioned__extract_dayofweek
+  , subq_0.ds_partitioned__extract_dayofyear
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
   , subq_0.paid_at__quarter
   , subq_0.paid_at__year
+  , subq_0.paid_at__extract_year
+  , subq_0.paid_at__extract_quarter
+  , subq_0.paid_at__extract_month
+  , subq_0.paid_at__extract_week
+  , subq_0.paid_at__extract_day
+  , subq_0.paid_at__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
   , subq_0.booking__ds__quarter
   , subq_0.booking__ds__year
+  , subq_0.booking__ds__extract_year
+  , subq_0.booking__ds__extract_quarter
+  , subq_0.booking__ds__extract_month
+  , subq_0.booking__ds__extract_week
+  , subq_0.booking__ds__extract_day
+  , subq_0.booking__ds__extract_dayofweek
+  , subq_0.booking__ds__extract_dayofyear
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
   , subq_0.booking__ds_partitioned__quarter
   , subq_0.booking__ds_partitioned__year
+  , subq_0.booking__ds_partitioned__extract_year
+  , subq_0.booking__ds_partitioned__extract_quarter
+  , subq_0.booking__ds_partitioned__extract_month
+  , subq_0.booking__ds_partitioned__extract_week
+  , subq_0.booking__ds_partitioned__extract_day
+  , subq_0.booking__ds_partitioned__extract_dayofweek
+  , subq_0.booking__ds_partitioned__extract_dayofyear
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
   , subq_0.booking__paid_at__quarter
   , subq_0.booking__paid_at__year
+  , subq_0.booking__paid_at__extract_year
+  , subq_0.booking__paid_at__extract_quarter
+  , subq_0.booking__paid_at__extract_month
+  , subq_0.booking__paid_at__extract_week
+  , subq_0.booking__paid_at__extract_day
+  , subq_0.booking__paid_at__extract_dayofweek
+  , subq_0.booking__paid_at__extract_dayofyear
   , subq_0.ds__day AS metric_time__day
   , subq_0.ds__week AS metric_time__week
   , subq_0.ds__month AS metric_time__month
@@ -79,32 +121,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 7c661d75a0..541c754a5a 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -6,31 +6,73 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , ds AS metric_time__day
   , DATE_TRUNC('week', ds) AS metric_time__week
   , DATE_TRUNC('month', ds) AS metric_time__month
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
index 4141b83082..9a64eefccb 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -165,31 +249,73 @@ FULL OUTER JOIN (
           , subq_5.ds__month
           , subq_5.ds__quarter
           , subq_5.ds__year
+          , subq_5.ds__extract_year
+          , subq_5.ds__extract_quarter
+          , subq_5.ds__extract_month
+          , subq_5.ds__extract_week
+          , subq_5.ds__extract_day
+          , subq_5.ds__extract_dayofweek
+          , subq_5.ds__extract_dayofyear
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
           , subq_5.ds_partitioned__quarter
           , subq_5.ds_partitioned__year
+          , subq_5.ds_partitioned__extract_year
+          , subq_5.ds_partitioned__extract_quarter
+          , subq_5.ds_partitioned__extract_month
+          , subq_5.ds_partitioned__extract_week
+          , subq_5.ds_partitioned__extract_day
+          , subq_5.ds_partitioned__extract_dayofweek
+          , subq_5.ds_partitioned__extract_dayofyear
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
           , subq_5.paid_at__quarter
           , subq_5.paid_at__year
+          , subq_5.paid_at__extract_year
+          , subq_5.paid_at__extract_quarter
+          , subq_5.paid_at__extract_month
+          , subq_5.paid_at__extract_week
+          , subq_5.paid_at__extract_day
+          , subq_5.paid_at__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
           , subq_5.booking__ds__quarter
           , subq_5.booking__ds__year
+          , subq_5.booking__ds__extract_year
+          , subq_5.booking__ds__extract_quarter
+          , subq_5.booking__ds__extract_month
+          , subq_5.booking__ds__extract_week
+          , subq_5.booking__ds__extract_day
+          , subq_5.booking__ds__extract_dayofweek
+          , subq_5.booking__ds__extract_dayofyear
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
           , subq_5.booking__ds_partitioned__quarter
           , subq_5.booking__ds_partitioned__year
+          , subq_5.booking__ds_partitioned__extract_year
+          , subq_5.booking__ds_partitioned__extract_quarter
+          , subq_5.booking__ds_partitioned__extract_month
+          , subq_5.booking__ds_partitioned__extract_week
+          , subq_5.booking__ds_partitioned__extract_day
+          , subq_5.booking__ds_partitioned__extract_dayofweek
+          , subq_5.booking__ds_partitioned__extract_dayofyear
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
           , subq_5.booking__paid_at__quarter
           , subq_5.booking__paid_at__year
+          , subq_5.booking__paid_at__extract_year
+          , subq_5.booking__paid_at__extract_quarter
+          , subq_5.booking__paid_at__extract_month
+          , subq_5.booking__paid_at__extract_week
+          , subq_5.booking__paid_at__extract_day
+          , subq_5.booking__paid_at__extract_dayofweek
+          , subq_5.booking__paid_at__extract_dayofyear
           , subq_5.paid_at__day AS metric_time__day
           , subq_5.paid_at__week AS metric_time__week
           , subq_5.paid_at__month AS metric_time__month
@@ -227,32 +353,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index d85b98c372..4f359630e6 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -5,31 +5,73 @@ SELECT
   , subq_0.ds__month
   , subq_0.ds__quarter
   , subq_0.ds__year
+  , subq_0.ds__extract_year
+  , subq_0.ds__extract_quarter
+  , subq_0.ds__extract_month
+  , subq_0.ds__extract_week
+  , subq_0.ds__extract_day
+  , subq_0.ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
   , subq_0.ds_partitioned__quarter
   , subq_0.ds_partitioned__year
+  , subq_0.ds_partitioned__extract_year
+  , subq_0.ds_partitioned__extract_quarter
+  , subq_0.ds_partitioned__extract_month
+  , subq_0.ds_partitioned__extract_week
+  , subq_0.ds_partitioned__extract_day
+  , subq_0.ds_partitioned__extract_dayofweek
+  , subq_0.ds_partitioned__extract_dayofyear
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
   , subq_0.paid_at__quarter
   , subq_0.paid_at__year
+  , subq_0.paid_at__extract_year
+  , subq_0.paid_at__extract_quarter
+  , subq_0.paid_at__extract_month
+  , subq_0.paid_at__extract_week
+  , subq_0.paid_at__extract_day
+  , subq_0.paid_at__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
   , subq_0.booking__ds__quarter
   , subq_0.booking__ds__year
+  , subq_0.booking__ds__extract_year
+  , subq_0.booking__ds__extract_quarter
+  , subq_0.booking__ds__extract_month
+  , subq_0.booking__ds__extract_week
+  , subq_0.booking__ds__extract_day
+  , subq_0.booking__ds__extract_dayofweek
+  , subq_0.booking__ds__extract_dayofyear
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
   , subq_0.booking__ds_partitioned__quarter
   , subq_0.booking__ds_partitioned__year
+  , subq_0.booking__ds_partitioned__extract_year
+  , subq_0.booking__ds_partitioned__extract_quarter
+  , subq_0.booking__ds_partitioned__extract_month
+  , subq_0.booking__ds_partitioned__extract_week
+  , subq_0.booking__ds_partitioned__extract_day
+  , subq_0.booking__ds_partitioned__extract_dayofweek
+  , subq_0.booking__ds_partitioned__extract_dayofyear
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
   , subq_0.booking__paid_at__quarter
   , subq_0.booking__paid_at__year
+  , subq_0.booking__paid_at__extract_year
+  , subq_0.booking__paid_at__extract_quarter
+  , subq_0.booking__paid_at__extract_month
+  , subq_0.booking__paid_at__extract_week
+  , subq_0.booking__paid_at__extract_day
+  , subq_0.booking__paid_at__extract_dayofweek
+  , subq_0.booking__paid_at__extract_dayofyear
   , subq_0.paid_at__day AS metric_time__day
   , subq_0.paid_at__week AS metric_time__week
   , subq_0.paid_at__month AS metric_time__month
@@ -67,32 +109,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 8f68ad52d4..ed2c8def7c 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -6,31 +6,73 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , paid_at AS metric_time__day
   , DATE_TRUNC('week', paid_at) AS metric_time__week
   , DATE_TRUNC('month', paid_at) AS metric_time__month
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 7c20f14f7c..3acc2d08e5 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -5,31 +5,73 @@ SELECT
   , subq_0.ds__month
   , subq_0.ds__quarter
   , subq_0.ds__year
+  , subq_0.ds__extract_year
+  , subq_0.ds__extract_quarter
+  , subq_0.ds__extract_month
+  , subq_0.ds__extract_week
+  , subq_0.ds__extract_day
+  , subq_0.ds__extract_dayofweek
+  , subq_0.ds__extract_dayofyear
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
   , subq_0.ds_partitioned__quarter
   , subq_0.ds_partitioned__year
+  , subq_0.ds_partitioned__extract_year
+  , subq_0.ds_partitioned__extract_quarter
+  , subq_0.ds_partitioned__extract_month
+  , subq_0.ds_partitioned__extract_week
+  , subq_0.ds_partitioned__extract_day
+  , subq_0.ds_partitioned__extract_dayofweek
+  , subq_0.ds_partitioned__extract_dayofyear
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
   , subq_0.paid_at__quarter
   , subq_0.paid_at__year
+  , subq_0.paid_at__extract_year
+  , subq_0.paid_at__extract_quarter
+  , subq_0.paid_at__extract_month
+  , subq_0.paid_at__extract_week
+  , subq_0.paid_at__extract_day
+  , subq_0.paid_at__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
   , subq_0.booking__ds__quarter
   , subq_0.booking__ds__year
+  , subq_0.booking__ds__extract_year
+  , subq_0.booking__ds__extract_quarter
+  , subq_0.booking__ds__extract_month
+  , subq_0.booking__ds__extract_week
+  , subq_0.booking__ds__extract_day
+  , subq_0.booking__ds__extract_dayofweek
+  , subq_0.booking__ds__extract_dayofyear
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
   , subq_0.booking__ds_partitioned__quarter
   , subq_0.booking__ds_partitioned__year
+  , subq_0.booking__ds_partitioned__extract_year
+  , subq_0.booking__ds_partitioned__extract_quarter
+  , subq_0.booking__ds_partitioned__extract_month
+  , subq_0.booking__ds_partitioned__extract_week
+  , subq_0.booking__ds_partitioned__extract_day
+  , subq_0.booking__ds_partitioned__extract_dayofweek
+  , subq_0.booking__ds_partitioned__extract_dayofyear
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
   , subq_0.booking__paid_at__quarter
   , subq_0.booking__paid_at__year
+  , subq_0.booking__paid_at__extract_year
+  , subq_0.booking__paid_at__extract_quarter
+  , subq_0.booking__paid_at__extract_month
+  , subq_0.booking__paid_at__extract_week
+  , subq_0.booking__paid_at__extract_day
+  , subq_0.booking__paid_at__extract_dayofweek
+  , subq_0.booking__paid_at__extract_dayofyear
   , subq_0.ds__day AS metric_time__day
   , subq_0.ds__week AS metric_time__week
   , subq_0.ds__month AS metric_time__month
@@ -79,32 +121,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 7c661d75a0..541c754a5a 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -6,31 +6,73 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
+  , EXTRACT(YEAR FROM ds) AS ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS ds__extract_week
+  , EXTRACT(DAY FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
+  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
+  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
+  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
+  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
+  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
   , ds AS metric_time__day
   , DATE_TRUNC('week', ds) AS metric_time__week
   , DATE_TRUNC('month', ds) AS metric_time__month
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
index 4141b83082..9a64eefccb 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -27,31 +27,73 @@ FROM (
           , subq_0.ds__month
           , subq_0.ds__quarter
           , subq_0.ds__year
+          , subq_0.ds__extract_year
+          , subq_0.ds__extract_quarter
+          , subq_0.ds__extract_month
+          , subq_0.ds__extract_week
+          , subq_0.ds__extract_day
+          , subq_0.ds__extract_dayofweek
+          , subq_0.ds__extract_dayofyear
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
           , subq_0.ds_partitioned__quarter
           , subq_0.ds_partitioned__year
+          , subq_0.ds_partitioned__extract_year
+          , subq_0.ds_partitioned__extract_quarter
+          , subq_0.ds_partitioned__extract_month
+          , subq_0.ds_partitioned__extract_week
+          , subq_0.ds_partitioned__extract_day
+          , subq_0.ds_partitioned__extract_dayofweek
+          , subq_0.ds_partitioned__extract_dayofyear
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
           , subq_0.paid_at__quarter
           , subq_0.paid_at__year
+          , subq_0.paid_at__extract_year
+          , subq_0.paid_at__extract_quarter
+          , subq_0.paid_at__extract_month
+          , subq_0.paid_at__extract_week
+          , subq_0.paid_at__extract_day
+          , subq_0.paid_at__extract_dayofweek
+          , subq_0.paid_at__extract_dayofyear
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
           , subq_0.booking__ds__quarter
           , subq_0.booking__ds__year
+          , subq_0.booking__ds__extract_year
+          , subq_0.booking__ds__extract_quarter
+          , subq_0.booking__ds__extract_month
+          , subq_0.booking__ds__extract_week
+          , subq_0.booking__ds__extract_day
+          , subq_0.booking__ds__extract_dayofweek
+          , subq_0.booking__ds__extract_dayofyear
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
           , subq_0.booking__ds_partitioned__quarter
           , subq_0.booking__ds_partitioned__year
+          , subq_0.booking__ds_partitioned__extract_year
+          , subq_0.booking__ds_partitioned__extract_quarter
+          , subq_0.booking__ds_partitioned__extract_month
+          , subq_0.booking__ds_partitioned__extract_week
+          , subq_0.booking__ds_partitioned__extract_day
+          , subq_0.booking__ds_partitioned__extract_dayofweek
+          , subq_0.booking__ds_partitioned__extract_dayofyear
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
           , subq_0.booking__paid_at__quarter
           , subq_0.booking__paid_at__year
+          , subq_0.booking__paid_at__extract_year
+          , subq_0.booking__paid_at__extract_quarter
+          , subq_0.booking__paid_at__extract_month
+          , subq_0.booking__paid_at__extract_week
+          , subq_0.booking__paid_at__extract_day
+          , subq_0.booking__paid_at__extract_dayofweek
+          , subq_0.booking__paid_at__extract_dayofyear
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -101,32 +143,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -165,31 +249,73 @@ FULL OUTER JOIN (
           , subq_5.ds__month
           , subq_5.ds__quarter
           , subq_5.ds__year
+          , subq_5.ds__extract_year
+          , subq_5.ds__extract_quarter
+          , subq_5.ds__extract_month
+          , subq_5.ds__extract_week
+          , subq_5.ds__extract_day
+          , subq_5.ds__extract_dayofweek
+          , subq_5.ds__extract_dayofyear
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
           , subq_5.ds_partitioned__quarter
           , subq_5.ds_partitioned__year
+          , subq_5.ds_partitioned__extract_year
+          , subq_5.ds_partitioned__extract_quarter
+          , subq_5.ds_partitioned__extract_month
+          , subq_5.ds_partitioned__extract_week
+          , subq_5.ds_partitioned__extract_day
+          , subq_5.ds_partitioned__extract_dayofweek
+          , subq_5.ds_partitioned__extract_dayofyear
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
           , subq_5.paid_at__quarter
           , subq_5.paid_at__year
+          , subq_5.paid_at__extract_year
+          , subq_5.paid_at__extract_quarter
+          , subq_5.paid_at__extract_month
+          , subq_5.paid_at__extract_week
+          , subq_5.paid_at__extract_day
+          , subq_5.paid_at__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
           , subq_5.booking__ds__quarter
           , subq_5.booking__ds__year
+          , subq_5.booking__ds__extract_year
+          , subq_5.booking__ds__extract_quarter
+          , subq_5.booking__ds__extract_month
+          , subq_5.booking__ds__extract_week
+          , subq_5.booking__ds__extract_day
+          , subq_5.booking__ds__extract_dayofweek
+          , subq_5.booking__ds__extract_dayofyear
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
           , subq_5.booking__ds_partitioned__quarter
           , subq_5.booking__ds_partitioned__year
+          , subq_5.booking__ds_partitioned__extract_year
+          , subq_5.booking__ds_partitioned__extract_quarter
+          , subq_5.booking__ds_partitioned__extract_month
+          , subq_5.booking__ds_partitioned__extract_week
+          , subq_5.booking__ds_partitioned__extract_day
+          , subq_5.booking__ds_partitioned__extract_dayofweek
+          , subq_5.booking__ds_partitioned__extract_dayofyear
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
           , subq_5.booking__paid_at__quarter
           , subq_5.booking__paid_at__year
+          , subq_5.booking__paid_at__extract_year
+          , subq_5.booking__paid_at__extract_quarter
+          , subq_5.booking__paid_at__extract_month
+          , subq_5.booking__paid_at__extract_week
+          , subq_5.booking__paid_at__extract_day
+          , subq_5.booking__paid_at__extract_dayofweek
+          , subq_5.booking__paid_at__extract_dayofyear
           , subq_5.paid_at__day AS metric_time__day
           , subq_5.paid_at__week AS metric_time__week
           , subq_5.paid_at__month AS metric_time__month
@@ -227,32 +353,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
index 472402b294..c9e54613ef 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
@@ -25,156 +25,324 @@
         <!-- col5 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_8),  -->
-        <!--    'column_alias': 'ds_partitioned__day'}               -->
+        <!--    'column_alias': 'ds__extract_year'}                  -->
         <!-- col6 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_9),  -->
-        <!--    'column_alias': 'ds_partitioned__week'}              -->
+        <!--    'column_alias': 'ds__extract_quarter'}               -->
         <!-- col7 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10),  -->
-        <!--    'column_alias': 'ds_partitioned__month'}              -->
+        <!--    'column_alias': 'ds__extract_month'}                  -->
         <!-- col8 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_11),  -->
-        <!--    'column_alias': 'ds_partitioned__quarter'}            -->
+        <!--    'column_alias': 'ds__extract_week'}                   -->
         <!-- col9 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_12),  -->
-        <!--    'column_alias': 'ds_partitioned__year'}               -->
+        <!--    'column_alias': 'ds__extract_day'}                    -->
         <!-- col10 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_13),  -->
-        <!--    'column_alias': 'paid_at__day'}                       -->
+        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
         <!-- col11 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_14),  -->
-        <!--    'column_alias': 'paid_at__week'}                      -->
+        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
         <!-- col12 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_15),  -->
-        <!--    'column_alias': 'paid_at__month'}                     -->
+        <!--    'column_alias': 'ds_partitioned__day'}                -->
         <!-- col13 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_16),  -->
-        <!--    'column_alias': 'paid_at__quarter'}                   -->
+        <!--    'column_alias': 'ds_partitioned__week'}               -->
         <!-- col14 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_17),  -->
-        <!--    'column_alias': 'paid_at__year'}                      -->
+        <!--    'column_alias': 'ds_partitioned__month'}              -->
         <!-- col15 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_18),  -->
-        <!--    'column_alias': 'booking__ds__day'}                   -->
+        <!--    'column_alias': 'ds_partitioned__quarter'}            -->
         <!-- col16 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_19),  -->
-        <!--    'column_alias': 'booking__ds__week'}                  -->
+        <!--    'column_alias': 'ds_partitioned__year'}               -->
         <!-- col17 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_20),  -->
-        <!--    'column_alias': 'booking__ds__month'}                 -->
+        <!--    'column_alias': 'ds_partitioned__extract_year'}       -->
         <!-- col18 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_21),  -->
-        <!--    'column_alias': 'booking__ds__quarter'}               -->
+        <!--    'column_alias': 'ds_partitioned__extract_quarter'}    -->
         <!-- col19 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_22),  -->
-        <!--    'column_alias': 'booking__ds__year'}                  -->
+        <!--    'column_alias': 'ds_partitioned__extract_month'}      -->
         <!-- col20 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_23),  -->
-        <!--    'column_alias': 'booking__ds_partitioned__day'}       -->
+        <!--    'column_alias': 'ds_partitioned__extract_week'}       -->
         <!-- col21 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_24),  -->
-        <!--    'column_alias': 'booking__ds_partitioned__week'}      -->
+        <!--    'column_alias': 'ds_partitioned__extract_day'}        -->
         <!-- col22 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_25),  -->
-        <!--    'column_alias': 'booking__ds_partitioned__month'}     -->
+        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
         <!-- col23 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_26),  -->
-        <!--    'column_alias': 'booking__ds_partitioned__quarter'}   -->
+        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
         <!-- col24 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_27),  -->
-        <!--    'column_alias': 'booking__ds_partitioned__year'}      -->
+        <!--    'column_alias': 'paid_at__day'}                       -->
         <!-- col25 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_28),  -->
-        <!--    'column_alias': 'booking__paid_at__day'}              -->
+        <!--    'column_alias': 'paid_at__week'}                      -->
         <!-- col26 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_29),  -->
-        <!--    'column_alias': 'booking__paid_at__week'}             -->
+        <!--    'column_alias': 'paid_at__month'}                     -->
         <!-- col27 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_30),  -->
-        <!--    'column_alias': 'booking__paid_at__month'}            -->
+        <!--    'column_alias': 'paid_at__quarter'}                   -->
         <!-- col28 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_31),  -->
-        <!--    'column_alias': 'booking__paid_at__quarter'}          -->
+        <!--    'column_alias': 'paid_at__year'}                      -->
         <!-- col29 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_32),  -->
-        <!--    'column_alias': 'booking__paid_at__year'}             -->
+        <!--    'column_alias': 'paid_at__extract_year'}              -->
         <!-- col30 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_33),  -->
-        <!--    'column_alias': 'metric_time__day'}                   -->
+        <!--    'column_alias': 'paid_at__extract_quarter'}           -->
         <!-- col31 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_34),  -->
-        <!--    'column_alias': 'metric_time__week'}                  -->
+        <!--    'column_alias': 'paid_at__extract_month'}             -->
         <!-- col32 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_35),  -->
-        <!--    'column_alias': 'metric_time__month'}                 -->
+        <!--    'column_alias': 'paid_at__extract_week'}              -->
         <!-- col33 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_36),  -->
-        <!--    'column_alias': 'metric_time__quarter'}               -->
+        <!--    'column_alias': 'paid_at__extract_day'}               -->
         <!-- col34 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_37),  -->
-        <!--    'column_alias': 'metric_time__year'}                  -->
+        <!--    'column_alias': 'paid_at__extract_dayofweek'}         -->
         <!-- col35 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_38),  -->
-        <!--    'column_alias': 'listing'}                            -->
+        <!--    'column_alias': 'paid_at__extract_dayofyear'}         -->
         <!-- col36 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_39),  -->
-        <!--    'column_alias': 'guest'}                              -->
+        <!--    'column_alias': 'booking__ds__day'}                   -->
         <!-- col37 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_40),  -->
-        <!--    'column_alias': 'host'}                               -->
+        <!--    'column_alias': 'booking__ds__week'}                  -->
         <!-- col38 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_41),  -->
-        <!--    'column_alias': 'booking__listing'}                   -->
+        <!--    'column_alias': 'booking__ds__month'}                 -->
         <!-- col39 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_42),  -->
-        <!--    'column_alias': 'booking__guest'}                     -->
+        <!--    'column_alias': 'booking__ds__quarter'}               -->
         <!-- col40 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_43),  -->
+        <!--    'column_alias': 'booking__ds__year'}                  -->
+        <!-- col41 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_44),  -->
+        <!--    'column_alias': 'booking__ds__extract_year'}          -->
+        <!-- col42 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_45),  -->
+        <!--    'column_alias': 'booking__ds__extract_quarter'}       -->
+        <!-- col43 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_46),  -->
+        <!--    'column_alias': 'booking__ds__extract_month'}         -->
+        <!-- col44 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_47),  -->
+        <!--    'column_alias': 'booking__ds__extract_week'}          -->
+        <!-- col45 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_48),  -->
+        <!--    'column_alias': 'booking__ds__extract_day'}           -->
+        <!-- col46 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_49),  -->
+        <!--    'column_alias': 'booking__ds__extract_dayofweek'}     -->
+        <!-- col47 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_50),  -->
+        <!--    'column_alias': 'booking__ds__extract_dayofyear'}     -->
+        <!-- col48 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_51),  -->
+        <!--    'column_alias': 'booking__ds_partitioned__day'}       -->
+        <!-- col49 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_52),  -->
+        <!--    'column_alias': 'booking__ds_partitioned__week'}      -->
+        <!-- col50 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_53),  -->
+        <!--    'column_alias': 'booking__ds_partitioned__month'}     -->
+        <!-- col51 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_54),  -->
+        <!--    'column_alias': 'booking__ds_partitioned__quarter'}   -->
+        <!-- col52 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_55),  -->
+        <!--    'column_alias': 'booking__ds_partitioned__year'}      -->
+        <!-- col53 =                                                      -->
+        <!--   {'class': 'SqlSelectColumn',                               -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_56),      -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+        <!-- col54 =                                                         -->
+        <!--   {'class': 'SqlSelectColumn',                                  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_57),         -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+        <!-- col55 =                                                       -->
+        <!--   {'class': 'SqlSelectColumn',                                -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_58),       -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+        <!-- col56 =                                                      -->
+        <!--   {'class': 'SqlSelectColumn',                               -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_59),      -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+        <!-- col57 =                                                     -->
+        <!--   {'class': 'SqlSelectColumn',                              -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_60),     -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+        <!-- col58 =                                                           -->
+        <!--   {'class': 'SqlSelectColumn',                                    -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),           -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+        <!-- col59 =                                                           -->
+        <!--   {'class': 'SqlSelectColumn',                                    -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),           -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+        <!-- col60 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_63),  -->
+        <!--    'column_alias': 'booking__paid_at__day'}              -->
+        <!-- col61 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_64),  -->
+        <!--    'column_alias': 'booking__paid_at__week'}             -->
+        <!-- col62 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_65),  -->
+        <!--    'column_alias': 'booking__paid_at__month'}            -->
+        <!-- col63 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_66),  -->
+        <!--    'column_alias': 'booking__paid_at__quarter'}          -->
+        <!-- col64 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_67),  -->
+        <!--    'column_alias': 'booking__paid_at__year'}             -->
+        <!-- col65 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_68),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_year'}     -->
+        <!-- col66 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_69),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+        <!-- col67 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_70),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_month'}    -->
+        <!-- col68 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_71),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_week'}     -->
+        <!-- col69 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_72),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_day'}      -->
+        <!-- col70 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                             -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),    -->
+        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+        <!-- col71 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                             -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),    -->
+        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+        <!-- col72 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_75),  -->
+        <!--    'column_alias': 'metric_time__day'}                   -->
+        <!-- col73 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_76),  -->
+        <!--    'column_alias': 'metric_time__week'}                  -->
+        <!-- col74 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_77),  -->
+        <!--    'column_alias': 'metric_time__month'}                 -->
+        <!-- col75 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_78),  -->
+        <!--    'column_alias': 'metric_time__quarter'}               -->
+        <!-- col76 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_79),  -->
+        <!--    'column_alias': 'metric_time__year'}                  -->
+        <!-- col77 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_80),  -->
+        <!--    'column_alias': 'listing'}                            -->
+        <!-- col78 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_81),  -->
+        <!--    'column_alias': 'guest'}                              -->
+        <!-- col79 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_82),  -->
+        <!--    'column_alias': 'host'}                               -->
+        <!-- col80 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_83),  -->
+        <!--    'column_alias': 'booking__listing'}                   -->
+        <!-- col81 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_84),  -->
+        <!--    'column_alias': 'booking__guest'}                     -->
+        <!-- col82 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),  -->
         <!--    'column_alias': 'booking__host'}                      -->
-        <!-- col41 =                                                 -->
+        <!-- col83 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1),  -->
         <!--    'column_alias': 'is_instant'}                        -->
-        <!-- col42 =                                                 -->
+        <!-- col84 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_2),  -->
         <!--    'column_alias': 'booking__is_instant'}               -->
-        <!-- col43 =                                                 -->
+        <!-- col85 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_0),  -->
         <!--    'column_alias': 'booking_payments'}                  -->
@@ -193,27 +361,27 @@
             <!--    'column_alias': 'instant_bookings'}                                                              -->
             <!-- col2 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
             <!--    'column_alias': 'booking_value'}                         -->
             <!-- col3 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
             <!--    'column_alias': 'max_booking_value'}                     -->
             <!-- col4 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
             <!--    'column_alias': 'min_booking_value'}                     -->
             <!-- col5 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
             <!--    'column_alias': 'bookers'}                               -->
             <!-- col6 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
             <!--    'column_alias': 'average_booking_value'}                 -->
             <!-- col7 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
             <!--    'column_alias': 'booking_payments'}                      -->
             <!-- col8 =                                                                                                           -->
             <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -221,31 +389,31 @@
             <!--    'column_alias': 'referred_bookings'}                                                                          -->
             <!-- col9 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
             <!--    'column_alias': 'median_booking_value'}                  -->
             <!-- col10 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
             <!--    'column_alias': 'booking_value_p99'}                     -->
             <!-- col11 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
             <!--    'column_alias': 'discrete_booking_value_p99'}            -->
             <!-- col12 =                                                         -->
             <!--   {'class': 'SqlSelectColumn',                                  -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
             <!-- col13 =                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
             <!-- col14 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
             <!--    'column_alias': 'is_instant'}                            -->
             <!-- col15 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
             <!--    'column_alias': 'ds__day'}                               -->
             <!-- col16 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -263,133 +431,301 @@
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
             <!--    'column_alias': 'ds__year'}                        -->
-            <!-- col20 =                                                     -->
+            <!-- col20 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+            <!--    'column_alias': 'ds__extract_year'}              -->
+            <!-- col21 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+            <!--    'column_alias': 'ds__extract_quarter'}           -->
+            <!-- col22 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+            <!--    'column_alias': 'ds__extract_month'}             -->
+            <!-- col23 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+            <!--    'column_alias': 'ds__extract_week'}              -->
+            <!-- col24 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+            <!--    'column_alias': 'ds__extract_day'}               -->
+            <!-- col25 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+            <!-- col26 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+            <!-- col27 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
             <!--    'column_alias': 'ds_partitioned__day'}                   -->
-            <!-- col21 =                                               -->
+            <!-- col28 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
             <!--    'column_alias': 'ds_partitioned__week'}            -->
-            <!-- col22 =                                               -->
+            <!-- col29 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
             <!--    'column_alias': 'ds_partitioned__month'}           -->
-            <!-- col23 =                                               -->
+            <!-- col30 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
             <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-            <!-- col24 =                                               -->
+            <!-- col31 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
             <!--    'column_alias': 'ds_partitioned__year'}            -->
-            <!-- col25 =                                                     -->
+            <!-- col32 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+            <!-- col33 =                                                -->
+            <!--   {'class': 'SqlSelectColumn',                         -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+            <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+            <!-- col34 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                       -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+            <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+            <!-- col35 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+            <!-- col36 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+            <!-- col37 =                                                  -->
+            <!--   {'class': 'SqlSelectColumn',                           -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+            <!-- col38 =                                                  -->
+            <!--   {'class': 'SqlSelectColumn',                           -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+            <!-- col39 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
             <!--    'column_alias': 'paid_at__day'}                          -->
-            <!-- col26 =                                               -->
+            <!-- col40 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
             <!--    'column_alias': 'paid_at__week'}                   -->
-            <!-- col27 =                                               -->
+            <!-- col41 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
             <!--    'column_alias': 'paid_at__month'}                  -->
-            <!-- col28 =                                               -->
+            <!-- col42 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
             <!--    'column_alias': 'paid_at__quarter'}                -->
-            <!-- col29 =                                               -->
+            <!-- col43 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
             <!--    'column_alias': 'paid_at__year'}                   -->
-            <!-- col30 =                                                     -->
+            <!-- col44 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+            <!--    'column_alias': 'paid_at__extract_year'}         -->
+            <!-- col45 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+            <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+            <!-- col46 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+            <!--    'column_alias': 'paid_at__extract_month'}        -->
+            <!-- col47 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+            <!--    'column_alias': 'paid_at__extract_week'}         -->
+            <!-- col48 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+            <!--    'column_alias': 'paid_at__extract_day'}          -->
+            <!-- col49 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+            <!-- col50 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+            <!-- col51 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
             <!--    'column_alias': 'booking__is_instant'}                   -->
-            <!-- col31 =                                                     -->
+            <!-- col52 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
             <!--    'column_alias': 'booking__ds__day'}                      -->
-            <!-- col32 =                                               -->
+            <!-- col53 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
             <!--    'column_alias': 'booking__ds__week'}               -->
-            <!-- col33 =                                               -->
+            <!-- col54 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
             <!--    'column_alias': 'booking__ds__month'}              -->
-            <!-- col34 =                                               -->
+            <!-- col55 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
             <!--    'column_alias': 'booking__ds__quarter'}            -->
-            <!-- col35 =                                               -->
+            <!-- col56 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
             <!--    'column_alias': 'booking__ds__year'}               -->
-            <!-- col36 =                                                     -->
+            <!-- col57 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+            <!--    'column_alias': 'booking__ds__extract_year'}     -->
+            <!-- col58 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+            <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+            <!-- col59 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+            <!--    'column_alias': 'booking__ds__extract_month'}    -->
+            <!-- col60 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+            <!--    'column_alias': 'booking__ds__extract_week'}     -->
+            <!-- col61 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+            <!--    'column_alias': 'booking__ds__extract_day'}      -->
+            <!-- col62 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+            <!-- col63 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+            <!-- col64 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
             <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-            <!-- col37 =                                               -->
+            <!-- col65 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
             <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-            <!-- col38 =                                               -->
+            <!-- col66 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
             <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-            <!-- col39 =                                                 -->
+            <!-- col67 =                                                 -->
             <!--   {'class': 'SqlSelectColumn',                          -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
             <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-            <!-- col40 =                                               -->
+            <!-- col68 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
             <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-            <!-- col41 =                                                     -->
+            <!-- col69 =                                                      -->
+            <!--   {'class': 'SqlSelectColumn',                               -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+            <!-- col70 =                                                         -->
+            <!--   {'class': 'SqlSelectColumn',                                  -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+            <!-- col71 =                                                       -->
+            <!--   {'class': 'SqlSelectColumn',                                -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+            <!-- col72 =                                                      -->
+            <!--   {'class': 'SqlSelectColumn',                               -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+            <!-- col73 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+            <!-- col74 =                                                           -->
+            <!--   {'class': 'SqlSelectColumn',                                    -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+            <!-- col75 =                                                           -->
+            <!--   {'class': 'SqlSelectColumn',                                    -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+            <!-- col76 =                                                     -->
+            <!--   {'class': 'SqlSelectColumn',                              -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
             <!--    'column_alias': 'booking__paid_at__day'}                 -->
-            <!-- col42 =                                               -->
+            <!-- col77 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
             <!--    'column_alias': 'booking__paid_at__week'}          -->
-            <!-- col43 =                                               -->
+            <!-- col78 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
             <!--    'column_alias': 'booking__paid_at__month'}         -->
-            <!-- col44 =                                               -->
+            <!-- col79 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
             <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-            <!-- col45 =                                               -->
+            <!-- col80 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
             <!--    'column_alias': 'booking__paid_at__year'}          -->
-            <!-- col46 =                                                     -->
+            <!-- col81 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+            <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+            <!-- col82 =                                                  -->
+            <!--   {'class': 'SqlSelectColumn',                           -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+            <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+            <!-- col83 =                                                -->
+            <!--   {'class': 'SqlSelectColumn',                         -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+            <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+            <!-- col84 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+            <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+            <!-- col85 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                       -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+            <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+            <!-- col86 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                             -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+            <!-- col87 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                             -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+            <!-- col88 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
             <!--    'column_alias': 'listing'}                               -->
-            <!-- col47 =                                                     -->
+            <!-- col89 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
             <!--    'column_alias': 'guest'}                                 -->
-            <!-- col48 =                                                     -->
+            <!-- col90 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
             <!--    'column_alias': 'host'}                                  -->
-            <!-- col49 =                                                     -->
+            <!-- col91 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
             <!--    'column_alias': 'booking__listing'}                      -->
-            <!-- col50 =                                                     -->
+            <!-- col92 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
             <!--    'column_alias': 'booking__guest'}                        -->
-            <!-- col51 =                                                     -->
+            <!-- col93 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
             <!--    'column_alias': 'booking__host'}                         -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
index 6064b575cc..e540f55e93 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
@@ -25,204 +25,372 @@
         <!-- col5 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_20),  -->
-        <!--    'column_alias': 'ds_partitioned__day'}                -->
+        <!--    'column_alias': 'ds__extract_year'}                   -->
         <!-- col6 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_21),  -->
-        <!--    'column_alias': 'ds_partitioned__week'}               -->
+        <!--    'column_alias': 'ds__extract_quarter'}                -->
         <!-- col7 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_22),  -->
-        <!--    'column_alias': 'ds_partitioned__month'}              -->
+        <!--    'column_alias': 'ds__extract_month'}                  -->
         <!-- col8 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_23),  -->
-        <!--    'column_alias': 'ds_partitioned__quarter'}            -->
+        <!--    'column_alias': 'ds__extract_week'}                   -->
         <!-- col9 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_24),  -->
-        <!--    'column_alias': 'ds_partitioned__year'}               -->
+        <!--    'column_alias': 'ds__extract_day'}                    -->
         <!-- col10 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_25),  -->
-        <!--    'column_alias': 'paid_at__day'}                       -->
+        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
         <!-- col11 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_26),  -->
-        <!--    'column_alias': 'paid_at__week'}                      -->
+        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
         <!-- col12 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_27),  -->
-        <!--    'column_alias': 'paid_at__month'}                     -->
+        <!--    'column_alias': 'ds_partitioned__day'}                -->
         <!-- col13 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_28),  -->
-        <!--    'column_alias': 'paid_at__quarter'}                   -->
+        <!--    'column_alias': 'ds_partitioned__week'}               -->
         <!-- col14 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_29),  -->
-        <!--    'column_alias': 'paid_at__year'}                      -->
+        <!--    'column_alias': 'ds_partitioned__month'}              -->
         <!-- col15 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_30),  -->
-        <!--    'column_alias': 'booking__ds__day'}                   -->
+        <!--    'column_alias': 'ds_partitioned__quarter'}            -->
         <!-- col16 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_31),  -->
-        <!--    'column_alias': 'booking__ds__week'}                  -->
+        <!--    'column_alias': 'ds_partitioned__year'}               -->
         <!-- col17 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_32),  -->
-        <!--    'column_alias': 'booking__ds__month'}                 -->
+        <!--    'column_alias': 'ds_partitioned__extract_year'}       -->
         <!-- col18 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_33),  -->
-        <!--    'column_alias': 'booking__ds__quarter'}               -->
+        <!--    'column_alias': 'ds_partitioned__extract_quarter'}    -->
         <!-- col19 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_34),  -->
-        <!--    'column_alias': 'booking__ds__year'}                  -->
+        <!--    'column_alias': 'ds_partitioned__extract_month'}      -->
         <!-- col20 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_35),  -->
-        <!--    'column_alias': 'booking__ds_partitioned__day'}       -->
+        <!--    'column_alias': 'ds_partitioned__extract_week'}       -->
         <!-- col21 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_36),  -->
-        <!--    'column_alias': 'booking__ds_partitioned__week'}      -->
+        <!--    'column_alias': 'ds_partitioned__extract_day'}        -->
         <!-- col22 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_37),  -->
-        <!--    'column_alias': 'booking__ds_partitioned__month'}     -->
+        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
         <!-- col23 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_38),  -->
-        <!--    'column_alias': 'booking__ds_partitioned__quarter'}   -->
+        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
         <!-- col24 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_39),  -->
-        <!--    'column_alias': 'booking__ds_partitioned__year'}      -->
+        <!--    'column_alias': 'paid_at__day'}                       -->
         <!-- col25 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_40),  -->
-        <!--    'column_alias': 'booking__paid_at__day'}              -->
+        <!--    'column_alias': 'paid_at__week'}                      -->
         <!-- col26 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_41),  -->
-        <!--    'column_alias': 'booking__paid_at__week'}             -->
+        <!--    'column_alias': 'paid_at__month'}                     -->
         <!-- col27 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_42),  -->
-        <!--    'column_alias': 'booking__paid_at__month'}            -->
+        <!--    'column_alias': 'paid_at__quarter'}                   -->
         <!-- col28 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_43),  -->
-        <!--    'column_alias': 'booking__paid_at__quarter'}          -->
+        <!--    'column_alias': 'paid_at__year'}                      -->
         <!-- col29 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_44),  -->
-        <!--    'column_alias': 'booking__paid_at__year'}             -->
+        <!--    'column_alias': 'paid_at__extract_year'}              -->
         <!-- col30 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_45),  -->
-        <!--    'column_alias': 'metric_time__day'}                   -->
+        <!--    'column_alias': 'paid_at__extract_quarter'}           -->
         <!-- col31 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_46),  -->
-        <!--    'column_alias': 'metric_time__week'}                  -->
+        <!--    'column_alias': 'paid_at__extract_month'}             -->
         <!-- col32 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_47),  -->
-        <!--    'column_alias': 'metric_time__month'}                 -->
+        <!--    'column_alias': 'paid_at__extract_week'}              -->
         <!-- col33 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_48),  -->
-        <!--    'column_alias': 'metric_time__quarter'}               -->
+        <!--    'column_alias': 'paid_at__extract_day'}               -->
         <!-- col34 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_49),  -->
-        <!--    'column_alias': 'metric_time__year'}                  -->
+        <!--    'column_alias': 'paid_at__extract_dayofweek'}         -->
         <!-- col35 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_50),  -->
-        <!--    'column_alias': 'listing'}                            -->
+        <!--    'column_alias': 'paid_at__extract_dayofyear'}         -->
         <!-- col36 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_51),  -->
-        <!--    'column_alias': 'guest'}                              -->
+        <!--    'column_alias': 'booking__ds__day'}                   -->
         <!-- col37 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_52),  -->
-        <!--    'column_alias': 'host'}                               -->
+        <!--    'column_alias': 'booking__ds__week'}                  -->
         <!-- col38 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_53),  -->
-        <!--    'column_alias': 'booking__listing'}                   -->
+        <!--    'column_alias': 'booking__ds__month'}                 -->
         <!-- col39 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_54),  -->
-        <!--    'column_alias': 'booking__guest'}                     -->
+        <!--    'column_alias': 'booking__ds__quarter'}               -->
         <!-- col40 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_55),  -->
-        <!--    'column_alias': 'booking__host'}                      -->
+        <!--    'column_alias': 'booking__ds__year'}                  -->
         <!-- col41 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_56),  -->
+        <!--    'column_alias': 'booking__ds__extract_year'}          -->
+        <!-- col42 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_57),  -->
+        <!--    'column_alias': 'booking__ds__extract_quarter'}       -->
+        <!-- col43 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_58),  -->
+        <!--    'column_alias': 'booking__ds__extract_month'}         -->
+        <!-- col44 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_59),  -->
+        <!--    'column_alias': 'booking__ds__extract_week'}          -->
+        <!-- col45 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_60),  -->
+        <!--    'column_alias': 'booking__ds__extract_day'}           -->
+        <!-- col46 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
+        <!--    'column_alias': 'booking__ds__extract_dayofweek'}     -->
+        <!-- col47 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),  -->
+        <!--    'column_alias': 'booking__ds__extract_dayofyear'}     -->
+        <!-- col48 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_63),  -->
+        <!--    'column_alias': 'booking__ds_partitioned__day'}       -->
+        <!-- col49 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_64),  -->
+        <!--    'column_alias': 'booking__ds_partitioned__week'}      -->
+        <!-- col50 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_65),  -->
+        <!--    'column_alias': 'booking__ds_partitioned__month'}     -->
+        <!-- col51 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_66),  -->
+        <!--    'column_alias': 'booking__ds_partitioned__quarter'}   -->
+        <!-- col52 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_67),  -->
+        <!--    'column_alias': 'booking__ds_partitioned__year'}      -->
+        <!-- col53 =                                                      -->
+        <!--   {'class': 'SqlSelectColumn',                               -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_68),      -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+        <!-- col54 =                                                         -->
+        <!--   {'class': 'SqlSelectColumn',                                  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_69),         -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+        <!-- col55 =                                                       -->
+        <!--   {'class': 'SqlSelectColumn',                                -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_70),       -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+        <!-- col56 =                                                      -->
+        <!--   {'class': 'SqlSelectColumn',                               -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_71),      -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+        <!-- col57 =                                                     -->
+        <!--   {'class': 'SqlSelectColumn',                              -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_72),     -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+        <!-- col58 =                                                           -->
+        <!--   {'class': 'SqlSelectColumn',                                    -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),           -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+        <!-- col59 =                                                           -->
+        <!--   {'class': 'SqlSelectColumn',                                    -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),           -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+        <!-- col60 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_75),  -->
+        <!--    'column_alias': 'booking__paid_at__day'}              -->
+        <!-- col61 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_76),  -->
+        <!--    'column_alias': 'booking__paid_at__week'}             -->
+        <!-- col62 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_77),  -->
+        <!--    'column_alias': 'booking__paid_at__month'}            -->
+        <!-- col63 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_78),  -->
+        <!--    'column_alias': 'booking__paid_at__quarter'}          -->
+        <!-- col64 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_79),  -->
+        <!--    'column_alias': 'booking__paid_at__year'}             -->
+        <!-- col65 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_80),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_year'}     -->
+        <!-- col66 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_81),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+        <!-- col67 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_82),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_month'}    -->
+        <!-- col68 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_83),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_week'}     -->
+        <!-- col69 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_84),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_day'}      -->
+        <!-- col70 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                             -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),    -->
+        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+        <!-- col71 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                             -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),    -->
+        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+        <!-- col72 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_87),  -->
+        <!--    'column_alias': 'metric_time__day'}                   -->
+        <!-- col73 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_88),  -->
+        <!--    'column_alias': 'metric_time__week'}                  -->
+        <!-- col74 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_89),  -->
+        <!--    'column_alias': 'metric_time__month'}                 -->
+        <!-- col75 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_90),  -->
+        <!--    'column_alias': 'metric_time__quarter'}               -->
+        <!-- col76 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_91),  -->
+        <!--    'column_alias': 'metric_time__year'}                  -->
+        <!-- col77 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_92),  -->
+        <!--    'column_alias': 'listing'}                            -->
+        <!-- col78 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_93),  -->
+        <!--    'column_alias': 'guest'}                              -->
+        <!-- col79 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_94),  -->
+        <!--    'column_alias': 'host'}                               -->
+        <!-- col80 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_95),  -->
+        <!--    'column_alias': 'booking__listing'}                   -->
+        <!-- col81 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_96),  -->
+        <!--    'column_alias': 'booking__guest'}                     -->
+        <!-- col82 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
+        <!--    'column_alias': 'booking__host'}                      -->
+        <!-- col83 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_13),  -->
         <!--    'column_alias': 'is_instant'}                         -->
-        <!-- col42 =                                                  -->
+        <!-- col84 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_14),  -->
         <!--    'column_alias': 'booking__is_instant'}                -->
-        <!-- col43 =                                                 -->
+        <!-- col85 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_0),  -->
         <!--    'column_alias': 'bookings'}                          -->
-        <!-- col44 =                                                 -->
+        <!-- col86 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1),  -->
         <!--    'column_alias': 'instant_bookings'}                  -->
-        <!-- col45 =                                                 -->
+        <!-- col87 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_2),  -->
         <!--    'column_alias': 'booking_value'}                     -->
-        <!-- col46 =                                                 -->
+        <!-- col88 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_3),  -->
         <!--    'column_alias': 'max_booking_value'}                 -->
-        <!-- col47 =                                                 -->
+        <!-- col89 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_4),  -->
         <!--    'column_alias': 'min_booking_value'}                 -->
-        <!-- col48 =                                                 -->
+        <!-- col90 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_5),  -->
         <!--    'column_alias': 'bookers'}                           -->
-        <!-- col49 =                                                 -->
+        <!-- col91 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_6),  -->
         <!--    'column_alias': 'average_booking_value'}             -->
-        <!-- col50 =                                                 -->
+        <!-- col92 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_7),  -->
         <!--    'column_alias': 'referred_bookings'}                 -->
-        <!-- col51 =                                                 -->
+        <!-- col93 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_8),  -->
         <!--    'column_alias': 'median_booking_value'}              -->
-        <!-- col52 =                                                 -->
+        <!-- col94 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_9),  -->
         <!--    'column_alias': 'booking_value_p99'}                 -->
-        <!-- col53 =                                                  -->
+        <!-- col95 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10),  -->
         <!--    'column_alias': 'discrete_booking_value_p99'}         -->
-        <!-- col54 =                                                         -->
+        <!-- col96 =                                                         -->
         <!--   {'class': 'SqlSelectColumn',                                  -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_11),         -->
         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-        <!-- col55 =                                                       -->
+        <!-- col97 =                                                       -->
         <!--   {'class': 'SqlSelectColumn',                                -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_12),       -->
         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
@@ -241,27 +409,27 @@
             <!--    'column_alias': 'instant_bookings'}                                                              -->
             <!-- col2 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
             <!--    'column_alias': 'booking_value'}                         -->
             <!-- col3 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
             <!--    'column_alias': 'max_booking_value'}                     -->
             <!-- col4 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
             <!--    'column_alias': 'min_booking_value'}                     -->
             <!-- col5 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
             <!--    'column_alias': 'bookers'}                               -->
             <!-- col6 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
             <!--    'column_alias': 'average_booking_value'}                 -->
             <!-- col7 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
             <!--    'column_alias': 'booking_payments'}                      -->
             <!-- col8 =                                                                                                           -->
             <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -269,31 +437,31 @@
             <!--    'column_alias': 'referred_bookings'}                                                                          -->
             <!-- col9 =                                                      -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
             <!--    'column_alias': 'median_booking_value'}                  -->
             <!-- col10 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
             <!--    'column_alias': 'booking_value_p99'}                     -->
             <!-- col11 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
             <!--    'column_alias': 'discrete_booking_value_p99'}            -->
             <!-- col12 =                                                         -->
             <!--   {'class': 'SqlSelectColumn',                                  -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
             <!-- col13 =                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
             <!-- col14 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
             <!--    'column_alias': 'is_instant'}                            -->
             <!-- col15 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
             <!--    'column_alias': 'ds__day'}                               -->
             <!-- col16 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -311,133 +479,301 @@
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
             <!--    'column_alias': 'ds__year'}                        -->
-            <!-- col20 =                                                     -->
+            <!-- col20 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+            <!--    'column_alias': 'ds__extract_year'}              -->
+            <!-- col21 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+            <!--    'column_alias': 'ds__extract_quarter'}           -->
+            <!-- col22 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+            <!--    'column_alias': 'ds__extract_month'}             -->
+            <!-- col23 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+            <!--    'column_alias': 'ds__extract_week'}              -->
+            <!-- col24 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+            <!--    'column_alias': 'ds__extract_day'}               -->
+            <!-- col25 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+            <!-- col26 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+            <!-- col27 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
             <!--    'column_alias': 'ds_partitioned__day'}                   -->
-            <!-- col21 =                                               -->
+            <!-- col28 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
             <!--    'column_alias': 'ds_partitioned__week'}            -->
-            <!-- col22 =                                               -->
+            <!-- col29 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
             <!--    'column_alias': 'ds_partitioned__month'}           -->
-            <!-- col23 =                                               -->
+            <!-- col30 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
             <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-            <!-- col24 =                                               -->
+            <!-- col31 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
             <!--    'column_alias': 'ds_partitioned__year'}            -->
-            <!-- col25 =                                                     -->
+            <!-- col32 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+            <!-- col33 =                                                -->
+            <!--   {'class': 'SqlSelectColumn',                         -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+            <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+            <!-- col34 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                       -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+            <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+            <!-- col35 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+            <!-- col36 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+            <!-- col37 =                                                  -->
+            <!--   {'class': 'SqlSelectColumn',                           -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+            <!-- col38 =                                                  -->
+            <!--   {'class': 'SqlSelectColumn',                           -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+            <!-- col39 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
             <!--    'column_alias': 'paid_at__day'}                          -->
-            <!-- col26 =                                               -->
+            <!-- col40 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
             <!--    'column_alias': 'paid_at__week'}                   -->
-            <!-- col27 =                                               -->
+            <!-- col41 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
             <!--    'column_alias': 'paid_at__month'}                  -->
-            <!-- col28 =                                               -->
+            <!-- col42 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
             <!--    'column_alias': 'paid_at__quarter'}                -->
-            <!-- col29 =                                               -->
+            <!-- col43 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
             <!--    'column_alias': 'paid_at__year'}                   -->
-            <!-- col30 =                                                     -->
+            <!-- col44 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+            <!--    'column_alias': 'paid_at__extract_year'}         -->
+            <!-- col45 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+            <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+            <!-- col46 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+            <!--    'column_alias': 'paid_at__extract_month'}        -->
+            <!-- col47 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+            <!--    'column_alias': 'paid_at__extract_week'}         -->
+            <!-- col48 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+            <!--    'column_alias': 'paid_at__extract_day'}          -->
+            <!-- col49 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+            <!-- col50 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+            <!-- col51 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
             <!--    'column_alias': 'booking__is_instant'}                   -->
-            <!-- col31 =                                                     -->
+            <!-- col52 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
             <!--    'column_alias': 'booking__ds__day'}                      -->
-            <!-- col32 =                                               -->
+            <!-- col53 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
             <!--    'column_alias': 'booking__ds__week'}               -->
-            <!-- col33 =                                               -->
+            <!-- col54 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
             <!--    'column_alias': 'booking__ds__month'}              -->
-            <!-- col34 =                                               -->
+            <!-- col55 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
             <!--    'column_alias': 'booking__ds__quarter'}            -->
-            <!-- col35 =                                               -->
+            <!-- col56 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
             <!--    'column_alias': 'booking__ds__year'}               -->
-            <!-- col36 =                                                     -->
+            <!-- col57 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+            <!--    'column_alias': 'booking__ds__extract_year'}     -->
+            <!-- col58 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+            <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+            <!-- col59 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+            <!--    'column_alias': 'booking__ds__extract_month'}    -->
+            <!-- col60 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+            <!--    'column_alias': 'booking__ds__extract_week'}     -->
+            <!-- col61 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+            <!--    'column_alias': 'booking__ds__extract_day'}      -->
+            <!-- col62 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+            <!-- col63 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+            <!-- col64 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
             <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-            <!-- col37 =                                               -->
+            <!-- col65 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
             <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-            <!-- col38 =                                               -->
+            <!-- col66 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
             <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-            <!-- col39 =                                                 -->
+            <!-- col67 =                                                 -->
             <!--   {'class': 'SqlSelectColumn',                          -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
             <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-            <!-- col40 =                                               -->
+            <!-- col68 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
             <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-            <!-- col41 =                                                     -->
+            <!-- col69 =                                                      -->
+            <!--   {'class': 'SqlSelectColumn',                               -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+            <!-- col70 =                                                         -->
+            <!--   {'class': 'SqlSelectColumn',                                  -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+            <!-- col71 =                                                       -->
+            <!--   {'class': 'SqlSelectColumn',                                -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+            <!-- col72 =                                                      -->
+            <!--   {'class': 'SqlSelectColumn',                               -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+            <!-- col73 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+            <!-- col74 =                                                           -->
+            <!--   {'class': 'SqlSelectColumn',                                    -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+            <!-- col75 =                                                           -->
+            <!--   {'class': 'SqlSelectColumn',                                    -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+            <!-- col76 =                                                     -->
+            <!--   {'class': 'SqlSelectColumn',                              -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
             <!--    'column_alias': 'booking__paid_at__day'}                 -->
-            <!-- col42 =                                               -->
+            <!-- col77 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
             <!--    'column_alias': 'booking__paid_at__week'}          -->
-            <!-- col43 =                                               -->
+            <!-- col78 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
             <!--    'column_alias': 'booking__paid_at__month'}         -->
-            <!-- col44 =                                               -->
+            <!-- col79 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
             <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-            <!-- col45 =                                               -->
+            <!-- col80 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                        -->
             <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
             <!--    'column_alias': 'booking__paid_at__year'}          -->
-            <!-- col46 =                                                     -->
+            <!-- col81 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+            <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+            <!-- col82 =                                                  -->
+            <!--   {'class': 'SqlSelectColumn',                           -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+            <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+            <!-- col83 =                                                -->
+            <!--   {'class': 'SqlSelectColumn',                         -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+            <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+            <!-- col84 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                        -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+            <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+            <!-- col85 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                       -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+            <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+            <!-- col86 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                             -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+            <!-- col87 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                             -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+            <!-- col88 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
             <!--    'column_alias': 'listing'}                               -->
-            <!-- col47 =                                                     -->
+            <!-- col89 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
             <!--    'column_alias': 'guest'}                                 -->
-            <!-- col48 =                                                     -->
+            <!-- col90 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
             <!--    'column_alias': 'host'}                                  -->
-            <!-- col49 =                                                     -->
+            <!-- col91 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
             <!--    'column_alias': 'booking__listing'}                      -->
-            <!-- col50 =                                                     -->
+            <!-- col92 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
             <!--    'column_alias': 'booking__guest'}                        -->
-            <!-- col51 =                                                     -->
+            <!-- col93 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
             <!--    'column_alias': 'booking__host'}                         -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
index 612b73007d..14997b6627 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
@@ -31,11 +31,11 @@
             <!-- node_id = ss_10 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
             <!-- where = None -->
@@ -44,7 +44,7 @@
                 <!-- node_id = ss_9 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -53,7 +53,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -63,11 +63,11 @@
                     <!-- node_id = ss_8 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                     <!-- where = None -->
@@ -76,227 +76,395 @@
                         <!-- node_id = ss_7 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
-                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                        <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
-                        <!--    'column_alias': 'ds_partitioned__week'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
-                        <!--    'column_alias': 'ds_partitioned__month'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                        <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                        <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                        <!--    'column_alias': 'ds_partitioned__year'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                        <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                        <!--    'column_alias': 'paid_at__day'}                        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                        <!--    'column_alias': 'paid_at__week'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                        <!--    'column_alias': 'paid_at__month'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                        <!--    'column_alias': 'paid_at__quarter'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                        <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                        <!--    'column_alias': 'paid_at__year'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                        <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                        <!--    'column_alias': 'booking__ds__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                        <!--    'column_alias': 'booking__ds__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                        <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                        <!--    'column_alias': 'booking__ds__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                        <!--    'column_alias': 'booking__ds__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
-                        <!--    'column_alias': 'booking__ds__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                        <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
-                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                        <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
-                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                        <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
-                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                        <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
-                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                        <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
-                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
-                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
-                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
-                        <!--    'column_alias': 'listing'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
-                        <!--    'column_alias': 'guest'}                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                        <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
-                        <!--    'column_alias': 'host'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                        <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                        <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                        <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                        <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
-                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
-                        <!--    'column_alias': 'bookings'}                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
-                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
-                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
-                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
-                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
-                        <!--    'column_alias': 'bookers'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
-                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                         <!-- col50 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
-                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                         <!-- col51 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
-                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                         <!-- col52 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!-- col53 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col54 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col55 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col56 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col57 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col58 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col59 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col60 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!-- col61 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!-- col62 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!-- col63 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!-- col64 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!-- col65 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                        <!-- col66 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                        <!-- col67 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                        <!-- col68 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                        <!-- col69 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                        <!-- col70 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col71 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col72 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!-- col73 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!-- col74 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!-- col75 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!-- col76 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!-- col77 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                        <!--    'column_alias': 'listing'}                             -->
+                        <!-- col78 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                        <!--    'column_alias': 'guest'}                               -->
+                        <!-- col79 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                        <!--    'column_alias': 'host'}                                -->
+                        <!-- col80 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!-- col81 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!-- col82 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!-- col83 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!-- col84 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!-- col85 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                        <!--    'column_alias': 'bookings'}                            -->
+                        <!-- col86 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!-- col87 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!-- col88 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!-- col89 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!-- col90 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                        <!--    'column_alias': 'bookers'}                             -->
+                        <!-- col91 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!-- col92 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!-- col93 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!-- col94 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
                         <!--    'column_alias': 'booking_value_p99'}                   -->
-                        <!-- col53 =                                                   -->
+                        <!-- col95 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                        <!-- col54 =                                                         -->
+                        <!-- col96 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col55 =                                                       -->
+                        <!-- col97 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
@@ -313,27 +481,27 @@
                             <!--    'column_alias': 'instant_bookings'}                                                              -->
                             <!-- col2 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                             <!--    'column_alias': 'booking_value'}                         -->
                             <!-- col3 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                             <!--    'column_alias': 'max_booking_value'}                     -->
                             <!-- col4 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                             <!--    'column_alias': 'min_booking_value'}                     -->
                             <!-- col5 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                             <!--    'column_alias': 'bookers'}                               -->
                             <!-- col6 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                             <!--    'column_alias': 'average_booking_value'}                 -->
                             <!-- col7 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                             <!--    'column_alias': 'booking_payments'}                      -->
                             <!-- col8 =                                                                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -341,31 +509,31 @@
                             <!--    'column_alias': 'referred_bookings'}                                                                          -->
                             <!-- col9 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                             <!--    'column_alias': 'median_booking_value'}                  -->
                             <!-- col10 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                             <!--    'column_alias': 'booking_value_p99'}                     -->
                             <!-- col11 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                             <!-- col12 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col13 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- col14 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                             <!--    'column_alias': 'is_instant'}                            -->
                             <!-- col15 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                             <!--    'column_alias': 'ds__day'}                               -->
                             <!-- col16 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -383,133 +551,301 @@
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                             <!--    'column_alias': 'ds__year'}                        -->
-                            <!-- col20 =                                                     -->
+                            <!-- col20 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                            <!--    'column_alias': 'ds__extract_year'}              -->
+                            <!-- col21 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}           -->
+                            <!-- col22 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                            <!--    'column_alias': 'ds__extract_month'}             -->
+                            <!-- col23 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                            <!--    'column_alias': 'ds__extract_week'}              -->
+                            <!-- col24 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                            <!--    'column_alias': 'ds__extract_day'}               -->
+                            <!-- col25 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!-- col26 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                            <!-- col21 =                                               -->
+                            <!-- col28 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}            -->
-                            <!-- col22 =                                               -->
+                            <!-- col29 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}           -->
-                            <!-- col23 =                                               -->
+                            <!-- col30 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                            <!-- col24 =                                               -->
+                            <!-- col31 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}            -->
-                            <!-- col25 =                                                     -->
+                            <!-- col32 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                            <!-- col33 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                            <!-- col34 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                            <!-- col35 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                            <!-- col36 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                            <!-- col37 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col38 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                             <!--    'column_alias': 'paid_at__day'}                          -->
-                            <!-- col26 =                                               -->
+                            <!-- col40 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                             <!--    'column_alias': 'paid_at__week'}                   -->
-                            <!-- col27 =                                               -->
+                            <!-- col41 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                             <!--    'column_alias': 'paid_at__month'}                  -->
-                            <!-- col28 =                                               -->
+                            <!-- col42 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                -->
-                            <!-- col29 =                                               -->
+                            <!-- col43 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                             <!--    'column_alias': 'paid_at__year'}                   -->
-                            <!-- col30 =                                                     -->
+                            <!-- col44 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}         -->
+                            <!-- col45 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                            <!-- col46 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}        -->
+                            <!-- col47 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}         -->
+                            <!-- col48 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}          -->
+                            <!-- col49 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!-- col50 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                             <!--    'column_alias': 'booking__is_instant'}                   -->
-                            <!-- col31 =                                                     -->
+                            <!-- col52 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                             <!--    'column_alias': 'booking__ds__day'}                      -->
-                            <!-- col32 =                                               -->
+                            <!-- col53 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                             <!--    'column_alias': 'booking__ds__week'}               -->
-                            <!-- col33 =                                               -->
+                            <!-- col54 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                             <!--    'column_alias': 'booking__ds__month'}              -->
-                            <!-- col34 =                                               -->
+                            <!-- col55 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}            -->
-                            <!-- col35 =                                               -->
+                            <!-- col56 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                             <!--    'column_alias': 'booking__ds__year'}               -->
-                            <!-- col36 =                                                     -->
+                            <!-- col57 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                            <!-- col58 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                            <!-- col59 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                            <!-- col60 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                            <!-- col61 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                            <!-- col62 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                            <!-- col63 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                            <!-- col37 =                                               -->
+                            <!-- col65 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                            <!-- col38 =                                               -->
+                            <!-- col66 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                            <!-- col39 =                                                 -->
+                            <!-- col67 =                                                 -->
                             <!--   {'class': 'SqlSelectColumn',                          -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                            <!-- col40 =                                               -->
+                            <!-- col68 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                            <!-- col41 =                                                     -->
+                            <!-- col69 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col70 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col71 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col72 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col73 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col74 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col75 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                            <!-- col42 =                                               -->
+                            <!-- col77 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}          -->
-                            <!-- col43 =                                               -->
+                            <!-- col78 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}         -->
-                            <!-- col44 =                                               -->
+                            <!-- col79 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                            <!-- col45 =                                               -->
+                            <!-- col80 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}          -->
-                            <!-- col46 =                                                     -->
+                            <!-- col81 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                            <!-- col82 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                            <!-- col83 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                            <!-- col84 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                            <!-- col85 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                            <!-- col86 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col87 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                             <!--    'column_alias': 'listing'}                               -->
-                            <!-- col47 =                                                     -->
+                            <!-- col89 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                             <!--    'column_alias': 'guest'}                                 -->
-                            <!-- col48 =                                                     -->
+                            <!-- col90 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                             <!--    'column_alias': 'host'}                                  -->
-                            <!-- col49 =                                                     -->
+                            <!-- col91 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                             <!--    'column_alias': 'booking__listing'}                      -->
-                            <!-- col50 =                                                     -->
+                            <!-- col92 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                             <!--    'column_alias': 'booking__guest'}                        -->
-                            <!-- col51 =                                                     -->
+                            <!-- col93 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
@@ -528,11 +864,11 @@
             <!-- node_id = ss_14 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
             <!--    'column_alias': 'booking_payments'}                    -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
             <!-- where = None -->
@@ -541,7 +877,7 @@
                 <!-- node_id = ss_13 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -550,7 +886,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -560,11 +896,11 @@
                     <!-- node_id = ss_12 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                     <!--    'column_alias': 'booking_payments'}                    -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                     <!-- where = None -->
@@ -573,179 +909,347 @@
                         <!-- node_id = ss_11 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
-                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                        <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
-                        <!--    'column_alias': 'ds_partitioned__week'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
-                        <!--    'column_alias': 'ds_partitioned__month'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                        <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
-                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                        <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
-                        <!--    'column_alias': 'ds_partitioned__year'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                        <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
-                        <!--    'column_alias': 'paid_at__day'}                        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
-                        <!--    'column_alias': 'paid_at__week'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
-                        <!--    'column_alias': 'paid_at__month'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                        <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
-                        <!--    'column_alias': 'paid_at__quarter'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                        <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
-                        <!--    'column_alias': 'paid_at__year'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                        <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
-                        <!--    'column_alias': 'booking__ds__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                        <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
-                        <!--    'column_alias': 'booking__ds__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                        <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
-                        <!--    'column_alias': 'booking__ds__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
-                        <!--    'column_alias': 'booking__ds__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
-                        <!--    'column_alias': 'booking__ds__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                        <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                        <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                        <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
-                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                        <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
-                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                        <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
-                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
-                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
-                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
-                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
-                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),  -->
-                        <!--    'column_alias': 'listing'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),  -->
-                        <!--    'column_alias': 'guest'}                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                        <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
-                        <!--    'column_alias': 'host'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                        <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                        <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                        <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                        <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
-                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
-                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}          -->
+                        <!-- col44 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}           -->
+                        <!-- col45 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}            -->
+                        <!-- col46 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                        <!-- col47 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                        <!-- col48 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                        <!-- col49 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                        <!-- col50 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                        <!-- col51 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                        <!-- col52 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!-- col53 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col54 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),        -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col55 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),      -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col56 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col57 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col58 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                        <!-- col59 =                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col60 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}               -->
+                        <!-- col61 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}              -->
+                        <!-- col62 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}             -->
+                        <!-- col63 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                        <!-- col64 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}              -->
+                        <!-- col65 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                        <!-- col66 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                        <!-- col67 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                        <!-- col68 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                        <!-- col69 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                        <!-- col70 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!-- col71 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col72 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                        <!--    'column_alias': 'metric_time__day'}                    -->
+                        <!-- col73 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                        <!--    'column_alias': 'metric_time__week'}                   -->
+                        <!-- col74 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                        <!--    'column_alias': 'metric_time__month'}                  -->
+                        <!-- col75 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                        <!--    'column_alias': 'metric_time__quarter'}                -->
+                        <!-- col76 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                        <!--    'column_alias': 'metric_time__year'}                   -->
+                        <!-- col77 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                        <!--    'column_alias': 'listing'}                             -->
+                        <!-- col78 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                        <!--    'column_alias': 'guest'}                               -->
+                        <!-- col79 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                        <!--    'column_alias': 'host'}                                -->
+                        <!-- col80 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!-- col81 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!-- col82 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!-- col83 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!-- col84 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!-- col85 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                         <!--    'column_alias': 'booking_payments'}                    -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
@@ -762,27 +1266,27 @@
                             <!--    'column_alias': 'instant_bookings'}                                                              -->
                             <!-- col2 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
                             <!--    'column_alias': 'booking_value'}                         -->
                             <!-- col3 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
                             <!--    'column_alias': 'max_booking_value'}                     -->
                             <!-- col4 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
                             <!--    'column_alias': 'min_booking_value'}                     -->
                             <!-- col5 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
                             <!--    'column_alias': 'bookers'}                               -->
                             <!-- col6 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
                             <!--    'column_alias': 'average_booking_value'}                 -->
                             <!-- col7 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
                             <!--    'column_alias': 'booking_payments'}                      -->
                             <!-- col8 =                                                                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                                                                   -->
@@ -790,31 +1294,31 @@
                             <!--    'column_alias': 'referred_bookings'}                                                                          -->
                             <!-- col9 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
                             <!--    'column_alias': 'median_booking_value'}                  -->
                             <!-- col10 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
                             <!--    'column_alias': 'booking_value_p99'}                     -->
                             <!-- col11 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}            -->
                             <!-- col12 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col13 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- col14 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
                             <!--    'column_alias': 'is_instant'}                            -->
                             <!-- col15 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
                             <!--    'column_alias': 'ds__day'}                               -->
                             <!-- col16 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
@@ -832,133 +1336,301 @@
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
                             <!--    'column_alias': 'ds__year'}                        -->
-                            <!-- col20 =                                                     -->
+                            <!-- col20 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                            <!--    'column_alias': 'ds__extract_year'}              -->
+                            <!-- col21 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}           -->
+                            <!-- col22 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                            <!--    'column_alias': 'ds__extract_month'}             -->
+                            <!-- col23 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                            <!--    'column_alias': 'ds__extract_week'}              -->
+                            <!-- col24 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                            <!--    'column_alias': 'ds__extract_day'}               -->
+                            <!-- col25 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!-- col26 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10034),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                   -->
-                            <!-- col21 =                                               -->
+                            <!-- col28 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}            -->
-                            <!-- col22 =                                               -->
+                            <!-- col29 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}           -->
-                            <!-- col23 =                                               -->
+                            <!-- col30 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}         -->
-                            <!-- col24 =                                               -->
+                            <!-- col31 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}            -->
-                            <!-- col25 =                                                     -->
+                            <!-- col32 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                            <!-- col33 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                            <!-- col34 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                            <!-- col35 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                            <!-- col36 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                            <!-- col37 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col38 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10039),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
                             <!--    'column_alias': 'paid_at__day'}                          -->
-                            <!-- col26 =                                               -->
+                            <!-- col40 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
                             <!--    'column_alias': 'paid_at__week'}                   -->
-                            <!-- col27 =                                               -->
+                            <!-- col41 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
                             <!--    'column_alias': 'paid_at__month'}                  -->
-                            <!-- col28 =                                               -->
+                            <!-- col42 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                -->
-                            <!-- col29 =                                               -->
+                            <!-- col43 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
                             <!--    'column_alias': 'paid_at__year'}                   -->
-                            <!-- col30 =                                                     -->
+                            <!-- col44 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}         -->
+                            <!-- col45 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                            <!-- col46 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}        -->
+                            <!-- col47 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}         -->
+                            <!-- col48 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}          -->
+                            <!-- col49 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!-- col50 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10044),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
                             <!--    'column_alias': 'booking__is_instant'}                   -->
-                            <!-- col31 =                                                     -->
+                            <!-- col52 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
                             <!--    'column_alias': 'booking__ds__day'}                      -->
-                            <!-- col32 =                                               -->
+                            <!-- col53 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
                             <!--    'column_alias': 'booking__ds__week'}               -->
-                            <!-- col33 =                                               -->
+                            <!-- col54 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
                             <!--    'column_alias': 'booking__ds__month'}              -->
-                            <!-- col34 =                                               -->
+                            <!-- col55 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}            -->
-                            <!-- col35 =                                               -->
+                            <!-- col56 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
                             <!--    'column_alias': 'booking__ds__year'}               -->
-                            <!-- col36 =                                                     -->
+                            <!-- col57 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                            <!-- col58 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                            <!-- col59 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                            <!-- col60 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                            <!-- col61 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                            <!-- col62 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
+                            <!-- col63 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
+                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10050),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
-                            <!-- col37 =                                               -->
+                            <!-- col65 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
-                            <!-- col38 =                                               -->
+                            <!-- col66 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
-                            <!-- col39 =                                                 -->
+                            <!-- col67 =                                                 -->
                             <!--   {'class': 'SqlSelectColumn',                          -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
-                            <!-- col40 =                                               -->
+                            <!-- col68 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
-                            <!-- col41 =                                                     -->
+                            <!-- col69 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col70 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col71 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col72 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col73 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col74 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
+                            <!-- col75 =                                                           -->
+                            <!--   {'class': 'SqlSelectColumn',                                    -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10055),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}                 -->
-                            <!-- col42 =                                               -->
+                            <!-- col77 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}          -->
-                            <!-- col43 =                                               -->
+                            <!-- col78 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}         -->
-                            <!-- col44 =                                               -->
+                            <!-- col79 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}       -->
-                            <!-- col45 =                                               -->
+                            <!-- col80 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                        -->
                             <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}          -->
-                            <!-- col46 =                                                     -->
+                            <!-- col81 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                            <!-- col82 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                            <!-- col83 =                                                -->
+                            <!--   {'class': 'SqlSelectColumn',                         -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                            <!-- col84 =                                               -->
+                            <!--   {'class': 'SqlSelectColumn',                        -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                            <!-- col85 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                            <!-- col86 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                            <!-- col87 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10060),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
                             <!--    'column_alias': 'listing'}                               -->
-                            <!-- col47 =                                                     -->
+                            <!-- col89 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10061),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
                             <!--    'column_alias': 'guest'}                                 -->
-                            <!-- col48 =                                                     -->
+                            <!-- col90 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10062),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
                             <!--    'column_alias': 'host'}                                  -->
-                            <!-- col49 =                                                     -->
+                            <!-- col91 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10063),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
                             <!--    'column_alias': 'booking__listing'}                      -->
-                            <!-- col50 =                                                     -->
+                            <!-- col92 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10064),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
                             <!--    'column_alias': 'booking__guest'}                        -->
-                            <!-- col51 =                                                     -->
+                            <!-- col93 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10065),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
                             <!--    'column_alias': 'booking__host'}                         -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfp_0.xml
index ff4e3095e1..fea487abac 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfp_0.xml
@@ -34,6 +34,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <!-- include_spec =                                                                  -->
                         <!--   {'class': 'DimensionSpec',                                                    -->
@@ -65,6 +66,7 @@
                                 <!--    'element_name': 'metric_time',            -->
                                 <!--    'entity_links': (),                       -->
                                 <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                <!--    'date_part': None,                        -->
                                 <!--    'aggregation_state': None}                -->
                                 <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                                 <MetricTimeDimensionTransformNode>
@@ -132,6 +134,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <!-- include_spec =                                                                  -->
                         <!--   {'class': 'DimensionSpec',                                                    -->
@@ -163,6 +166,7 @@
                                 <!--    'element_name': 'metric_time',            -->
                                 <!--    'entity_links': (),                       -->
                                 <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                <!--    'date_part': None,                        -->
                                 <!--    'aggregation_state': None}                -->
                                 <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                                 <MetricTimeDimensionTransformNode>
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfpo_0.xml
index 567f1b3146..3b32bfb08a 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_1_semantic_model__dfpo_0.xml
@@ -40,6 +40,7 @@
                     <!--    'element_name': 'metric_time',            -->
                     <!--    'entity_links': (),                       -->
                     <!--    'time_granularity': TimeGranularity.DAY,  -->
+                    <!--    'date_part': None,                        -->
                     <!--    'aggregation_state': None}                -->
                     <!-- include_spec =                                                                  -->
                     <!--   {'class': 'DimensionSpec',                                                    -->
@@ -75,6 +76,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <!-- include_spec = LinklessEntitySpec(element_name='listing', entity_links=()) -->
                             <MetricTimeDimensionTransformNode>
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfp_0.xml
index 6e1d6b4714..e77cb19195 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfp_0.xml
@@ -34,6 +34,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
@@ -77,6 +78,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfpo_0.xml
index 34e73d06a2..d3ee23ea35 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_metrics_from_2_semantic_models__dfpo_0.xml
@@ -34,6 +34,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
@@ -77,6 +78,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfp_0.xml
index 1f42c277f8..01ba8a68c5 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfp_0.xml
@@ -48,6 +48,7 @@
                                 <!--    'element_name': 'metric_time',            -->
                                 <!--    'entity_links': (),                       -->
                                 <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                <!--    'date_part': None,                        -->
                                 <!--    'aggregation_state': None}                -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
@@ -91,6 +92,7 @@
                                 <!--    'element_name': 'metric_time',            -->
                                 <!--    'entity_links': (),                       -->
                                 <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                <!--    'date_part': None,                        -->
                                 <!--    'aggregation_state': None}                -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
@@ -150,6 +152,7 @@
                                 <!--    'element_name': 'metric_time',            -->
                                 <!--    'entity_links': (),                       -->
                                 <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                <!--    'date_part': None,                        -->
                                 <!--    'aggregation_state': None}                -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
@@ -193,6 +196,7 @@
                                 <!--    'element_name': 'metric_time',            -->
                                 <!--    'entity_links': (),                       -->
                                 <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                <!--    'date_part': None,                        -->
                                 <!--    'aggregation_state': None}                -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfpo_0.xml
index d8a77edaeb..defb580aff 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_2_ratio_metrics_from_1_semantic_model__dfpo_0.xml
@@ -75,6 +75,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfp_0.xml
index 9475198ca2..59589a8c8a 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfp_0.xml
@@ -34,6 +34,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
@@ -77,6 +78,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
@@ -120,6 +122,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfpo_0.xml
index 0b0f3c1d06..7b4e7ec6e8 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_3_metrics_from_2_semantic_models__dfpo_0.xml
@@ -45,6 +45,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
@@ -88,6 +89,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfp_0.xml
index 8b2fc3bdcb..9003e62d30 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfp_0.xml
@@ -34,6 +34,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
@@ -87,6 +88,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <WhereConstraintNode>
                             <!-- description = Constrain Output with WHERE -->
@@ -120,6 +122,7 @@
                                 <!--    'element_name': 'metric_time',            -->
                                 <!--    'entity_links': (),                       -->
                                 <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                <!--    'date_part': None,                        -->
                                 <!--    'aggregation_state': None}                -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml
index 5985e50ac7..eeaa437cc5 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_constrained_metric_not_combined__dfpo_0.xml
@@ -34,6 +34,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
@@ -87,6 +88,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <WhereConstraintNode>
                             <!-- description = Constrain Output with WHERE -->
@@ -120,6 +122,7 @@
                                 <!--    'element_name': 'metric_time',            -->
                                 <!--    'entity_links': (),                       -->
                                 <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                <!--    'date_part': None,                        -->
                                 <!--    'aggregation_state': None}                -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfp_0.xml
index 8f72acf134..8d663c8802 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfp_0.xml
@@ -43,6 +43,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = Metric Time Dimension 'ds' -->
@@ -86,6 +87,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfpo_0.xml
index 0892b0a651..97636fa2d4 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric__dfpo_0.xml
@@ -50,6 +50,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfp_0.xml
index fe405e35b4..2a8cc7308e 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfp_0.xml
@@ -34,6 +34,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
@@ -91,6 +92,7 @@
                                 <!--    'element_name': 'metric_time',            -->
                                 <!--    'entity_links': (),                       -->
                                 <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                <!--    'date_part': None,                        -->
                                 <!--    'aggregation_state': None}                -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
@@ -134,6 +136,7 @@
                                 <!--    'element_name': 'metric_time',            -->
                                 <!--    'entity_links': (),                       -->
                                 <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                <!--    'date_part': None,                        -->
                                 <!--    'aggregation_state': None}                -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfpo_0.xml
index 4236d7a342..8286ae3ddb 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_derived_metric_with_non_derived_metric__dfpo_0.xml
@@ -34,6 +34,7 @@
                         <!--    'element_name': 'metric_time',            -->
                         <!--    'entity_links': (),                       -->
                         <!--    'time_granularity': TimeGranularity.DAY,  -->
+                        <!--    'date_part': None,                        -->
                         <!--    'aggregation_state': None}                -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = Metric Time Dimension 'ds' -->
@@ -98,6 +99,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfp_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfp_0.xml
index 94e4d36375..a7b7790b04 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfp_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfp_0.xml
@@ -57,6 +57,7 @@
                                     <!--    'element_name': 'metric_time',            -->
                                     <!--    'entity_links': (),                       -->
                                     <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': None,                        -->
                                     <!--    'aggregation_state': None}                -->
                                     <MetricTimeDimensionTransformNode>
                                         <!-- description = Metric Time Dimension 'ds' -->
@@ -100,6 +101,7 @@
                                     <!--    'element_name': 'metric_time',            -->
                                     <!--    'entity_links': (),                       -->
                                     <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': None,                        -->
                                     <!--    'aggregation_state': None}                -->
                                     <MetricTimeDimensionTransformNode>
                                         <!-- description = Metric Time Dimension 'ds' -->
@@ -145,6 +147,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = Metric Time Dimension 'ds' -->
@@ -188,6 +191,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfpo_0.xml b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfpo_0.xml
index 294f42931e..74c85eef7a 100644
--- a/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfpo_0.xml
+++ b/metricflow/test/snapshots/test_source_scan_optimizer.py/DataflowPlan/test_nested_derived_metric__dfpo_0.xml
@@ -64,6 +64,7 @@
                                 <!--    'element_name': 'metric_time',            -->
                                 <!--    'entity_links': (),                       -->
                                 <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                <!--    'date_part': None,                        -->
                                 <!--    'aggregation_state': None}                -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = Metric Time Dimension 'ds' -->
@@ -119,6 +120,7 @@
                             <!--    'element_name': 'metric_time',            -->
                             <!--    'entity_links': (),                       -->
                             <!--    'time_granularity': TimeGranularity.DAY,  -->
+                            <!--    'date_part': None,                        -->
                             <!--    'aggregation_state': None}                -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = Metric Time Dimension 'ds' -->
diff --git a/metricflow/time/date_part.py b/metricflow/time/date_part.py
new file mode 100644
index 0000000000..b6ccea9172
--- /dev/null
+++ b/metricflow/time/date_part.py
@@ -0,0 +1,40 @@
+from __future__ import annotations
+
+from enum import Enum
+
+from dbt_semantic_interfaces.enum_extension import assert_values_exhausted
+from dbt_semantic_interfaces.type_enums.time_granularity import TimeGranularity
+
+
+class DatePart(Enum):
+    """Date parts able to be extracted from a time dimension.
+
+    TODO: add support for hour, minute, second once those granularities are available
+    """
+
+    YEAR = "year"
+    QUARTER = "quarter"
+    MONTH = "month"
+    WEEK = "week"
+    DAY = "day"
+    DAYOFWEEK = "dayofweek"
+    DAYOFYEAR = "dayofyear"
+
+    def to_int(self) -> int:
+        """Convert to an int so that the size of the granularity can be easily compared."""
+        if self is DatePart.DAY:
+            return TimeGranularity.DAY.to_int()
+        elif self is DatePart.DAYOFWEEK:
+            return TimeGranularity.DAY.to_int()
+        elif self is DatePart.DAYOFYEAR:
+            return TimeGranularity.DAY.to_int()
+        elif self is DatePart.WEEK:
+            return TimeGranularity.WEEK.to_int()
+        elif self is DatePart.MONTH:
+            return TimeGranularity.MONTH.to_int()
+        elif self is DatePart.QUARTER:
+            return TimeGranularity.QUARTER.to_int()
+        elif self is DatePart.YEAR:
+            return TimeGranularity.YEAR.to_int()
+        else:
+            assert_values_exhausted(self)
diff --git a/metricflow/time/time_granularity.py b/metricflow/time/time_granularity.py
index a08beb2431..c96909d375 100644
--- a/metricflow/time/time_granularity.py
+++ b/metricflow/time/time_granularity.py
@@ -36,7 +36,7 @@ def is_period_start(time_granularity: TimeGranularity, date: Union[pd.Timestamp,
     if time_granularity is TimeGranularity.DAY:
         return True
     elif time_granularity is TimeGranularity.WEEK:
-        return ISOWeekDay.from_pandas_timestamp(pd_date).is_week_start
+        return ISODAYOFWEEK.from_pandas_timestamp(pd_date).is_week_start
     elif time_granularity is TimeGranularity.MONTH:
         return pd_date.is_month_start
     elif time_granularity is TimeGranularity.QUARTER:
@@ -53,7 +53,7 @@ def is_period_end(time_granularity: TimeGranularity, date: Union[pd.Timestamp, d
     if time_granularity is TimeGranularity.DAY:
         return True
     elif time_granularity is TimeGranularity.WEEK:
-        return ISOWeekDay.from_pandas_timestamp(pd_date).is_week_end
+        return ISODAYOFWEEK.from_pandas_timestamp(pd_date).is_week_end
     elif time_granularity is TimeGranularity.MONTH:
         return pd_date.is_month_end
     elif time_granularity is TimeGranularity.QUARTER:
@@ -70,7 +70,7 @@ def period_begin_offset(  # noqa: D
     if time_granularity is TimeGranularity.DAY:
         raise ValueError(f"Can't get period start offset for TimeGranularity.{time_granularity.name}.")
     elif time_granularity is TimeGranularity.WEEK:
-        return pd.offsets.Week(weekday=ISOWeekDay.MONDAY.pandas_value)
+        return pd.offsets.Week(dayofweek=ISODAYOFWEEK.MONDAY.pandas_value)
     elif time_granularity is TimeGranularity.MONTH:
         return pd.offsets.MonthBegin()
     elif time_granularity is TimeGranularity.QUARTER:
@@ -87,7 +87,7 @@ def period_end_offset(  # noqa: D
     if time_granularity is TimeGranularity.DAY:
         raise ValueError(f"Can't get period end offset for TimeGranularity.{time_granularity.name}.")
     elif time_granularity == TimeGranularity.WEEK:
-        return pd.offsets.Week(weekday=ISOWeekDay.SUNDAY.pandas_value)
+        return pd.offsets.Week(dayofweek=ISODAYOFWEEK.SUNDAY.pandas_value)
     elif time_granularity is TimeGranularity.MONTH:
         return pd.offsets.MonthEnd()
     elif time_granularity is TimeGranularity.QUARTER:
@@ -132,7 +132,7 @@ def match_start_or_end_of_period(
         )
 
 
-class ISOWeekDay(ExtendedEnum):
+class ISODAYOFWEEK(ExtendedEnum):
     """Day of week values per ISO standard."""
 
     MONDAY = 1
@@ -144,23 +144,23 @@ class ISOWeekDay(ExtendedEnum):
     SUNDAY = 7
 
     @staticmethod
-    def from_pandas_timestamp(timestamp: pd.Timestamp) -> ISOWeekDay:
-        """Factory for streamlining conversion from a Pandas Timestamp to an ISOWeekDay."""
-        return ISOWeekDay(timestamp.isoweekday())
+    def from_pandas_timestamp(timestamp: pd.Timestamp) -> ISODAYOFWEEK:
+        """Factory for streamlining conversion from a Pandas Timestamp to an ISODAYOFWEEK."""
+        return ISODAYOFWEEK(timestamp.isodayofweek())
 
     @property
     def is_week_start(self) -> bool:
         """Return comparison of instance value against ISO standard start of week (Monday)."""
-        return self is ISOWeekDay.MONDAY
+        return self is ISODAYOFWEEK.MONDAY
 
     @property
     def is_week_end(self) -> bool:
         """Return comparison of instance value against ISO standard end of week (Sunday)."""
-        return self is ISOWeekDay.SUNDAY
+        return self is ISODAYOFWEEK.SUNDAY
 
     @property
     def pandas_value(self) -> int:
-        """Returns the pandas int value representation of the ISOWeekDay."""
+        """Returns the pandas int value representation of the ISODAYOFWEEK."""
         return self.value - 1
 
 

From bf5f61ccc207d87f16390c5b1320a27182632fc8 Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Mon, 11 Sep 2023 13:43:49 -0700
Subject: [PATCH 02/15] Accept date_part in query params

---
 metricflow/dataset/dataset.py                 |    8 +-
 metricflow/naming/linkable_spec_name.py       |    8 +-
 metricflow/plan_conversion/dataflow_to_sql.py |    4 +-
 .../plan_conversion/instance_converters.py    |   10 +-
 metricflow/query/query_parser.py              |    3 +-
 metricflow/specs/query_interface.py           |   12 +
 metricflow/specs/where_filter_dimension.py    |    4 +
 metricflow/specs/where_filter_entity.py       |    6 +-
 .../specs/where_filter_time_dimension.py      |   12 +-
 .../integration/test_cases/itest_metrics.yaml |   14 +
 metricflow/test/query/test_query_parser.py    |    1 +
 .../test_common_semantic_model__plan0.sql     |   14 +
 ...o_from_multiple_semantic_models__plan0.sql |   28 +
 .../test_cumulative_metric__plan0.sql         |    7 +
 ...cumulative_metric_grain_to_date__plan0.sql |    7 +
 .../test_cumulative_metric_no_ds__plan0.sql   |    7 +
 ...est_cumulative_metric_no_window__plan0.sql |    7 +
 ..._no_window_with_time_constraint__plan0.sql |   14 +
 ...ive_metric_with_time_constraint__plan0.sql |   14 +
 .../BigQuery/test_derived_metric__plan0.sql   |   14 +
 ...ved_metric_with_offset_to_grain__plan0.sql |   14 +
 ...offset_to_grain_and_granularity__plan0.sql |   14 +
 ...rived_metric_with_offset_window__plan0.sql |   14 +
 ...h_offset_window_and_granularity__plan0.sql |   14 +
 ...fset_window_and_offset_to_grain__plan0.sql |   14 +
 ...offset_to_grain_and_granularity__plan0.sql |   14 +
 ...erived_offset_cumulative_metric__plan0.sql |   14 +
 ...et_metric_with_one_input_metric__plan0.sql |    7 +
 .../BigQuery/test_distinct_values__plan0.sql  |   14 +
 ...th_where_constraint_on_join_dim__plan0.sql |   14 +
 .../test_join_to_scd_dimension__plan0.sql     |   21 +-
 ...join_to_scd_dimension__plan0_optimized.sql |    6 +-
 ...spine_node_with_offset_to_grain__plan0.sql |    7 +
 ...e_spine_node_with_offset_window__plan0.sql |    7 +
 ..._time_spine_node_without_offset__plan0.sql |    7 +
 .../BigQuery/test_limit_rows__plan0.sql       |    7 +
 ...al_dimension_using_local_entity__plan0.sql |    7 +
 .../test_measure_constraint__plan0.sql        |   35 +
 ..._constraint_with_reused_measure__plan0.sql |   14 +
 ...aint_with_single_expr_and_alias__plan0.sql |    7 +
 ..._multiple_sources_no_dimensions__plan0.sql |   14 +
 ...multi_hop_through_scd_dimension__plan0.sql |   21 +-
 ...through_scd_dimension__plan0_optimized.sql |   10 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |   13 +-
 ..._hop_to_scd_dimension__plan0_optimized.sql |    4 +-
 .../BigQuery/test_multihop_node__plan0.sql    |    7 +
 ..._multiple_metrics_no_dimensions__plan0.sql |   28 +
 .../test_nested_derived_metric__plan0.sql     |   28 +
 .../BigQuery/test_partitioned_join__plan0.sql |    7 +
 .../test_common_semantic_model__plan0.sql     |   14 +
 ...o_from_multiple_semantic_models__plan0.sql |   28 +
 .../test_cumulative_metric__plan0.sql         |    7 +
 ...cumulative_metric_grain_to_date__plan0.sql |    7 +
 .../test_cumulative_metric_no_ds__plan0.sql   |    7 +
 ...est_cumulative_metric_no_window__plan0.sql |    7 +
 ..._no_window_with_time_constraint__plan0.sql |   14 +
 ...ive_metric_with_time_constraint__plan0.sql |   14 +
 .../Databricks/test_derived_metric__plan0.sql |   14 +
 ...ved_metric_with_offset_to_grain__plan0.sql |   14 +
 ...offset_to_grain_and_granularity__plan0.sql |   14 +
 ...rived_metric_with_offset_window__plan0.sql |   14 +
 ...h_offset_window_and_granularity__plan0.sql |   14 +
 ...fset_window_and_offset_to_grain__plan0.sql |   14 +
 ...offset_to_grain_and_granularity__plan0.sql |   14 +
 ...erived_offset_cumulative_metric__plan0.sql |   14 +
 ...et_metric_with_one_input_metric__plan0.sql |    7 +
 .../test_distinct_values__plan0.sql           |   14 +
 ...th_where_constraint_on_join_dim__plan0.sql |   14 +
 .../test_join_to_scd_dimension__plan0.sql     |   21 +-
 ...join_to_scd_dimension__plan0_optimized.sql |    6 +-
 ...spine_node_with_offset_to_grain__plan0.sql |    7 +
 ...e_spine_node_with_offset_window__plan0.sql |    7 +
 ..._time_spine_node_without_offset__plan0.sql |    7 +
 .../Databricks/test_limit_rows__plan0.sql     |    7 +
 ...al_dimension_using_local_entity__plan0.sql |    7 +
 .../test_measure_constraint__plan0.sql        |   35 +
 ..._constraint_with_reused_measure__plan0.sql |   14 +
 ...aint_with_single_expr_and_alias__plan0.sql |    7 +
 ..._multiple_sources_no_dimensions__plan0.sql |   14 +
 ...multi_hop_through_scd_dimension__plan0.sql |   21 +-
 ...through_scd_dimension__plan0_optimized.sql |   10 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |   13 +-
 ..._hop_to_scd_dimension__plan0_optimized.sql |    4 +-
 .../Databricks/test_multihop_node__plan0.sql  |    7 +
 ..._multiple_metrics_no_dimensions__plan0.sql |   28 +
 .../test_nested_derived_metric__plan0.sql     |   28 +
 .../test_partitioned_join__plan0.sql          |    7 +
 .../test_common_semantic_model__plan0.sql     |   14 +
 ...o_from_multiple_semantic_models__plan0.sql |   28 +
 .../DuckDB/test_cumulative_metric__plan0.sql  |    7 +
 ...cumulative_metric_grain_to_date__plan0.sql |    7 +
 .../test_cumulative_metric_no_ds__plan0.sql   |    7 +
 ...est_cumulative_metric_no_window__plan0.sql |    7 +
 ..._no_window_with_time_constraint__plan0.sql |   14 +
 ...ive_metric_with_time_constraint__plan0.sql |   14 +
 .../DuckDB/test_derived_metric__plan0.sql     |   14 +
 ...ved_metric_with_offset_to_grain__plan0.sql |   14 +
 ...offset_to_grain_and_granularity__plan0.sql |   14 +
 ...rived_metric_with_offset_window__plan0.sql |   14 +
 ...h_offset_window_and_granularity__plan0.sql |   14 +
 ...fset_window_and_offset_to_grain__plan0.sql |   14 +
 ...offset_to_grain_and_granularity__plan0.sql |   14 +
 ...erived_offset_cumulative_metric__plan0.sql |   14 +
 ...et_metric_with_one_input_metric__plan0.sql |    7 +
 .../DuckDB/test_distinct_values__plan0.sql    |   14 +
 ...th_where_constraint_on_join_dim__plan0.sql |   14 +
 .../test_join_to_scd_dimension__plan0.sql     |   21 +-
 ...join_to_scd_dimension__plan0_optimized.sql |    6 +-
 ...spine_node_with_offset_to_grain__plan0.sql |    7 +
 ...e_spine_node_with_offset_window__plan0.sql |    7 +
 ..._time_spine_node_without_offset__plan0.sql |    7 +
 .../DuckDB/test_limit_rows__plan0.sql         |    7 +
 ...al_dimension_using_local_entity__plan0.sql |    7 +
 .../DuckDB/test_measure_constraint__plan0.sql |   35 +
 ..._constraint_with_reused_measure__plan0.sql |   14 +
 ...aint_with_single_expr_and_alias__plan0.sql |    7 +
 ..._multiple_sources_no_dimensions__plan0.sql |   14 +
 ...multi_hop_through_scd_dimension__plan0.sql |   21 +-
 ...through_scd_dimension__plan0_optimized.sql |   10 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |   15 +-
 ..._hop_to_scd_dimension__plan0_optimized.sql |    6 +-
 .../DuckDB/test_multihop_node__plan0.sql      |    7 +
 ..._multiple_metrics_no_dimensions__plan0.sql |   28 +
 .../test_nested_derived_metric__plan0.sql     |   28 +
 .../DuckDB/test_partitioned_join__plan0.sql   |    7 +
 .../test_common_semantic_model__plan0.sql     |   14 +
 ...o_from_multiple_semantic_models__plan0.sql |   28 +
 .../test_cumulative_metric__plan0.sql         |    7 +
 ...cumulative_metric_grain_to_date__plan0.sql |    7 +
 .../test_cumulative_metric_no_ds__plan0.sql   |    7 +
 ...est_cumulative_metric_no_window__plan0.sql |    7 +
 ..._no_window_with_time_constraint__plan0.sql |   14 +
 ...ive_metric_with_time_constraint__plan0.sql |   14 +
 .../Postgres/test_derived_metric__plan0.sql   |   14 +
 ...ved_metric_with_offset_to_grain__plan0.sql |   14 +
 ...offset_to_grain_and_granularity__plan0.sql |   14 +
 ...rived_metric_with_offset_window__plan0.sql |   14 +
 ...h_offset_window_and_granularity__plan0.sql |   14 +
 ...fset_window_and_offset_to_grain__plan0.sql |   14 +
 ...offset_to_grain_and_granularity__plan0.sql |   14 +
 ...erived_offset_cumulative_metric__plan0.sql |   14 +
 ...et_metric_with_one_input_metric__plan0.sql |    7 +
 .../Postgres/test_distinct_values__plan0.sql  |   14 +
 ...th_where_constraint_on_join_dim__plan0.sql |   14 +
 .../test_join_to_scd_dimension__plan0.sql     |   21 +-
 ...join_to_scd_dimension__plan0_optimized.sql |    6 +-
 ...spine_node_with_offset_to_grain__plan0.sql |    7 +
 ...e_spine_node_with_offset_window__plan0.sql |    7 +
 ..._time_spine_node_without_offset__plan0.sql |    7 +
 .../Postgres/test_limit_rows__plan0.sql       |    7 +
 ...al_dimension_using_local_entity__plan0.sql |    7 +
 .../test_measure_constraint__plan0.sql        |   35 +
 ..._constraint_with_reused_measure__plan0.sql |   14 +
 ...aint_with_single_expr_and_alias__plan0.sql |    7 +
 ..._multiple_sources_no_dimensions__plan0.sql |   14 +
 ...multi_hop_through_scd_dimension__plan0.sql |   13 +-
 ...through_scd_dimension__plan0_optimized.sql |    4 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |    7 +
 .../Postgres/test_multihop_node__plan0.sql    |    7 +
 ..._multiple_metrics_no_dimensions__plan0.sql |   28 +
 .../test_nested_derived_metric__plan0.sql     |   28 +
 .../Postgres/test_partitioned_join__plan0.sql |    7 +
 .../test_common_semantic_model__plan0.sql     |   14 +
 ...o_from_multiple_semantic_models__plan0.sql |   28 +
 .../test_cumulative_metric__plan0.sql         |    7 +
 ...cumulative_metric_grain_to_date__plan0.sql |    7 +
 .../test_cumulative_metric_no_ds__plan0.sql   |    7 +
 ...est_cumulative_metric_no_window__plan0.sql |    7 +
 ..._no_window_with_time_constraint__plan0.sql |   14 +
 ...ive_metric_with_time_constraint__plan0.sql |   14 +
 .../Redshift/test_derived_metric__plan0.sql   |   14 +
 ...ved_metric_with_offset_to_grain__plan0.sql |   14 +
 ...offset_to_grain_and_granularity__plan0.sql |   14 +
 ...rived_metric_with_offset_window__plan0.sql |   14 +
 ...h_offset_window_and_granularity__plan0.sql |   14 +
 ...fset_window_and_offset_to_grain__plan0.sql |   14 +
 ...offset_to_grain_and_granularity__plan0.sql |   14 +
 ...erived_offset_cumulative_metric__plan0.sql |   14 +
 ...et_metric_with_one_input_metric__plan0.sql |    7 +
 .../Redshift/test_distinct_values__plan0.sql  |   14 +
 ...th_where_constraint_on_join_dim__plan0.sql |   14 +
 .../test_join_to_scd_dimension__plan0.sql     |   21 +-
 ...join_to_scd_dimension__plan0_optimized.sql |    6 +-
 ...spine_node_with_offset_to_grain__plan0.sql |    7 +
 ...e_spine_node_with_offset_window__plan0.sql |    7 +
 ..._time_spine_node_without_offset__plan0.sql |    7 +
 .../Redshift/test_limit_rows__plan0.sql       |    7 +
 ...al_dimension_using_local_entity__plan0.sql |    7 +
 .../test_measure_constraint__plan0.sql        |   35 +
 ..._constraint_with_reused_measure__plan0.sql |   14 +
 ...aint_with_single_expr_and_alias__plan0.sql |    7 +
 ..._multiple_sources_no_dimensions__plan0.sql |   14 +
 ...multi_hop_through_scd_dimension__plan0.sql |   21 +-
 ...through_scd_dimension__plan0_optimized.sql |   10 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |   21 +-
 ..._hop_to_scd_dimension__plan0_optimized.sql |   10 +-
 .../Redshift/test_multihop_node__plan0.sql    |    7 +
 ..._multiple_metrics_no_dimensions__plan0.sql |   28 +
 .../test_nested_derived_metric__plan0.sql     |   28 +
 .../Redshift/test_partitioned_join__plan0.sql |    7 +
 .../test_common_semantic_model__plan0.sql     |   14 +
 ...o_from_multiple_semantic_models__plan0.sql |   28 +
 .../test_cumulative_metric__plan0.sql         |    7 +
 ...cumulative_metric_grain_to_date__plan0.sql |    7 +
 .../test_cumulative_metric_no_ds__plan0.sql   |    7 +
 ...est_cumulative_metric_no_window__plan0.sql |    7 +
 ..._no_window_with_time_constraint__plan0.sql |   14 +
 ...ive_metric_with_time_constraint__plan0.sql |   14 +
 .../Snowflake/test_derived_metric__plan0.sql  |   14 +
 ...ved_metric_with_offset_to_grain__plan0.sql |   14 +
 ...offset_to_grain_and_granularity__plan0.sql |   14 +
 ...rived_metric_with_offset_window__plan0.sql |   14 +
 ...h_offset_window_and_granularity__plan0.sql |   14 +
 ...fset_window_and_offset_to_grain__plan0.sql |   14 +
 ...offset_to_grain_and_granularity__plan0.sql |   14 +
 ...erived_offset_cumulative_metric__plan0.sql |   14 +
 ...et_metric_with_one_input_metric__plan0.sql |    7 +
 .../Snowflake/test_distinct_values__plan0.sql |   14 +
 ...th_where_constraint_on_join_dim__plan0.sql |   14 +
 .../test_join_to_scd_dimension__plan0.sql     |   15 +-
 ...join_to_scd_dimension__plan0_optimized.sql |    4 +-
 ...spine_node_with_offset_to_grain__plan0.sql |    7 +
 ...e_spine_node_with_offset_window__plan0.sql |    7 +
 ..._time_spine_node_without_offset__plan0.sql |    7 +
 .../Snowflake/test_limit_rows__plan0.sql      |    7 +
 ...al_dimension_using_local_entity__plan0.sql |    7 +
 .../test_measure_constraint__plan0.sql        |   35 +
 ..._constraint_with_reused_measure__plan0.sql |   14 +
 ...aint_with_single_expr_and_alias__plan0.sql |    7 +
 ..._multiple_sources_no_dimensions__plan0.sql |   14 +
 ...multi_hop_through_scd_dimension__plan0.sql |   15 +-
 ...through_scd_dimension__plan0_optimized.sql |    6 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |   21 +-
 ..._hop_to_scd_dimension__plan0_optimized.sql |   10 +-
 .../Snowflake/test_multihop_node__plan0.sql   |    7 +
 ..._multiple_metrics_no_dimensions__plan0.sql |   28 +
 .../test_nested_derived_metric__plan0.sql     |   28 +
 .../test_partitioned_join__plan0.sql          |    7 +
 .../test_common_semantic_model__plan0.xml     |  552 +++----
 ...o_from_multiple_semantic_models__plan0.xml |  860 ++++++-----
 .../test_cumulative_metric__plan0.xml         |  108 +-
 ...cumulative_metric_grain_to_date__plan0.xml |  108 +-
 .../test_cumulative_metric_no_ds__plan0.xml   |  100 +-
 ...est_cumulative_metric_no_window__plan0.xml |  108 +-
 ..._no_window_with_time_constraint__plan0.xml |  204 ++-
 ...ive_metric_with_time_constraint__plan0.xml |  204 ++-
 .../test_derived_metric__plan0.xml            |  558 +++----
 ...ved_metric_with_offset_to_grain__plan0.xml |  748 +++++-----
 ...offset_to_grain_and_granularity__plan0.xml |  746 +++++-----
 ...rived_metric_with_offset_window__plan0.xml |  748 +++++-----
 ...h_offset_window_and_granularity__plan0.xml |  746 +++++-----
 ...fset_window_and_offset_to_grain__plan0.xml |  938 ++++++------
 ...offset_to_grain_and_granularity__plan0.xml |  934 ++++++------
 ...erived_offset_cumulative_metric__plan0.xml |  734 ++++-----
 ...et_metric_with_one_input_metric__plan0.xml |  468 +++---
 .../test_distinct_values__plan0.xml           |  476 +++---
 ...th_where_constraint_on_join_dim__plan0.xml |  486 +++---
 .../test_join_to_scd_dimension__plan0.xml     |  298 ++--
 ...spine_node_with_offset_to_grain__plan0.xml |  106 +-
 ...e_spine_node_with_offset_window__plan0.xml |  106 +-
 ..._time_spine_node_without_offset__plan0.xml |  106 +-
 .../SqlQueryPlan/test_limit_rows__plan0.xml   |  280 ++--
 ...al_dimension_using_local_entity__plan0.xml |  192 +--
 .../test_measure_constraint__plan0.xml        | 1268 +++++++++-------
 ..._constraint_with_reused_measure__plan0.xml |  570 +++----
 ...aint_with_single_expr_and_alias__plan0.xml |  290 ++--
 ..._multiple_sources_no_dimensions__plan0.xml |  456 +++---
 ...multi_hop_through_scd_dimension__plan0.xml |  488 +++---
 ...test_multi_hop_to_scd_dimension__plan0.xml |  468 +++---
 .../test_multihop_node__plan0.xml             |  326 ++--
 ..._multiple_metrics_no_dimensions__plan0.xml | 1310 +++++++++--------
 .../test_nested_derived_metric__plan0.xml     | 1118 +++++++-------
 .../test_partitioned_join__plan0.xml          |  190 ++-
 ...orm_node_using_non_primary_time__plan0.sql |    7 +
 ...sing_non_primary_time__plan0_optimized.sql |    7 +
 ...ansform_node_using_primary_time__plan0.sql |    7 +
 ...de_using_primary_time__plan0_optimized.sql |    7 +
 ...uery_with_metric_time_dimension__plan0.sql |   14 +
 ...orm_node_using_non_primary_time__plan0.sql |    7 +
 ...sing_non_primary_time__plan0_optimized.sql |    7 +
 ...ansform_node_using_primary_time__plan0.sql |    7 +
 ...de_using_primary_time__plan0_optimized.sql |    7 +
 ...uery_with_metric_time_dimension__plan0.sql |   14 +
 ...orm_node_using_non_primary_time__plan0.sql |    7 +
 ...sing_non_primary_time__plan0_optimized.sql |    7 +
 ...ansform_node_using_primary_time__plan0.sql |    7 +
 ...de_using_primary_time__plan0_optimized.sql |    7 +
 ...uery_with_metric_time_dimension__plan0.sql |   14 +
 ...orm_node_using_non_primary_time__plan0.sql |    7 +
 ...sing_non_primary_time__plan0_optimized.sql |    7 +
 ...ansform_node_using_primary_time__plan0.sql |    7 +
 ...de_using_primary_time__plan0_optimized.sql |    7 +
 ...uery_with_metric_time_dimension__plan0.sql |   14 +
 ...orm_node_using_non_primary_time__plan0.sql |    7 +
 ...sing_non_primary_time__plan0_optimized.sql |    7 +
 ...ansform_node_using_primary_time__plan0.sql |    7 +
 ...de_using_primary_time__plan0_optimized.sql |    7 +
 ...uery_with_metric_time_dimension__plan0.sql |   14 +
 ...orm_node_using_non_primary_time__plan0.sql |    7 +
 ...sing_non_primary_time__plan0_optimized.sql |    7 +
 ...ansform_node_using_primary_time__plan0.sql |    7 +
 ...de_using_primary_time__plan0_optimized.sql |    7 +
 ...uery_with_metric_time_dimension__plan0.sql |   14 +
 ...orm_node_using_non_primary_time__plan0.xml |   44 +-
 ...ansform_node_using_primary_time__plan0.xml |   68 +-
 ...uery_with_metric_time_dimension__plan0.xml |  504 ++++---
 .../test_joined_node_data_set__result0.txt    |   21 +
 metricflow/time/time_granularity.py           |   22 +-
 308 files changed, 13101 insertions(+), 8250 deletions(-)

diff --git a/metricflow/dataset/dataset.py b/metricflow/dataset/dataset.py
index 38e25616a5..ea88d69b72 100644
--- a/metricflow/dataset/dataset.py
+++ b/metricflow/dataset/dataset.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Sequence
+from typing import Optional, Sequence
 
 from dbt_semantic_interfaces.references import TimeDimensionReference
 from dbt_semantic_interfaces.type_enums.time_granularity import TimeGranularity
@@ -9,6 +9,7 @@
 
 from metricflow.instances import InstanceSet, TimeDimensionInstance
 from metricflow.specs.specs import TimeDimensionSpec
+from metricflow.time.date_part import DatePart
 
 logger = logging.getLogger(__name__)
 
@@ -48,12 +49,15 @@ def metric_time_dimension_name() -> str:
         return DataSet.metric_time_dimension_reference().element_name
 
     @staticmethod
-    def metric_time_dimension_spec(time_granularity: TimeGranularity) -> TimeDimensionSpec:
+    def metric_time_dimension_spec(
+        time_granularity: TimeGranularity, date_part: Optional[DatePart] = None
+    ) -> TimeDimensionSpec:
         """Spec that corresponds to DataSet.metric_time_dimension_reference."""
         return TimeDimensionSpec(
             element_name=DataSet.metric_time_dimension_reference().element_name,
             entity_links=(),
             time_granularity=time_granularity,
+            date_part=date_part,
         )
 
     def __repr__(self) -> str:  # noqa: D
diff --git a/metricflow/naming/linkable_spec_name.py b/metricflow/naming/linkable_spec_name.py
index 1cfe2b9804..01c3863ad0 100644
--- a/metricflow/naming/linkable_spec_name.py
+++ b/metricflow/naming/linkable_spec_name.py
@@ -46,8 +46,14 @@ def from_name(qualified_name: str) -> StructuredLinkableSpecName:
         if associated_date_part:
             #  e.g. "ds__extract_month"
             if len(name_parts) == 2:
+                # Since DAY works with all currently supported DateParts & changing the granularity will not change the
+                # extracted date part, assume day granularity here.
+                time_granularity = TimeGranularity.DAY
                 return StructuredLinkableSpecName(
-                    entity_link_names=(), element_name=name_parts[0], date_part=associated_date_part
+                    entity_link_names=(),
+                    element_name=name_parts[0],
+                    time_granularity=time_granularity,
+                    date_part=associated_date_part,
                 )
             # e.g. "messages__ds__extract_month"
             return StructuredLinkableSpecName(
diff --git a/metricflow/plan_conversion/dataflow_to_sql.py b/metricflow/plan_conversion/dataflow_to_sql.py
index 8f80437a08..6dc0db4c23 100644
--- a/metricflow/plan_conversion/dataflow_to_sql.py
+++ b/metricflow/plan_conversion/dataflow_to_sql.py
@@ -1116,7 +1116,6 @@ def visit_metric_time_dimension_transform_node(
             if (
                 len(time_dimension_instance.spec.entity_links) == 0
                 and time_dimension_instance.spec.reference == node.aggregation_time_dimension_reference
-                and time_dimension_instance.spec.date_part is None
             ):
                 matching_time_dimension_instances.append(time_dimension_instance)
 
@@ -1127,7 +1126,8 @@ def visit_metric_time_dimension_transform_node(
         # For those matching time dimension instances, create the analog metric time dimension instances for the output.
         for matching_time_dimension_instance in matching_time_dimension_instances:
             metric_time_dimension_spec = DataSet.metric_time_dimension_spec(
-                matching_time_dimension_instance.spec.time_granularity
+                time_granularity=matching_time_dimension_instance.spec.time_granularity,
+                date_part=matching_time_dimension_instance.spec.date_part,
             )
             metric_time_dimension_column_association = self._column_association_resolver.resolve_spec(
                 metric_time_dimension_spec
diff --git a/metricflow/plan_conversion/instance_converters.py b/metricflow/plan_conversion/instance_converters.py
index d741d8f711..07bf4922f1 100644
--- a/metricflow/plan_conversion/instance_converters.py
+++ b/metricflow/plan_conversion/instance_converters.py
@@ -47,6 +47,7 @@
     SqlFunctionExpression,
 )
 from metricflow.sql.sql_plan import SqlSelectColumn
+from metricflow.time.date_part import DatePart
 
 logger = logging.getLogger(__name__)
 
@@ -262,6 +263,7 @@ class _DimensionValidityParams:
 
     dimension_name: str
     time_granularity: TimeGranularity
+    date_part: Optional[DatePart] = None
 
 
 class CreateValidityWindowJoinDescription(InstanceSetTransform[Optional[ValidityWindowJoinDescription]]):
@@ -324,12 +326,16 @@ def transform(self, instance_set: InstanceSet) -> Optional[ValidityWindowJoinDes
             start_specs = [
                 spec
                 for spec in specs
-                if spec.element_name == start_dim.dimension_name and spec.time_granularity == start_dim.time_granularity
+                if spec.element_name == start_dim.dimension_name
+                and spec.time_granularity == start_dim.time_granularity
+                and spec.date_part == start_dim.date_part
             ]
             end_specs = [
                 spec
                 for spec in specs
-                if spec.element_name == end_dim.dimension_name and spec.time_granularity == end_dim.time_granularity
+                if spec.element_name == end_dim.dimension_name
+                and spec.time_granularity == end_dim.time_granularity
+                and spec.date_part == end_dim.date_part
             ]
             linkless_start_specs = {spec.without_entity_links for spec in start_specs}
             linkless_end_specs = {spec.without_entity_links for spec in end_specs}
diff --git a/metricflow/query/query_parser.py b/metricflow/query/query_parser.py
index b3e79b4e45..6f437117ac 100644
--- a/metricflow/query/query_parser.py
+++ b/metricflow/query/query_parser.py
@@ -299,7 +299,7 @@ def _get_group_by_names(
         return (
             group_by_names
             if group_by_names
-            else [f"{g.name}__{g.grain}" if g.grain else g.name for g in group_by]
+            else [f"{g.name}__{g.date_part or g.grain}" if (g.date_part or g.grain) else g.name for g in group_by]
             if group_by
             else []
         )
@@ -669,6 +669,7 @@ def _parse_linkable_element_names(
                             element_name=element_name,
                             entity_links=entity_links,
                             time_granularity=structured_name.time_granularity,
+                            date_part=structured_name.date_part,
                         )
                     )
                 else:
diff --git a/metricflow/specs/query_interface.py b/metricflow/specs/query_interface.py
index ee55a52086..1939c7dbe2 100644
--- a/metricflow/specs/query_interface.py
+++ b/metricflow/specs/query_interface.py
@@ -4,6 +4,8 @@
 
 from dbt_semantic_interfaces.type_enums import TimeGranularity
 
+from metricflow.time.date_part import DatePart
+
 
 class QueryInterfaceMetric(Protocol):
     """Metric in the query interface."""
@@ -27,6 +29,11 @@ def grain(self) -> Optional[TimeGranularity]:
         """The time granularity."""
         raise NotImplementedError
 
+    @property
+    def date_part(self) -> Optional[DatePart]:
+        """Date part to extract from the dimension."""
+        raise NotImplementedError
+
 
 class QueryInterfaceDimension(Protocol):
     """Represents the interface for Dimension in the query interface."""
@@ -39,6 +46,10 @@ def alias(self, _alias: str) -> QueryInterfaceDimension:
         """Renaming the column."""
         raise NotImplementedError
 
+    def date_part(self, _date_part: str) -> QueryInterfaceDimension:
+        """Date part to extract from the dimension."""
+        raise NotImplementedError
+
 
 class QueryInterfaceDimensionFactory(Protocol):
     """Creates a Dimension for the query interface.
@@ -67,6 +78,7 @@ def create(
         self,
         time_dimension_name: str,
         time_granularity_name: str,
+        date_part_name: Optional[str] = None,
         entity_path: Sequence[str] = (),
     ) -> QueryInterfaceTimeDimension:
         """Create a TimeDimension."""
diff --git a/metricflow/specs/where_filter_dimension.py b/metricflow/specs/where_filter_dimension.py
index 3f33f87d96..d37fec3f8b 100644
--- a/metricflow/specs/where_filter_dimension.py
+++ b/metricflow/specs/where_filter_dimension.py
@@ -36,6 +36,10 @@ def grain(self, _grain: str) -> QueryInterfaceDimension:
         """The time granularity."""
         raise NotImplementedError
 
+    def date_part(self, _date_part: str) -> QueryInterfaceDimension:
+        """The date_part requested to extract."""
+        raise NotImplementedError
+
     def alias(self, _alias: str) -> QueryInterfaceDimension:
         """Renaming the column."""
         raise NotImplementedError
diff --git a/metricflow/specs/where_filter_entity.py b/metricflow/specs/where_filter_entity.py
index 5631fb669e..8b30ef14d5 100644
--- a/metricflow/specs/where_filter_entity.py
+++ b/metricflow/specs/where_filter_entity.py
@@ -12,15 +12,15 @@
 from typing_extensions import override
 
 from metricflow.specs.column_assoc import ColumnAssociationResolver
-from metricflow.specs.query_interface import QueryInterfaceDimension, QueryInterfaceEntityFactory
+from metricflow.specs.query_interface import QueryInterfaceEntity, QueryInterfaceEntityFactory
 from metricflow.specs.specs import EntitySpec
 
 
-class WhereFilterEntity(ProtocolHint[QueryInterfaceDimension]):
+class WhereFilterEntity(ProtocolHint[QueryInterfaceEntity]):
     """An entity that is passed in through the where filter parameter."""
 
     @override
-    def _implements_protocol(self) -> QueryInterfaceDimension:
+    def _implements_protocol(self) -> QueryInterfaceEntity:
         return self
 
     def __init__(self, column_name: str):  # noqa
diff --git a/metricflow/specs/where_filter_time_dimension.py b/metricflow/specs/where_filter_time_dimension.py
index 0dd23ad0d4..34901ca269 100644
--- a/metricflow/specs/where_filter_time_dimension.py
+++ b/metricflow/specs/where_filter_time_dimension.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import List, Sequence
+from typing import List, Optional, Sequence
 
 from dbt_semantic_interfaces.call_parameter_sets import FilterCallParameterSets, TimeDimensionCallParameterSet
 from dbt_semantic_interfaces.naming.dundered import DunderedNameFormatter
@@ -28,6 +28,10 @@ def grain(self, _grain: str) -> WhereFilterTimeDimension:
         """The time granularity."""
         raise NotImplementedError
 
+    def date_part(self, _date_part: str) -> WhereFilterTimeDimension:
+        """Requested date_part to extract."""
+        raise NotImplementedError
+
     def alias(self, _alias: str) -> WhereFilterTimeDimension:
         """Renaming the column."""
         raise NotImplementedError
@@ -60,7 +64,11 @@ def __init__(  # noqa
         self.time_dimension_specs: List[TimeDimensionSpec] = []
 
     def create(
-        self, time_dimension_name: str, time_granularity_name: str, entity_path: Sequence[str] = ()
+        self,
+        time_dimension_name: str,
+        time_granularity_name: str,
+        date_part_name: Optional[str] = None,
+        entity_path: Sequence[str] = (),
     ) -> WhereFilterTimeDimension:
         """Create a WhereFilterTimeDimension."""
         structured_name = DunderedNameFormatter.parse_name(time_dimension_name)
diff --git a/metricflow/test/integration/test_cases/itest_metrics.yaml b/metricflow/test/integration/test_cases/itest_metrics.yaml
index 856b591781..ced9b011a1 100644
--- a/metricflow/test/integration/test_cases/itest_metrics.yaml
+++ b/metricflow/test/integration/test_cases/itest_metrics.yaml
@@ -1043,3 +1043,17 @@ integration_test:
     ) b
     ON a.metric_time__week = b.metric_time__week
       AND a.metric_time__month = b.metric_time__month
+---
+integration_test:
+  name: simple_query_with_date_part
+  description: Test query using date_part
+  model: SIMPLE_MODEL
+  metrics: ["bookings"]
+  group_bys: ["metric_time__extract_dayofweek"]
+  check_query: |
+    SELECT
+      SUM(1) AS bookings
+      , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
+    FROM {{ source_schema }}.fct_bookings
+    GROUP BY EXTRACT(DAYOFWEEK FROM ds);
+# TODO: test with cumulative metric, offset metric, others?
diff --git a/metricflow/test/query/test_query_parser.py b/metricflow/test/query/test_query_parser.py
index d585ab4465..b4962b4bee 100644
--- a/metricflow/test/query/test_query_parser.py
+++ b/metricflow/test/query/test_query_parser.py
@@ -175,6 +175,7 @@ class MockQueryParameter:
     """This is a mock that is just used to test the query parser."""
 
     grain = None
+    date_part = None
 
     def __init__(self, name: str):  # noqa: D
         self.name = name
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
index b320e6bd7b..98ccda3807 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
@@ -99,6 +99,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -321,6 +328,13 @@ FULL OUTER JOIN (
           , subq_5.ds__month AS metric_time__month
           , subq_5.ds__quarter AS metric_time__quarter
           , subq_5.ds__year AS metric_time__year
+          , subq_5.ds__extract_year AS metric_time__extract_year
+          , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_5.ds__extract_month AS metric_time__extract_month
+          , subq_5.ds__extract_week AS metric_time__extract_week
+          , subq_5.ds__extract_day AS metric_time__extract_day
+          , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 0715f5e0da..561210bfe0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -123,6 +123,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -307,6 +314,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -484,6 +498,13 @@ FROM (
                 , subq_10.ds__month AS metric_time__month
                 , subq_10.ds__quarter AS metric_time__quarter
                 , subq_10.ds__year AS metric_time__year
+                , subq_10.ds__extract_year AS metric_time__extract_year
+                , subq_10.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_10.ds__extract_month AS metric_time__extract_month
+                , subq_10.ds__extract_week AS metric_time__extract_week
+                , subq_10.ds__extract_day AS metric_time__extract_day
+                , subq_10.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_10.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_10.listing
                 , subq_10.user
                 , subq_10.view__listing
@@ -611,6 +632,13 @@ FROM (
                 , subq_13.ds__month AS metric_time__month
                 , subq_13.ds__quarter AS metric_time__quarter
                 , subq_13.ds__year AS metric_time__year
+                , subq_13.ds__extract_year AS metric_time__extract_year
+                , subq_13.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_13.ds__extract_month AS metric_time__extract_month
+                , subq_13.ds__extract_week AS metric_time__extract_week
+                , subq_13.ds__extract_day AS metric_time__extract_day
+                , subq_13.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_13.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_13.listing
                 , subq_13.user
                 , subq_13.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
index 932baf10dc..cc45bf1891 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
index 3ed483e9d4..d4dd5b361d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
index 0f802052ea..0f93debdc2 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
@@ -42,6 +42,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
index 1f5785cdff..06c8ba798c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 6f77ab2cfe..b7e9032ac9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_1.metric_time__month
         , subq_1.metric_time__quarter
         , subq_1.metric_time__year
+        , subq_1.metric_time__extract_year
+        , subq_1.metric_time__extract_quarter
+        , subq_1.metric_time__extract_month
+        , subq_1.metric_time__extract_week
+        , subq_1.metric_time__extract_day
+        , subq_1.metric_time__extract_dayofweek
+        , subq_1.metric_time__extract_dayofyear
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -80,6 +87,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
index b53f5ed26c..9e6b7ea463 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_1.metric_time__month
         , subq_1.metric_time__quarter
         , subq_1.metric_time__year
+        , subq_1.metric_time__extract_year
+        , subq_1.metric_time__extract_quarter
+        , subq_1.metric_time__extract_month
+        , subq_1.metric_time__extract_week
+        , subq_1.metric_time__extract_day
+        , subq_1.metric_time__extract_dayofweek
+        , subq_1.metric_time__extract_dayofyear
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -80,6 +87,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
index 6c4ce49599..bfe2d094f8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -326,6 +333,13 @@ FROM (
             , subq_5.ds__month AS metric_time__month
             , subq_5.ds__quarter AS metric_time__quarter
             , subq_5.ds__year AS metric_time__year
+            , subq_5.ds__extract_year AS metric_time__extract_year
+            , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_5.ds__extract_month AS metric_time__extract_month
+            , subq_5.ds__extract_week AS metric_time__extract_week
+            , subq_5.ds__extract_day AS metric_time__extract_day
+            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_5.listing
             , subq_5.guest
             , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
index 56f97cc21c..9ca086a919 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index a501f2c21b..52d9d94da7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
index 64b240f7de..1b1449615b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 706834fa9c..475e77c5dc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 65759f67e7..f2aa5d7c8c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -207,6 +207,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -535,6 +542,13 @@ FROM (
               , subq_8.ds__month AS metric_time__month
               , subq_8.ds__quarter AS metric_time__quarter
               , subq_8.ds__year AS metric_time__year
+              , subq_8.ds__extract_year AS metric_time__extract_year
+              , subq_8.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_8.ds__extract_month AS metric_time__extract_month
+              , subq_8.ds__extract_week AS metric_time__extract_week
+              , subq_8.ds__extract_day AS metric_time__extract_day
+              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 12e3863ba1..e057de623f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -207,6 +207,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -536,6 +543,13 @@ FROM (
               , subq_8.ds__month AS metric_time__month
               , subq_8.ds__quarter AS metric_time__quarter
               , subq_8.ds__year AS metric_time__year
+              , subq_8.ds__extract_year AS metric_time__extract_year
+              , subq_8.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_8.ds__extract_month AS metric_time__extract_month
+              , subq_8.ds__extract_week AS metric_time__extract_week
+              , subq_8.ds__extract_day AS metric_time__extract_day
+              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
index 77bb8bd9ad..7a120c1236 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
@@ -201,6 +201,13 @@ FROM (
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
             , subq_1.metric_time__year AS metric_time__year
+            , subq_1.metric_time__extract_year AS metric_time__extract_year
+            , subq_1.metric_time__extract_quarter AS metric_time__extract_quarter
+            , subq_1.metric_time__extract_month AS metric_time__extract_month
+            , subq_1.metric_time__extract_week AS metric_time__extract_week
+            , subq_1.metric_time__extract_day AS metric_time__extract_day
+            , subq_1.metric_time__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_1.metric_time__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -308,6 +315,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 7636cc1e70..19b237f759 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -201,6 +201,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
index 58dc1a7753..95a9c68e3f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
@@ -114,6 +114,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -298,6 +305,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
index eac727a04f..298d60b12f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -120,6 +120,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -304,6 +311,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
index d35cde616a..bc49c849ed 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
@@ -30,8 +30,8 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__day AS listing__window_start__day
-            , subq_4.window_end__extract_week AS listing__window_end__extract_week
+            , subq_4.window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
+            , subq_4.window_end__day AS listing__window_end__day
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -122,6 +122,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -236,8 +243,8 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__day
-              , subq_3.window_end__extract_week
+              subq_3.window_start__extract_dayofyear
+              , subq_3.window_end__day
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -308,12 +315,12 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__day
+                subq_2.metric_time__day >= subq_4.window_start__extract_dayofyear
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__extract_week
+                  subq_2.metric_time__day < subq_4.window_end__day
                 ) OR (
-                  subq_4.window_end__extract_week IS NULL
+                  subq_4.window_end__day IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
index f0af95c23f..d9f3cf01a4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,12 +32,12 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= listings_src_10017.active_from
+        subq_12.metric_time__day >= EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from)
       ) AND (
         (
-          subq_12.metric_time__day < EXTRACT(WEEK FROM listings_src_10017.active_to)
+          subq_12.metric_time__day < listings_src_10017.active_to
         ) OR (
-          EXTRACT(WEEK FROM listings_src_10017.active_to) IS NULL
+          listings_src_10017.active_to IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index c5d9e328b3..16eb99e413 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 31b984a461..fbeb26604f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
index e346d4997e..2162a5c2ad 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
index e02fa3f09c..aa307ac3ae 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
@@ -98,6 +98,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
index ee95464b60..c02240d603 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
@@ -69,6 +69,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.listing
         , subq_0.user
         , subq_0.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
index 6385db4297..f83d1e53c7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
@@ -132,6 +132,13 @@ FROM (
                     , subq_0.ds__month AS metric_time__month
                     , subq_0.ds__quarter AS metric_time__quarter
                     , subq_0.ds__year AS metric_time__year
+                    , subq_0.ds__extract_year AS metric_time__extract_year
+                    , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_0.ds__extract_month AS metric_time__extract_month
+                    , subq_0.ds__extract_week AS metric_time__extract_week
+                    , subq_0.ds__extract_day AS metric_time__extract_day
+                    , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_0.listing
                     , subq_0.guest
                     , subq_0.host
@@ -316,6 +323,13 @@ FROM (
                     , subq_3.ds__month AS metric_time__month
                     , subq_3.ds__quarter AS metric_time__quarter
                     , subq_3.ds__year AS metric_time__year
+                    , subq_3.ds__extract_year AS metric_time__extract_year
+                    , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_3.ds__extract_month AS metric_time__extract_month
+                    , subq_3.ds__extract_week AS metric_time__extract_week
+                    , subq_3.ds__extract_day AS metric_time__extract_day
+                    , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_3.listing
                     , subq_3.user
                     , subq_3.listing__user
@@ -529,6 +543,13 @@ FROM (
                     , subq_12.ds__month AS metric_time__month
                     , subq_12.ds__quarter AS metric_time__quarter
                     , subq_12.ds__year AS metric_time__year
+                    , subq_12.ds__extract_year AS metric_time__extract_year
+                    , subq_12.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_12.ds__extract_month AS metric_time__extract_month
+                    , subq_12.ds__extract_week AS metric_time__extract_week
+                    , subq_12.ds__extract_day AS metric_time__extract_day
+                    , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_12.listing
                     , subq_12.guest
                     , subq_12.host
@@ -713,6 +734,13 @@ FROM (
                     , subq_15.ds__month AS metric_time__month
                     , subq_15.ds__quarter AS metric_time__quarter
                     , subq_15.ds__year AS metric_time__year
+                    , subq_15.ds__extract_year AS metric_time__extract_year
+                    , subq_15.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_15.ds__extract_month AS metric_time__extract_month
+                    , subq_15.ds__extract_week AS metric_time__extract_week
+                    , subq_15.ds__extract_day AS metric_time__extract_day
+                    , subq_15.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_15.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_15.listing
                     , subq_15.user
                     , subq_15.listing__user
@@ -909,6 +937,13 @@ FROM (
             , subq_24.ds__month AS metric_time__month
             , subq_24.ds__quarter AS metric_time__quarter
             , subq_24.ds__year AS metric_time__year
+            , subq_24.ds__extract_year AS metric_time__extract_year
+            , subq_24.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_24.ds__extract_month AS metric_time__extract_month
+            , subq_24.ds__extract_week AS metric_time__extract_week
+            , subq_24.ds__extract_day AS metric_time__extract_day
+            , subq_24.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_24.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_24.listing
             , subq_24.guest
             , subq_24.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
index 9352ceb3e2..28f70455e3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
@@ -117,6 +117,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -342,6 +349,13 @@ FROM (
             , subq_7.ds__month AS metric_time__month
             , subq_7.ds__quarter AS metric_time__quarter
             , subq_7.ds__year AS metric_time__year
+            , subq_7.ds__extract_year AS metric_time__extract_year
+            , subq_7.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_7.ds__extract_month AS metric_time__extract_month
+            , subq_7.ds__extract_week AS metric_time__extract_week
+            , subq_7.ds__extract_day AS metric_time__extract_day
+            , subq_7.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_7.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_7.listing
             , subq_7.guest
             , subq_7.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index f40149ee65..933c4905c0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -111,6 +111,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 8c59fd497e..3c83f6b210 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -99,6 +99,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -292,6 +299,13 @@ FROM (
             , subq_5.ds__month AS metric_time__month
             , subq_5.ds__quarter AS metric_time__quarter
             , subq_5.ds__year AS metric_time__year
+            , subq_5.ds__extract_year AS metric_time__extract_year
+            , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_5.ds__extract_month AS metric_time__extract_month
+            , subq_5.ds__extract_week AS metric_time__extract_week
+            , subq_5.ds__extract_day AS metric_time__extract_day
+            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_5.listing
             , subq_5.user
             , subq_5.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
index 49ab8afb27..024c911d5b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__day AS listing__window_start__day
-        , subq_7.window_end__extract_week AS listing__window_end__extract_week
+        , subq_7.window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
+        , subq_7.window_end__day AS listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
         , subq_2.bookings AS bookings
@@ -112,6 +112,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -226,8 +233,8 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__day
-          , subq_6.window_end__extract_week
+          subq_6.window_start__extract_dayofyear
+          , subq_6.window_end__day
           , subq_6.listing
           , subq_6.user__home_state_latest
         FROM (
@@ -464,12 +471,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__day
+            subq_2.metric_time__day >= subq_7.window_start__extract_dayofyear
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.window_end__extract_week
+              subq_2.metric_time__day < subq_7.window_end__day
             ) OR (
-              subq_7.window_end__extract_week IS NULL
+              subq_7.window_end__day IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index dfbf523e63..6fee75f492 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,8 +23,8 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    listings_src_10017.active_from AS window_start__day
-    , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+    EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+    , listings_src_10017.active_to AS window_end__day
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
   FROM ***************************.dim_listings listings_src_10017
@@ -38,12 +38,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__day
+      subq_13.metric_time__day >= subq_18.window_start__extract_dayofyear
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.window_end__extract_week
+        subq_13.metric_time__day < subq_18.window_end__day
       ) OR (
-        subq_18.window_end__extract_week IS NULL
+        subq_18.window_end__day IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
index 9114deef3f..2f8078af36 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
@@ -20,7 +20,7 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.lux_listing__window_start__day AS listing__lux_listing__window_start__day
+        , subq_7.lux_listing__window_start__extract_day AS listing__lux_listing__window_start__extract_day
         , subq_7.lux_listing__window_end__extract_month AS listing__lux_listing__window_end__extract_month
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
@@ -112,6 +112,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -229,7 +236,7 @@ FROM (
         --    'lux_listing__window_end__day',
         --    'listing']
         SELECT
-          subq_6.lux_listing__window_start__day
+          subq_6.lux_listing__window_start__extract_day
           , subq_6.lux_listing__window_end__extract_month
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
@@ -443,7 +450,7 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.lux_listing__window_start__day
+            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_day
           ) AND (
             (
               subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_month
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index 33a9a609fa..2ab605916c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -26,7 +26,7 @@ LEFT OUTER JOIN (
   --    'lux_listing__window_end__day',
   --    'listing']
   SELECT
-    lux_listings_src_10019.valid_from AS lux_listing__window_start__day
+    EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
     , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
@@ -41,7 +41,7 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.lux_listing__window_start__day
+      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_day
     ) AND (
       (
         subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_month
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
index 28e5abd86f..b0ede76214 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
@@ -84,6 +84,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.account_id
             , subq_0.account_month
             , subq_0.account_id__account_month
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
index 696514d415..7a1160e719 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
@@ -95,6 +95,13 @@ FROM (
           , subq_1.metric_time__month
           , subq_1.metric_time__quarter
           , subq_1.metric_time__year
+          , subq_1.metric_time__extract_year
+          , subq_1.metric_time__extract_quarter
+          , subq_1.metric_time__extract_month
+          , subq_1.metric_time__extract_week
+          , subq_1.metric_time__extract_day
+          , subq_1.metric_time__extract_dayofweek
+          , subq_1.metric_time__extract_dayofyear
           , subq_1.listing
           , subq_1.guest
           , subq_1.host
@@ -196,6 +203,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -391,6 +405,13 @@ CROSS JOIN (
           , subq_7.metric_time__month
           , subq_7.metric_time__quarter
           , subq_7.metric_time__year
+          , subq_7.metric_time__extract_year
+          , subq_7.metric_time__extract_quarter
+          , subq_7.metric_time__extract_month
+          , subq_7.metric_time__extract_week
+          , subq_7.metric_time__extract_day
+          , subq_7.metric_time__extract_dayofweek
+          , subq_7.metric_time__extract_dayofyear
           , subq_7.listing
           , subq_7.user
           , subq_7.listing__user
@@ -459,6 +480,13 @@ CROSS JOIN (
             , subq_6.ds__month AS metric_time__month
             , subq_6.ds__quarter AS metric_time__quarter
             , subq_6.ds__year AS metric_time__year
+            , subq_6.ds__extract_year AS metric_time__extract_year
+            , subq_6.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_6.ds__extract_month AS metric_time__extract_month
+            , subq_6.ds__extract_week AS metric_time__extract_week
+            , subq_6.ds__extract_day AS metric_time__extract_day
+            , subq_6.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_6.listing
             , subq_6.user
             , subq_6.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
index 79e108f49f..530e65ec20 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
@@ -116,6 +116,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -338,6 +345,13 @@ FROM (
                 , subq_5.ds__month AS metric_time__month
                 , subq_5.ds__quarter AS metric_time__quarter
                 , subq_5.ds__year AS metric_time__year
+                , subq_5.ds__extract_year AS metric_time__extract_year
+                , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_5.ds__extract_month AS metric_time__extract_month
+                , subq_5.ds__extract_week AS metric_time__extract_week
+                , subq_5.ds__extract_day AS metric_time__extract_day
+                , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_5.listing
                 , subq_5.guest
                 , subq_5.host
@@ -572,6 +586,13 @@ FROM (
             , subq_12.ds__month AS metric_time__month
             , subq_12.ds__quarter AS metric_time__quarter
             , subq_12.ds__year AS metric_time__year
+            , subq_12.ds__extract_year AS metric_time__extract_year
+            , subq_12.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_12.ds__extract_month AS metric_time__extract_month
+            , subq_12.ds__extract_week AS metric_time__extract_week
+            , subq_12.ds__extract_day AS metric_time__extract_day
+            , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_12.listing
             , subq_12.guest
             , subq_12.host
@@ -804,6 +825,13 @@ FROM (
             , subq_17.ds__month AS metric_time__month
             , subq_17.ds__quarter AS metric_time__quarter
             , subq_17.ds__year AS metric_time__year
+            , subq_17.ds__extract_year AS metric_time__extract_year
+            , subq_17.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_17.ds__extract_month AS metric_time__extract_month
+            , subq_17.ds__extract_week AS metric_time__extract_week
+            , subq_17.ds__extract_day AS metric_time__extract_day
+            , subq_17.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_17.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_17.listing
             , subq_17.guest
             , subq_17.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
index e04b6506be..ce7f3ffa85 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
@@ -84,6 +84,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.verification
             , subq_0.user
             , subq_0.verification__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql
index 8209ee600a..e98764d3a8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql
@@ -99,6 +99,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -321,6 +328,13 @@ FULL OUTER JOIN (
           , subq_5.ds__month AS metric_time__month
           , subq_5.ds__quarter AS metric_time__quarter
           , subq_5.ds__year AS metric_time__year
+          , subq_5.ds__extract_year AS metric_time__extract_year
+          , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_5.ds__extract_month AS metric_time__extract_month
+          , subq_5.ds__extract_week AS metric_time__extract_week
+          , subq_5.ds__extract_day AS metric_time__extract_day
+          , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index e556d194aa..83df46b3c4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -123,6 +123,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -307,6 +314,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -484,6 +498,13 @@ FROM (
                 , subq_10.ds__month AS metric_time__month
                 , subq_10.ds__quarter AS metric_time__quarter
                 , subq_10.ds__year AS metric_time__year
+                , subq_10.ds__extract_year AS metric_time__extract_year
+                , subq_10.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_10.ds__extract_month AS metric_time__extract_month
+                , subq_10.ds__extract_week AS metric_time__extract_week
+                , subq_10.ds__extract_day AS metric_time__extract_day
+                , subq_10.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_10.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_10.listing
                 , subq_10.user
                 , subq_10.view__listing
@@ -611,6 +632,13 @@ FROM (
                 , subq_13.ds__month AS metric_time__month
                 , subq_13.ds__quarter AS metric_time__quarter
                 , subq_13.ds__year AS metric_time__year
+                , subq_13.ds__extract_year AS metric_time__extract_year
+                , subq_13.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_13.ds__extract_month AS metric_time__extract_month
+                , subq_13.ds__extract_week AS metric_time__extract_week
+                , subq_13.ds__extract_day AS metric_time__extract_day
+                , subq_13.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_13.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_13.listing
                 , subq_13.user
                 , subq_13.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
index 7a21860fcb..5dd2138c23 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
index 98ba846b40..33a5834e5f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
index 4695227af1..12219e1521 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
@@ -42,6 +42,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
index d7d79e0e55..bcac8fdcad 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index ea1c3531d4..61a5f71588 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_1.metric_time__month
         , subq_1.metric_time__quarter
         , subq_1.metric_time__year
+        , subq_1.metric_time__extract_year
+        , subq_1.metric_time__extract_quarter
+        , subq_1.metric_time__extract_month
+        , subq_1.metric_time__extract_week
+        , subq_1.metric_time__extract_day
+        , subq_1.metric_time__extract_dayofweek
+        , subq_1.metric_time__extract_dayofyear
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -80,6 +87,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
index 553a0f19f7..7c4b4abfb3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_1.metric_time__month
         , subq_1.metric_time__quarter
         , subq_1.metric_time__year
+        , subq_1.metric_time__extract_year
+        , subq_1.metric_time__extract_quarter
+        , subq_1.metric_time__extract_month
+        , subq_1.metric_time__extract_week
+        , subq_1.metric_time__extract_day
+        , subq_1.metric_time__extract_dayofweek
+        , subq_1.metric_time__extract_dayofyear
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -80,6 +87,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql
index 50f09e5c00..24eacc8f9e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -326,6 +333,13 @@ FROM (
             , subq_5.ds__month AS metric_time__month
             , subq_5.ds__quarter AS metric_time__quarter
             , subq_5.ds__year AS metric_time__year
+            , subq_5.ds__extract_year AS metric_time__extract_year
+            , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_5.ds__extract_month AS metric_time__extract_month
+            , subq_5.ds__extract_week AS metric_time__extract_week
+            , subq_5.ds__extract_day AS metric_time__extract_day
+            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_5.listing
             , subq_5.guest
             , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
index 82c9f10475..bf72a9c59a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 9fe9c136c1..cdf5e6646b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
index daa52ca41e..5c396371e8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index aa0f8a119a..7b2c9a7661 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index ecc7b21c32..f635bf528d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -207,6 +207,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -535,6 +542,13 @@ FROM (
               , subq_8.ds__month AS metric_time__month
               , subq_8.ds__quarter AS metric_time__quarter
               , subq_8.ds__year AS metric_time__year
+              , subq_8.ds__extract_year AS metric_time__extract_year
+              , subq_8.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_8.ds__extract_month AS metric_time__extract_month
+              , subq_8.ds__extract_week AS metric_time__extract_week
+              , subq_8.ds__extract_day AS metric_time__extract_day
+              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 9ab034b843..c61f320f56 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -207,6 +207,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -536,6 +543,13 @@ FROM (
               , subq_8.ds__month AS metric_time__month
               , subq_8.ds__quarter AS metric_time__quarter
               , subq_8.ds__year AS metric_time__year
+              , subq_8.ds__extract_year AS metric_time__extract_year
+              , subq_8.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_8.ds__extract_month AS metric_time__extract_month
+              , subq_8.ds__extract_week AS metric_time__extract_week
+              , subq_8.ds__extract_day AS metric_time__extract_day
+              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
index a3509be579..35a55ef78b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
@@ -201,6 +201,13 @@ FROM (
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
             , subq_1.metric_time__year AS metric_time__year
+            , subq_1.metric_time__extract_year AS metric_time__extract_year
+            , subq_1.metric_time__extract_quarter AS metric_time__extract_quarter
+            , subq_1.metric_time__extract_month AS metric_time__extract_month
+            , subq_1.metric_time__extract_week AS metric_time__extract_week
+            , subq_1.metric_time__extract_day AS metric_time__extract_day
+            , subq_1.metric_time__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_1.metric_time__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -308,6 +315,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 466af8e156..4546c94c68 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -201,6 +201,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql
index 049dfd23fb..d4f664fec9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql
@@ -114,6 +114,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -298,6 +305,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 479ed8d1ef..8b1ab2a969 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -120,6 +120,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -304,6 +311,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
index 35fca69027..613d0fde8e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
@@ -30,8 +30,8 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__extract_month AS listing__window_start__extract_month
-            , subq_4.window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
+            , subq_4.window_start__day AS listing__window_start__day
+            , subq_4.window_end__extract_week AS listing__window_end__extract_week
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -122,6 +122,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -236,8 +243,8 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__extract_month
-              , subq_3.window_end__extract_dayofweek
+              subq_3.window_start__day
+              , subq_3.window_end__extract_week
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -308,12 +315,12 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__extract_month
+                subq_2.metric_time__day >= subq_4.window_start__day
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__extract_dayofweek
+                  subq_2.metric_time__day < subq_4.window_end__extract_week
                 ) OR (
-                  subq_4.window_end__extract_dayofweek IS NULL
+                  subq_4.window_end__extract_week IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
index 710e67b149..f0af95c23f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,12 +32,12 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= EXTRACT(MONTH FROM listings_src_10017.active_from)
+        subq_12.metric_time__day >= listings_src_10017.active_from
       ) AND (
         (
-          subq_12.metric_time__day < EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to)
+          subq_12.metric_time__day < EXTRACT(WEEK FROM listings_src_10017.active_to)
         ) OR (
-          EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) IS NULL
+          EXTRACT(WEEK FROM listings_src_10017.active_to) IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 70accec611..9f0330a8c4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
index a6aabb20c2..a66f5d9a1e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
index 80e8fdda4b..71b77eaf66 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql
index 42f33bb96e..3ba23c2e5a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql
@@ -98,6 +98,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
index 973abdbb6f..2635220d21 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
@@ -69,6 +69,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.listing
         , subq_0.user
         , subq_0.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql
index c99d63cffa..a3dc672f7f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql
@@ -132,6 +132,13 @@ FROM (
                     , subq_0.ds__month AS metric_time__month
                     , subq_0.ds__quarter AS metric_time__quarter
                     , subq_0.ds__year AS metric_time__year
+                    , subq_0.ds__extract_year AS metric_time__extract_year
+                    , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_0.ds__extract_month AS metric_time__extract_month
+                    , subq_0.ds__extract_week AS metric_time__extract_week
+                    , subq_0.ds__extract_day AS metric_time__extract_day
+                    , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_0.listing
                     , subq_0.guest
                     , subq_0.host
@@ -316,6 +323,13 @@ FROM (
                     , subq_3.ds__month AS metric_time__month
                     , subq_3.ds__quarter AS metric_time__quarter
                     , subq_3.ds__year AS metric_time__year
+                    , subq_3.ds__extract_year AS metric_time__extract_year
+                    , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_3.ds__extract_month AS metric_time__extract_month
+                    , subq_3.ds__extract_week AS metric_time__extract_week
+                    , subq_3.ds__extract_day AS metric_time__extract_day
+                    , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_3.listing
                     , subq_3.user
                     , subq_3.listing__user
@@ -529,6 +543,13 @@ FROM (
                     , subq_12.ds__month AS metric_time__month
                     , subq_12.ds__quarter AS metric_time__quarter
                     , subq_12.ds__year AS metric_time__year
+                    , subq_12.ds__extract_year AS metric_time__extract_year
+                    , subq_12.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_12.ds__extract_month AS metric_time__extract_month
+                    , subq_12.ds__extract_week AS metric_time__extract_week
+                    , subq_12.ds__extract_day AS metric_time__extract_day
+                    , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_12.listing
                     , subq_12.guest
                     , subq_12.host
@@ -713,6 +734,13 @@ FROM (
                     , subq_15.ds__month AS metric_time__month
                     , subq_15.ds__quarter AS metric_time__quarter
                     , subq_15.ds__year AS metric_time__year
+                    , subq_15.ds__extract_year AS metric_time__extract_year
+                    , subq_15.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_15.ds__extract_month AS metric_time__extract_month
+                    , subq_15.ds__extract_week AS metric_time__extract_week
+                    , subq_15.ds__extract_day AS metric_time__extract_day
+                    , subq_15.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_15.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_15.listing
                     , subq_15.user
                     , subq_15.listing__user
@@ -909,6 +937,13 @@ FROM (
             , subq_24.ds__month AS metric_time__month
             , subq_24.ds__quarter AS metric_time__quarter
             , subq_24.ds__year AS metric_time__year
+            , subq_24.ds__extract_year AS metric_time__extract_year
+            , subq_24.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_24.ds__extract_month AS metric_time__extract_month
+            , subq_24.ds__extract_week AS metric_time__extract_week
+            , subq_24.ds__extract_day AS metric_time__extract_day
+            , subq_24.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_24.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_24.listing
             , subq_24.guest
             , subq_24.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
index 1e3f035827..2de235aece 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
@@ -117,6 +117,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -342,6 +349,13 @@ FROM (
             , subq_7.ds__month AS metric_time__month
             , subq_7.ds__quarter AS metric_time__quarter
             , subq_7.ds__year AS metric_time__year
+            , subq_7.ds__extract_year AS metric_time__extract_year
+            , subq_7.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_7.ds__extract_month AS metric_time__extract_month
+            , subq_7.ds__extract_week AS metric_time__extract_week
+            , subq_7.ds__extract_day AS metric_time__extract_day
+            , subq_7.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_7.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_7.listing
             , subq_7.guest
             , subq_7.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 1286214deb..5c4bf2859d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -111,6 +111,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 0b3cc84657..b75797d1e3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -99,6 +99,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -292,6 +299,13 @@ FROM (
             , subq_5.ds__month AS metric_time__month
             , subq_5.ds__quarter AS metric_time__quarter
             , subq_5.ds__year AS metric_time__year
+            , subq_5.ds__extract_year AS metric_time__extract_year
+            , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_5.ds__extract_month AS metric_time__extract_month
+            , subq_5.ds__extract_week AS metric_time__extract_week
+            , subq_5.ds__extract_day AS metric_time__extract_day
+            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_5.listing
             , subq_5.user
             , subq_5.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
index e0644705db..ff186bc953 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__extract_month AS listing__window_start__extract_month
-        , subq_7.window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
+        , subq_7.window_start__extract_week AS listing__window_start__extract_week
+        , subq_7.window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
         , subq_2.bookings AS bookings
@@ -112,6 +112,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -226,8 +233,8 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__extract_month
-          , subq_6.window_end__extract_dayofweek
+          subq_6.window_start__extract_week
+          , subq_6.window_end__extract_dayofyear
           , subq_6.listing
           , subq_6.user__home_state_latest
         FROM (
@@ -464,12 +471,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__extract_month
+            subq_2.metric_time__day >= subq_7.window_start__extract_week
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.window_end__extract_dayofweek
+              subq_2.metric_time__day < subq_7.window_end__extract_dayofyear
             ) OR (
-              subq_7.window_end__extract_dayofweek IS NULL
+              subq_7.window_end__extract_dayofyear IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index 425b62e62c..060e8301a1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,8 +23,8 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-    , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+    EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+    , EXTRACT(DOY FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
   FROM ***************************.dim_listings listings_src_10017
@@ -38,12 +38,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__extract_month
+      subq_13.metric_time__day >= subq_18.window_start__extract_week
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.window_end__extract_dayofweek
+        subq_13.metric_time__day < subq_18.window_end__extract_dayofyear
       ) OR (
-        subq_18.window_end__extract_dayofweek IS NULL
+        subq_18.window_end__extract_dayofyear IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
index 20137a0df6..7d569f8111 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
@@ -20,7 +20,7 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.lux_listing__window_start__extract_day AS listing__lux_listing__window_start__extract_day
+        , subq_7.lux_listing__window_start__extract_dayofweek AS listing__lux_listing__window_start__extract_dayofweek
         , subq_7.lux_listing__window_end__extract_month AS listing__lux_listing__window_end__extract_month
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
@@ -112,6 +112,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -229,7 +236,7 @@ FROM (
         --    'lux_listing__window_end__day',
         --    'listing']
         SELECT
-          subq_6.lux_listing__window_start__extract_day
+          subq_6.lux_listing__window_start__extract_dayofweek
           , subq_6.lux_listing__window_end__extract_month
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
@@ -443,7 +450,7 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_day
+            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_dayofweek
           ) AND (
             (
               subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_month
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index b495cc4b52..aca1260a66 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -26,7 +26,7 @@ LEFT OUTER JOIN (
   --    'lux_listing__window_end__day',
   --    'listing']
   SELECT
-    EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+    EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
     , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
@@ -41,7 +41,7 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_day
+      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_dayofweek
     ) AND (
       (
         subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_month
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
index 234bd823d2..5e08760139 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
@@ -84,6 +84,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.account_id
             , subq_0.account_month
             , subq_0.account_id__account_month
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
index 1ee70afb0b..7eaea2b4de 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
@@ -95,6 +95,13 @@ FROM (
           , subq_1.metric_time__month
           , subq_1.metric_time__quarter
           , subq_1.metric_time__year
+          , subq_1.metric_time__extract_year
+          , subq_1.metric_time__extract_quarter
+          , subq_1.metric_time__extract_month
+          , subq_1.metric_time__extract_week
+          , subq_1.metric_time__extract_day
+          , subq_1.metric_time__extract_dayofweek
+          , subq_1.metric_time__extract_dayofyear
           , subq_1.listing
           , subq_1.guest
           , subq_1.host
@@ -196,6 +203,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -391,6 +405,13 @@ CROSS JOIN (
           , subq_7.metric_time__month
           , subq_7.metric_time__quarter
           , subq_7.metric_time__year
+          , subq_7.metric_time__extract_year
+          , subq_7.metric_time__extract_quarter
+          , subq_7.metric_time__extract_month
+          , subq_7.metric_time__extract_week
+          , subq_7.metric_time__extract_day
+          , subq_7.metric_time__extract_dayofweek
+          , subq_7.metric_time__extract_dayofyear
           , subq_7.listing
           , subq_7.user
           , subq_7.listing__user
@@ -459,6 +480,13 @@ CROSS JOIN (
             , subq_6.ds__month AS metric_time__month
             , subq_6.ds__quarter AS metric_time__quarter
             , subq_6.ds__year AS metric_time__year
+            , subq_6.ds__extract_year AS metric_time__extract_year
+            , subq_6.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_6.ds__extract_month AS metric_time__extract_month
+            , subq_6.ds__extract_week AS metric_time__extract_week
+            , subq_6.ds__extract_day AS metric_time__extract_day
+            , subq_6.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_6.listing
             , subq_6.user
             , subq_6.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql
index 7cc6e2d906..fae92e63dc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql
@@ -116,6 +116,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -338,6 +345,13 @@ FROM (
                 , subq_5.ds__month AS metric_time__month
                 , subq_5.ds__quarter AS metric_time__quarter
                 , subq_5.ds__year AS metric_time__year
+                , subq_5.ds__extract_year AS metric_time__extract_year
+                , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_5.ds__extract_month AS metric_time__extract_month
+                , subq_5.ds__extract_week AS metric_time__extract_week
+                , subq_5.ds__extract_day AS metric_time__extract_day
+                , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_5.listing
                 , subq_5.guest
                 , subq_5.host
@@ -572,6 +586,13 @@ FROM (
             , subq_12.ds__month AS metric_time__month
             , subq_12.ds__quarter AS metric_time__quarter
             , subq_12.ds__year AS metric_time__year
+            , subq_12.ds__extract_year AS metric_time__extract_year
+            , subq_12.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_12.ds__extract_month AS metric_time__extract_month
+            , subq_12.ds__extract_week AS metric_time__extract_week
+            , subq_12.ds__extract_day AS metric_time__extract_day
+            , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_12.listing
             , subq_12.guest
             , subq_12.host
@@ -804,6 +825,13 @@ FROM (
             , subq_17.ds__month AS metric_time__month
             , subq_17.ds__quarter AS metric_time__quarter
             , subq_17.ds__year AS metric_time__year
+            , subq_17.ds__extract_year AS metric_time__extract_year
+            , subq_17.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_17.ds__extract_month AS metric_time__extract_month
+            , subq_17.ds__extract_week AS metric_time__extract_week
+            , subq_17.ds__extract_day AS metric_time__extract_day
+            , subq_17.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_17.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_17.listing
             , subq_17.guest
             , subq_17.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql
index e7c3deecdb..6eeaaeaeef 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql
@@ -84,6 +84,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.verification
             , subq_0.user
             , subq_0.verification__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
index 073c7964da..d2a3c6afd9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
@@ -99,6 +99,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -321,6 +328,13 @@ FULL OUTER JOIN (
           , subq_5.ds__month AS metric_time__month
           , subq_5.ds__quarter AS metric_time__quarter
           , subq_5.ds__year AS metric_time__year
+          , subq_5.ds__extract_year AS metric_time__extract_year
+          , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_5.ds__extract_month AS metric_time__extract_month
+          , subq_5.ds__extract_week AS metric_time__extract_week
+          , subq_5.ds__extract_day AS metric_time__extract_day
+          , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index d5d52443ea..c45302afaf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -123,6 +123,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -307,6 +314,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -484,6 +498,13 @@ FROM (
                 , subq_10.ds__month AS metric_time__month
                 , subq_10.ds__quarter AS metric_time__quarter
                 , subq_10.ds__year AS metric_time__year
+                , subq_10.ds__extract_year AS metric_time__extract_year
+                , subq_10.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_10.ds__extract_month AS metric_time__extract_month
+                , subq_10.ds__extract_week AS metric_time__extract_week
+                , subq_10.ds__extract_day AS metric_time__extract_day
+                , subq_10.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_10.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_10.listing
                 , subq_10.user
                 , subq_10.view__listing
@@ -611,6 +632,13 @@ FROM (
                 , subq_13.ds__month AS metric_time__month
                 , subq_13.ds__quarter AS metric_time__quarter
                 , subq_13.ds__year AS metric_time__year
+                , subq_13.ds__extract_year AS metric_time__extract_year
+                , subq_13.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_13.ds__extract_month AS metric_time__extract_month
+                , subq_13.ds__extract_week AS metric_time__extract_week
+                , subq_13.ds__extract_day AS metric_time__extract_day
+                , subq_13.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_13.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_13.listing
                 , subq_13.user
                 , subq_13.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
index f52c8d6acf..ad08f90e35 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
index 4e79154b70..8c2ab1a915 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
index f44071348d..8d5b07c69a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
@@ -42,6 +42,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
index 4c321e73b0..d98f0f554a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 4821d797fe..26ab44afcc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_1.metric_time__month
         , subq_1.metric_time__quarter
         , subq_1.metric_time__year
+        , subq_1.metric_time__extract_year
+        , subq_1.metric_time__extract_quarter
+        , subq_1.metric_time__extract_month
+        , subq_1.metric_time__extract_week
+        , subq_1.metric_time__extract_day
+        , subq_1.metric_time__extract_dayofweek
+        , subq_1.metric_time__extract_dayofyear
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -80,6 +87,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
index 2a39c9282f..a670ac2189 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_1.metric_time__month
         , subq_1.metric_time__quarter
         , subq_1.metric_time__year
+        , subq_1.metric_time__extract_year
+        , subq_1.metric_time__extract_quarter
+        , subq_1.metric_time__extract_month
+        , subq_1.metric_time__extract_week
+        , subq_1.metric_time__extract_day
+        , subq_1.metric_time__extract_dayofweek
+        , subq_1.metric_time__extract_dayofyear
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -80,6 +87,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
index 82ded0a878..3d88c96009 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -326,6 +333,13 @@ FROM (
             , subq_5.ds__month AS metric_time__month
             , subq_5.ds__quarter AS metric_time__quarter
             , subq_5.ds__year AS metric_time__year
+            , subq_5.ds__extract_year AS metric_time__extract_year
+            , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_5.ds__extract_month AS metric_time__extract_month
+            , subq_5.ds__extract_week AS metric_time__extract_week
+            , subq_5.ds__extract_day AS metric_time__extract_day
+            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_5.listing
             , subq_5.guest
             , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
index f21c6e33a7..e2ff275b47 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 34b929887f..13d462ce84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
index de24654075..7763daf079 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 3da362bd96..8a1592b8e5 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 001633ef6d..793e7f674c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -207,6 +207,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -535,6 +542,13 @@ FROM (
               , subq_8.ds__month AS metric_time__month
               , subq_8.ds__quarter AS metric_time__quarter
               , subq_8.ds__year AS metric_time__year
+              , subq_8.ds__extract_year AS metric_time__extract_year
+              , subq_8.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_8.ds__extract_month AS metric_time__extract_month
+              , subq_8.ds__extract_week AS metric_time__extract_week
+              , subq_8.ds__extract_day AS metric_time__extract_day
+              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 0d2a73ccaa..fd2a08f4dc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -207,6 +207,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -536,6 +543,13 @@ FROM (
               , subq_8.ds__month AS metric_time__month
               , subq_8.ds__quarter AS metric_time__quarter
               , subq_8.ds__year AS metric_time__year
+              , subq_8.ds__extract_year AS metric_time__extract_year
+              , subq_8.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_8.ds__extract_month AS metric_time__extract_month
+              , subq_8.ds__extract_week AS metric_time__extract_week
+              , subq_8.ds__extract_day AS metric_time__extract_day
+              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
index 11133f2d42..9ff5c7ed82 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
@@ -201,6 +201,13 @@ FROM (
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
             , subq_1.metric_time__year AS metric_time__year
+            , subq_1.metric_time__extract_year AS metric_time__extract_year
+            , subq_1.metric_time__extract_quarter AS metric_time__extract_quarter
+            , subq_1.metric_time__extract_month AS metric_time__extract_month
+            , subq_1.metric_time__extract_week AS metric_time__extract_week
+            , subq_1.metric_time__extract_day AS metric_time__extract_day
+            , subq_1.metric_time__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_1.metric_time__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -308,6 +315,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 467707f734..781610f066 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -201,6 +201,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
index 3adff18e62..693e200db3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
@@ -114,6 +114,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -298,6 +305,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
index eb70f04221..1a6844636c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -120,6 +120,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -304,6 +311,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
index a1b2d01a0f..5712e1d25c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
@@ -30,8 +30,8 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__extract_month AS listing__window_start__extract_month
-            , subq_4.window_end__extract_quarter AS listing__window_end__extract_quarter
+            , subq_4.window_start__day AS listing__window_start__day
+            , subq_4.window_end__day AS listing__window_end__day
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -122,6 +122,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -236,8 +243,8 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__extract_month
-              , subq_3.window_end__extract_quarter
+              subq_3.window_start__day
+              , subq_3.window_end__day
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -308,12 +315,12 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__extract_month
+                subq_2.metric_time__day >= subq_4.window_start__day
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__extract_quarter
+                  subq_2.metric_time__day < subq_4.window_end__day
                 ) OR (
-                  subq_4.window_end__extract_quarter IS NULL
+                  subq_4.window_end__day IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
index 28a4fe2ec0..86a2010b35 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,12 +32,12 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= EXTRACT(MONTH FROM listings_src_10017.active_from)
+        subq_12.metric_time__day >= listings_src_10017.active_from
       ) AND (
         (
-          subq_12.metric_time__day < EXTRACT(QUARTER FROM listings_src_10017.active_to)
+          subq_12.metric_time__day < listings_src_10017.active_to
         ) OR (
-          EXTRACT(QUARTER FROM listings_src_10017.active_to) IS NULL
+          listings_src_10017.active_to IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 6ef8853985..141c4fba09 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 18e509dd5c..093b149ba2 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
index 16e8afe8d0..7c85ab1cdb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
index b00d690648..e89a957806 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
@@ -98,6 +98,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
index 583b4a4bf0..436f0e7545 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
@@ -69,6 +69,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.listing
         , subq_0.user
         , subq_0.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
index 437dc887b4..9223eebd6e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
@@ -132,6 +132,13 @@ FROM (
                     , subq_0.ds__month AS metric_time__month
                     , subq_0.ds__quarter AS metric_time__quarter
                     , subq_0.ds__year AS metric_time__year
+                    , subq_0.ds__extract_year AS metric_time__extract_year
+                    , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_0.ds__extract_month AS metric_time__extract_month
+                    , subq_0.ds__extract_week AS metric_time__extract_week
+                    , subq_0.ds__extract_day AS metric_time__extract_day
+                    , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_0.listing
                     , subq_0.guest
                     , subq_0.host
@@ -316,6 +323,13 @@ FROM (
                     , subq_3.ds__month AS metric_time__month
                     , subq_3.ds__quarter AS metric_time__quarter
                     , subq_3.ds__year AS metric_time__year
+                    , subq_3.ds__extract_year AS metric_time__extract_year
+                    , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_3.ds__extract_month AS metric_time__extract_month
+                    , subq_3.ds__extract_week AS metric_time__extract_week
+                    , subq_3.ds__extract_day AS metric_time__extract_day
+                    , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_3.listing
                     , subq_3.user
                     , subq_3.listing__user
@@ -529,6 +543,13 @@ FROM (
                     , subq_12.ds__month AS metric_time__month
                     , subq_12.ds__quarter AS metric_time__quarter
                     , subq_12.ds__year AS metric_time__year
+                    , subq_12.ds__extract_year AS metric_time__extract_year
+                    , subq_12.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_12.ds__extract_month AS metric_time__extract_month
+                    , subq_12.ds__extract_week AS metric_time__extract_week
+                    , subq_12.ds__extract_day AS metric_time__extract_day
+                    , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_12.listing
                     , subq_12.guest
                     , subq_12.host
@@ -713,6 +734,13 @@ FROM (
                     , subq_15.ds__month AS metric_time__month
                     , subq_15.ds__quarter AS metric_time__quarter
                     , subq_15.ds__year AS metric_time__year
+                    , subq_15.ds__extract_year AS metric_time__extract_year
+                    , subq_15.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_15.ds__extract_month AS metric_time__extract_month
+                    , subq_15.ds__extract_week AS metric_time__extract_week
+                    , subq_15.ds__extract_day AS metric_time__extract_day
+                    , subq_15.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_15.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_15.listing
                     , subq_15.user
                     , subq_15.listing__user
@@ -909,6 +937,13 @@ FROM (
             , subq_24.ds__month AS metric_time__month
             , subq_24.ds__quarter AS metric_time__quarter
             , subq_24.ds__year AS metric_time__year
+            , subq_24.ds__extract_year AS metric_time__extract_year
+            , subq_24.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_24.ds__extract_month AS metric_time__extract_month
+            , subq_24.ds__extract_week AS metric_time__extract_week
+            , subq_24.ds__extract_day AS metric_time__extract_day
+            , subq_24.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_24.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_24.listing
             , subq_24.guest
             , subq_24.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
index 37ad3a608e..1f9e7a4524 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
@@ -117,6 +117,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -342,6 +349,13 @@ FROM (
             , subq_7.ds__month AS metric_time__month
             , subq_7.ds__quarter AS metric_time__quarter
             , subq_7.ds__year AS metric_time__year
+            , subq_7.ds__extract_year AS metric_time__extract_year
+            , subq_7.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_7.ds__extract_month AS metric_time__extract_month
+            , subq_7.ds__extract_week AS metric_time__extract_week
+            , subq_7.ds__extract_day AS metric_time__extract_day
+            , subq_7.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_7.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_7.listing
             , subq_7.guest
             , subq_7.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index a495423238..2d8a10e755 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -111,6 +111,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 0e4cdb1a6a..4ef0714be2 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -99,6 +99,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -292,6 +299,13 @@ FROM (
             , subq_5.ds__month AS metric_time__month
             , subq_5.ds__quarter AS metric_time__quarter
             , subq_5.ds__year AS metric_time__year
+            , subq_5.ds__extract_year AS metric_time__extract_year
+            , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_5.ds__extract_month AS metric_time__extract_month
+            , subq_5.ds__extract_week AS metric_time__extract_week
+            , subq_5.ds__extract_day AS metric_time__extract_day
+            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_5.listing
             , subq_5.user
             , subq_5.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
index c65a26cd35..db50a9f2c8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__extract_month AS listing__window_start__extract_month
-        , subq_7.window_end__extract_quarter AS listing__window_end__extract_quarter
+        , subq_7.window_start__day AS listing__window_start__day
+        , subq_7.window_end__day AS listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
         , subq_2.bookings AS bookings
@@ -112,6 +112,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -226,8 +233,8 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__extract_month
-          , subq_6.window_end__extract_quarter
+          subq_6.window_start__day
+          , subq_6.window_end__day
           , subq_6.listing
           , subq_6.user__home_state_latest
         FROM (
@@ -464,12 +471,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__extract_month
+            subq_2.metric_time__day >= subq_7.window_start__day
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.window_end__extract_quarter
+              subq_2.metric_time__day < subq_7.window_end__day
             ) OR (
-              subq_7.window_end__extract_quarter IS NULL
+              subq_7.window_end__day IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index 7633c731a1..feb5ed0fdc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,8 +23,8 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-    , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
+    listings_src_10017.active_from AS window_start__day
+    , listings_src_10017.active_to AS window_end__day
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
   FROM ***************************.dim_listings listings_src_10017
@@ -38,12 +38,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__extract_month
+      subq_13.metric_time__day >= subq_18.window_start__day
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.window_end__extract_quarter
+        subq_13.metric_time__day < subq_18.window_end__day
       ) OR (
-        subq_18.window_end__extract_quarter IS NULL
+        subq_18.window_end__day IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
index a451f1ac42..adaf16cf58 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
@@ -21,7 +21,7 @@ FROM (
       SELECT
         subq_2.metric_time__day AS metric_time__day
         , subq_7.lux_listing__window_start__day AS listing__lux_listing__window_start__day
-        , subq_7.lux_listing__window_end__extract_day AS listing__lux_listing__window_end__extract_day
+        , subq_7.lux_listing__window_end__day AS listing__lux_listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
         , subq_2.bookings AS bookings
@@ -112,6 +112,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -230,7 +237,7 @@ FROM (
         --    'listing']
         SELECT
           subq_6.lux_listing__window_start__day
-          , subq_6.lux_listing__window_end__extract_day
+          , subq_6.lux_listing__window_end__day
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
         FROM (
@@ -446,9 +453,9 @@ FROM (
             subq_2.metric_time__day >= subq_7.lux_listing__window_start__day
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_day
+              subq_2.metric_time__day < subq_7.lux_listing__window_end__day
             ) OR (
-              subq_7.lux_listing__window_end__extract_day IS NULL
+              subq_7.lux_listing__window_end__day IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index ff50adbf8b..f1b419a284 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -27,7 +27,7 @@ LEFT OUTER JOIN (
   --    'listing']
   SELECT
     lux_listings_src_10019.valid_from AS lux_listing__window_start__day
-    , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
+    , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
   FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_10018
@@ -44,9 +44,9 @@ ON
       subq_13.metric_time__day >= subq_18.lux_listing__window_start__day
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_day
+        subq_13.metric_time__day < subq_18.lux_listing__window_end__day
       ) OR (
-        subq_18.lux_listing__window_end__extract_day IS NULL
+        subq_18.lux_listing__window_end__day IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
index fbddd59f54..7638105966 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
@@ -84,6 +84,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.account_id
             , subq_0.account_month
             , subq_0.account_id__account_month
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
index eb31a4fb3a..3d8fba9b22 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
@@ -95,6 +95,13 @@ FROM (
           , subq_1.metric_time__month
           , subq_1.metric_time__quarter
           , subq_1.metric_time__year
+          , subq_1.metric_time__extract_year
+          , subq_1.metric_time__extract_quarter
+          , subq_1.metric_time__extract_month
+          , subq_1.metric_time__extract_week
+          , subq_1.metric_time__extract_day
+          , subq_1.metric_time__extract_dayofweek
+          , subq_1.metric_time__extract_dayofyear
           , subq_1.listing
           , subq_1.guest
           , subq_1.host
@@ -196,6 +203,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -391,6 +405,13 @@ CROSS JOIN (
           , subq_7.metric_time__month
           , subq_7.metric_time__quarter
           , subq_7.metric_time__year
+          , subq_7.metric_time__extract_year
+          , subq_7.metric_time__extract_quarter
+          , subq_7.metric_time__extract_month
+          , subq_7.metric_time__extract_week
+          , subq_7.metric_time__extract_day
+          , subq_7.metric_time__extract_dayofweek
+          , subq_7.metric_time__extract_dayofyear
           , subq_7.listing
           , subq_7.user
           , subq_7.listing__user
@@ -459,6 +480,13 @@ CROSS JOIN (
             , subq_6.ds__month AS metric_time__month
             , subq_6.ds__quarter AS metric_time__quarter
             , subq_6.ds__year AS metric_time__year
+            , subq_6.ds__extract_year AS metric_time__extract_year
+            , subq_6.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_6.ds__extract_month AS metric_time__extract_month
+            , subq_6.ds__extract_week AS metric_time__extract_week
+            , subq_6.ds__extract_day AS metric_time__extract_day
+            , subq_6.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_6.listing
             , subq_6.user
             , subq_6.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
index dc0afd0f09..138d3b47ca 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
@@ -116,6 +116,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -338,6 +345,13 @@ FROM (
                 , subq_5.ds__month AS metric_time__month
                 , subq_5.ds__quarter AS metric_time__quarter
                 , subq_5.ds__year AS metric_time__year
+                , subq_5.ds__extract_year AS metric_time__extract_year
+                , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_5.ds__extract_month AS metric_time__extract_month
+                , subq_5.ds__extract_week AS metric_time__extract_week
+                , subq_5.ds__extract_day AS metric_time__extract_day
+                , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_5.listing
                 , subq_5.guest
                 , subq_5.host
@@ -572,6 +586,13 @@ FROM (
             , subq_12.ds__month AS metric_time__month
             , subq_12.ds__quarter AS metric_time__quarter
             , subq_12.ds__year AS metric_time__year
+            , subq_12.ds__extract_year AS metric_time__extract_year
+            , subq_12.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_12.ds__extract_month AS metric_time__extract_month
+            , subq_12.ds__extract_week AS metric_time__extract_week
+            , subq_12.ds__extract_day AS metric_time__extract_day
+            , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_12.listing
             , subq_12.guest
             , subq_12.host
@@ -804,6 +825,13 @@ FROM (
             , subq_17.ds__month AS metric_time__month
             , subq_17.ds__quarter AS metric_time__quarter
             , subq_17.ds__year AS metric_time__year
+            , subq_17.ds__extract_year AS metric_time__extract_year
+            , subq_17.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_17.ds__extract_month AS metric_time__extract_month
+            , subq_17.ds__extract_week AS metric_time__extract_week
+            , subq_17.ds__extract_day AS metric_time__extract_day
+            , subq_17.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_17.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_17.listing
             , subq_17.guest
             , subq_17.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
index a53f3a075b..e43e265eff 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
@@ -84,6 +84,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.verification
             , subq_0.user
             , subq_0.verification__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql
index 073c7964da..d2a3c6afd9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql
@@ -99,6 +99,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -321,6 +328,13 @@ FULL OUTER JOIN (
           , subq_5.ds__month AS metric_time__month
           , subq_5.ds__quarter AS metric_time__quarter
           , subq_5.ds__year AS metric_time__year
+          , subq_5.ds__extract_year AS metric_time__extract_year
+          , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_5.ds__extract_month AS metric_time__extract_month
+          , subq_5.ds__extract_week AS metric_time__extract_week
+          , subq_5.ds__extract_day AS metric_time__extract_day
+          , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 5f9a321abd..2426067bd3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -123,6 +123,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -307,6 +314,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -484,6 +498,13 @@ FROM (
                 , subq_10.ds__month AS metric_time__month
                 , subq_10.ds__quarter AS metric_time__quarter
                 , subq_10.ds__year AS metric_time__year
+                , subq_10.ds__extract_year AS metric_time__extract_year
+                , subq_10.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_10.ds__extract_month AS metric_time__extract_month
+                , subq_10.ds__extract_week AS metric_time__extract_week
+                , subq_10.ds__extract_day AS metric_time__extract_day
+                , subq_10.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_10.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_10.listing
                 , subq_10.user
                 , subq_10.view__listing
@@ -611,6 +632,13 @@ FROM (
                 , subq_13.ds__month AS metric_time__month
                 , subq_13.ds__quarter AS metric_time__quarter
                 , subq_13.ds__year AS metric_time__year
+                , subq_13.ds__extract_year AS metric_time__extract_year
+                , subq_13.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_13.ds__extract_month AS metric_time__extract_month
+                , subq_13.ds__extract_week AS metric_time__extract_week
+                , subq_13.ds__extract_day AS metric_time__extract_day
+                , subq_13.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_13.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_13.listing
                 , subq_13.user
                 , subq_13.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
index f52c8d6acf..ad08f90e35 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
index 4e79154b70..8c2ab1a915 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
index f44071348d..8d5b07c69a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
@@ -42,6 +42,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
index 4c321e73b0..d98f0f554a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 4821d797fe..26ab44afcc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_1.metric_time__month
         , subq_1.metric_time__quarter
         , subq_1.metric_time__year
+        , subq_1.metric_time__extract_year
+        , subq_1.metric_time__extract_quarter
+        , subq_1.metric_time__extract_month
+        , subq_1.metric_time__extract_week
+        , subq_1.metric_time__extract_day
+        , subq_1.metric_time__extract_dayofweek
+        , subq_1.metric_time__extract_dayofyear
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -80,6 +87,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
index 2a39c9282f..a670ac2189 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_1.metric_time__month
         , subq_1.metric_time__quarter
         , subq_1.metric_time__year
+        , subq_1.metric_time__extract_year
+        , subq_1.metric_time__extract_quarter
+        , subq_1.metric_time__extract_month
+        , subq_1.metric_time__extract_week
+        , subq_1.metric_time__extract_day
+        , subq_1.metric_time__extract_dayofweek
+        , subq_1.metric_time__extract_dayofyear
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -80,6 +87,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql
index 82ded0a878..3d88c96009 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -326,6 +333,13 @@ FROM (
             , subq_5.ds__month AS metric_time__month
             , subq_5.ds__quarter AS metric_time__quarter
             , subq_5.ds__year AS metric_time__year
+            , subq_5.ds__extract_year AS metric_time__extract_year
+            , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_5.ds__extract_month AS metric_time__extract_month
+            , subq_5.ds__extract_week AS metric_time__extract_week
+            , subq_5.ds__extract_day AS metric_time__extract_day
+            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_5.listing
             , subq_5.guest
             , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
index f21c6e33a7..e2ff275b47 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 34b929887f..13d462ce84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
index dc71eeec86..d22bf333b1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index de37ca714a..7255f068da 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index eb915512e3..aa40a31b84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -207,6 +207,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -535,6 +542,13 @@ FROM (
               , subq_8.ds__month AS metric_time__month
               , subq_8.ds__quarter AS metric_time__quarter
               , subq_8.ds__year AS metric_time__year
+              , subq_8.ds__extract_year AS metric_time__extract_year
+              , subq_8.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_8.ds__extract_month AS metric_time__extract_month
+              , subq_8.ds__extract_week AS metric_time__extract_week
+              , subq_8.ds__extract_day AS metric_time__extract_day
+              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index bd5554a5b6..e829053048 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -207,6 +207,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -536,6 +543,13 @@ FROM (
               , subq_8.ds__month AS metric_time__month
               , subq_8.ds__quarter AS metric_time__quarter
               , subq_8.ds__year AS metric_time__year
+              , subq_8.ds__extract_year AS metric_time__extract_year
+              , subq_8.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_8.ds__extract_month AS metric_time__extract_month
+              , subq_8.ds__extract_week AS metric_time__extract_week
+              , subq_8.ds__extract_day AS metric_time__extract_day
+              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
index 209f65b14c..106574c4c7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
@@ -201,6 +201,13 @@ FROM (
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
             , subq_1.metric_time__year AS metric_time__year
+            , subq_1.metric_time__extract_year AS metric_time__extract_year
+            , subq_1.metric_time__extract_quarter AS metric_time__extract_quarter
+            , subq_1.metric_time__extract_month AS metric_time__extract_month
+            , subq_1.metric_time__extract_week AS metric_time__extract_week
+            , subq_1.metric_time__extract_day AS metric_time__extract_day
+            , subq_1.metric_time__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_1.metric_time__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -308,6 +315,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 6b3ac53490..16a95d6b9f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -201,6 +201,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql
index 3adff18e62..693e200db3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql
@@ -114,6 +114,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -298,6 +305,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
index eb70f04221..1a6844636c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -120,6 +120,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -304,6 +311,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
index fa5e69d429..08dd31437a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
@@ -30,8 +30,8 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__extract_week AS listing__window_start__extract_week
-            , subq_4.window_end__day AS listing__window_end__day
+            , subq_4.window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
+            , subq_4.window_end__extract_quarter AS listing__window_end__extract_quarter
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -122,6 +122,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -236,8 +243,8 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__extract_week
-              , subq_3.window_end__day
+              subq_3.window_start__extract_dayofyear
+              , subq_3.window_end__extract_quarter
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -308,12 +315,12 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__extract_week
+                subq_2.metric_time__day >= subq_4.window_start__extract_dayofyear
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__day
+                  subq_2.metric_time__day < subq_4.window_end__extract_quarter
                 ) OR (
-                  subq_4.window_end__day IS NULL
+                  subq_4.window_end__extract_quarter IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
index fcdd8a3083..297e00735f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,12 +32,12 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= EXTRACT(WEEK FROM listings_src_10017.active_from)
+        subq_12.metric_time__day >= EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from)
       ) AND (
         (
-          subq_12.metric_time__day < listings_src_10017.active_to
+          subq_12.metric_time__day < EXTRACT(QUARTER FROM listings_src_10017.active_to)
         ) OR (
-          listings_src_10017.active_to IS NULL
+          EXTRACT(QUARTER FROM listings_src_10017.active_to) IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 6ef8853985..141c4fba09 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 8e64ced98e..abf246ee40 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
index 16e8afe8d0..7c85ab1cdb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql
index b00d690648..e89a957806 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql
@@ -98,6 +98,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
index 583b4a4bf0..436f0e7545 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
@@ -69,6 +69,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.listing
         , subq_0.user
         , subq_0.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql
index 437dc887b4..9223eebd6e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql
@@ -132,6 +132,13 @@ FROM (
                     , subq_0.ds__month AS metric_time__month
                     , subq_0.ds__quarter AS metric_time__quarter
                     , subq_0.ds__year AS metric_time__year
+                    , subq_0.ds__extract_year AS metric_time__extract_year
+                    , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_0.ds__extract_month AS metric_time__extract_month
+                    , subq_0.ds__extract_week AS metric_time__extract_week
+                    , subq_0.ds__extract_day AS metric_time__extract_day
+                    , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_0.listing
                     , subq_0.guest
                     , subq_0.host
@@ -316,6 +323,13 @@ FROM (
                     , subq_3.ds__month AS metric_time__month
                     , subq_3.ds__quarter AS metric_time__quarter
                     , subq_3.ds__year AS metric_time__year
+                    , subq_3.ds__extract_year AS metric_time__extract_year
+                    , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_3.ds__extract_month AS metric_time__extract_month
+                    , subq_3.ds__extract_week AS metric_time__extract_week
+                    , subq_3.ds__extract_day AS metric_time__extract_day
+                    , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_3.listing
                     , subq_3.user
                     , subq_3.listing__user
@@ -529,6 +543,13 @@ FROM (
                     , subq_12.ds__month AS metric_time__month
                     , subq_12.ds__quarter AS metric_time__quarter
                     , subq_12.ds__year AS metric_time__year
+                    , subq_12.ds__extract_year AS metric_time__extract_year
+                    , subq_12.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_12.ds__extract_month AS metric_time__extract_month
+                    , subq_12.ds__extract_week AS metric_time__extract_week
+                    , subq_12.ds__extract_day AS metric_time__extract_day
+                    , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_12.listing
                     , subq_12.guest
                     , subq_12.host
@@ -713,6 +734,13 @@ FROM (
                     , subq_15.ds__month AS metric_time__month
                     , subq_15.ds__quarter AS metric_time__quarter
                     , subq_15.ds__year AS metric_time__year
+                    , subq_15.ds__extract_year AS metric_time__extract_year
+                    , subq_15.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_15.ds__extract_month AS metric_time__extract_month
+                    , subq_15.ds__extract_week AS metric_time__extract_week
+                    , subq_15.ds__extract_day AS metric_time__extract_day
+                    , subq_15.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_15.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_15.listing
                     , subq_15.user
                     , subq_15.listing__user
@@ -909,6 +937,13 @@ FROM (
             , subq_24.ds__month AS metric_time__month
             , subq_24.ds__quarter AS metric_time__quarter
             , subq_24.ds__year AS metric_time__year
+            , subq_24.ds__extract_year AS metric_time__extract_year
+            , subq_24.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_24.ds__extract_month AS metric_time__extract_month
+            , subq_24.ds__extract_week AS metric_time__extract_week
+            , subq_24.ds__extract_day AS metric_time__extract_day
+            , subq_24.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_24.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_24.listing
             , subq_24.guest
             , subq_24.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
index 9626242169..0512790e47 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
@@ -117,6 +117,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -342,6 +349,13 @@ FROM (
             , subq_7.ds__month AS metric_time__month
             , subq_7.ds__quarter AS metric_time__quarter
             , subq_7.ds__year AS metric_time__year
+            , subq_7.ds__extract_year AS metric_time__extract_year
+            , subq_7.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_7.ds__extract_month AS metric_time__extract_month
+            , subq_7.ds__extract_week AS metric_time__extract_week
+            , subq_7.ds__extract_day AS metric_time__extract_day
+            , subq_7.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_7.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_7.listing
             , subq_7.guest
             , subq_7.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index a495423238..2d8a10e755 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -111,6 +111,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index c868e3cfd9..f000943d3d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -99,6 +99,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -292,6 +299,13 @@ FROM (
             , subq_5.ds__month AS metric_time__month
             , subq_5.ds__quarter AS metric_time__quarter
             , subq_5.ds__year AS metric_time__year
+            , subq_5.ds__extract_year AS metric_time__extract_year
+            , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_5.ds__extract_month AS metric_time__extract_month
+            , subq_5.ds__extract_week AS metric_time__extract_week
+            , subq_5.ds__extract_day AS metric_time__extract_day
+            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_5.listing
             , subq_5.user
             , subq_5.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
index 760a9d333e..0bcca6489b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,7 +20,7 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__extract_week AS listing__window_start__extract_week
+        , subq_7.window_start__extract_day AS listing__window_start__extract_day
         , subq_7.window_end__day AS listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
@@ -112,6 +112,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -226,7 +233,7 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__extract_week
+          subq_6.window_start__extract_day
           , subq_6.window_end__day
           , subq_6.listing
           , subq_6.user__home_state_latest
@@ -464,7 +471,7 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__extract_week
+            subq_2.metric_time__day >= subq_7.window_start__extract_day
           ) AND (
             (
               subq_2.metric_time__day < subq_7.window_end__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index 579c5ff3a6..fdc48352dd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,7 +23,7 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+    EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
     , listings_src_10017.active_to AS window_end__day
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
@@ -38,7 +38,7 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__extract_week
+      subq_13.metric_time__day >= subq_18.window_start__extract_day
     ) AND (
       (
         subq_13.metric_time__day < subq_18.window_end__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
index 138a7d9525..bc41ed72fa 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
@@ -112,6 +112,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
index fbddd59f54..7638105966 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
@@ -84,6 +84,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.account_id
             , subq_0.account_month
             , subq_0.account_id__account_month
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
index eb31a4fb3a..3d8fba9b22 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
@@ -95,6 +95,13 @@ FROM (
           , subq_1.metric_time__month
           , subq_1.metric_time__quarter
           , subq_1.metric_time__year
+          , subq_1.metric_time__extract_year
+          , subq_1.metric_time__extract_quarter
+          , subq_1.metric_time__extract_month
+          , subq_1.metric_time__extract_week
+          , subq_1.metric_time__extract_day
+          , subq_1.metric_time__extract_dayofweek
+          , subq_1.metric_time__extract_dayofyear
           , subq_1.listing
           , subq_1.guest
           , subq_1.host
@@ -196,6 +203,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -391,6 +405,13 @@ CROSS JOIN (
           , subq_7.metric_time__month
           , subq_7.metric_time__quarter
           , subq_7.metric_time__year
+          , subq_7.metric_time__extract_year
+          , subq_7.metric_time__extract_quarter
+          , subq_7.metric_time__extract_month
+          , subq_7.metric_time__extract_week
+          , subq_7.metric_time__extract_day
+          , subq_7.metric_time__extract_dayofweek
+          , subq_7.metric_time__extract_dayofyear
           , subq_7.listing
           , subq_7.user
           , subq_7.listing__user
@@ -459,6 +480,13 @@ CROSS JOIN (
             , subq_6.ds__month AS metric_time__month
             , subq_6.ds__quarter AS metric_time__quarter
             , subq_6.ds__year AS metric_time__year
+            , subq_6.ds__extract_year AS metric_time__extract_year
+            , subq_6.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_6.ds__extract_month AS metric_time__extract_month
+            , subq_6.ds__extract_week AS metric_time__extract_week
+            , subq_6.ds__extract_day AS metric_time__extract_day
+            , subq_6.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_6.listing
             , subq_6.user
             , subq_6.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql
index dc0afd0f09..138d3b47ca 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql
@@ -116,6 +116,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -338,6 +345,13 @@ FROM (
                 , subq_5.ds__month AS metric_time__month
                 , subq_5.ds__quarter AS metric_time__quarter
                 , subq_5.ds__year AS metric_time__year
+                , subq_5.ds__extract_year AS metric_time__extract_year
+                , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_5.ds__extract_month AS metric_time__extract_month
+                , subq_5.ds__extract_week AS metric_time__extract_week
+                , subq_5.ds__extract_day AS metric_time__extract_day
+                , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_5.listing
                 , subq_5.guest
                 , subq_5.host
@@ -572,6 +586,13 @@ FROM (
             , subq_12.ds__month AS metric_time__month
             , subq_12.ds__quarter AS metric_time__quarter
             , subq_12.ds__year AS metric_time__year
+            , subq_12.ds__extract_year AS metric_time__extract_year
+            , subq_12.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_12.ds__extract_month AS metric_time__extract_month
+            , subq_12.ds__extract_week AS metric_time__extract_week
+            , subq_12.ds__extract_day AS metric_time__extract_day
+            , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_12.listing
             , subq_12.guest
             , subq_12.host
@@ -804,6 +825,13 @@ FROM (
             , subq_17.ds__month AS metric_time__month
             , subq_17.ds__quarter AS metric_time__quarter
             , subq_17.ds__year AS metric_time__year
+            , subq_17.ds__extract_year AS metric_time__extract_year
+            , subq_17.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_17.ds__extract_month AS metric_time__extract_month
+            , subq_17.ds__extract_week AS metric_time__extract_week
+            , subq_17.ds__extract_day AS metric_time__extract_day
+            , subq_17.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_17.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_17.listing
             , subq_17.guest
             , subq_17.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql
index a53f3a075b..e43e265eff 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql
@@ -84,6 +84,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.verification
             , subq_0.user
             , subq_0.verification__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql
index 073c7964da..d2a3c6afd9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql
@@ -99,6 +99,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -321,6 +328,13 @@ FULL OUTER JOIN (
           , subq_5.ds__month AS metric_time__month
           , subq_5.ds__quarter AS metric_time__quarter
           , subq_5.ds__year AS metric_time__year
+          , subq_5.ds__extract_year AS metric_time__extract_year
+          , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_5.ds__extract_month AS metric_time__extract_month
+          , subq_5.ds__extract_week AS metric_time__extract_week
+          , subq_5.ds__extract_day AS metric_time__extract_day
+          , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 5f9a321abd..2426067bd3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -123,6 +123,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -307,6 +314,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -484,6 +498,13 @@ FROM (
                 , subq_10.ds__month AS metric_time__month
                 , subq_10.ds__quarter AS metric_time__quarter
                 , subq_10.ds__year AS metric_time__year
+                , subq_10.ds__extract_year AS metric_time__extract_year
+                , subq_10.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_10.ds__extract_month AS metric_time__extract_month
+                , subq_10.ds__extract_week AS metric_time__extract_week
+                , subq_10.ds__extract_day AS metric_time__extract_day
+                , subq_10.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_10.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_10.listing
                 , subq_10.user
                 , subq_10.view__listing
@@ -611,6 +632,13 @@ FROM (
                 , subq_13.ds__month AS metric_time__month
                 , subq_13.ds__quarter AS metric_time__quarter
                 , subq_13.ds__year AS metric_time__year
+                , subq_13.ds__extract_year AS metric_time__extract_year
+                , subq_13.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_13.ds__extract_month AS metric_time__extract_month
+                , subq_13.ds__extract_week AS metric_time__extract_week
+                , subq_13.ds__extract_day AS metric_time__extract_day
+                , subq_13.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_13.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_13.listing
                 , subq_13.user
                 , subq_13.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
index f52c8d6acf..ad08f90e35 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
index 4e79154b70..8c2ab1a915 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
index f44071348d..8d5b07c69a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
@@ -42,6 +42,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
index 4c321e73b0..d98f0f554a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 4821d797fe..26ab44afcc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_1.metric_time__month
         , subq_1.metric_time__quarter
         , subq_1.metric_time__year
+        , subq_1.metric_time__extract_year
+        , subq_1.metric_time__extract_quarter
+        , subq_1.metric_time__extract_month
+        , subq_1.metric_time__extract_week
+        , subq_1.metric_time__extract_day
+        , subq_1.metric_time__extract_dayofweek
+        , subq_1.metric_time__extract_dayofyear
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -80,6 +87,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
index 2a39c9282f..a670ac2189 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_1.metric_time__month
         , subq_1.metric_time__quarter
         , subq_1.metric_time__year
+        , subq_1.metric_time__extract_year
+        , subq_1.metric_time__extract_quarter
+        , subq_1.metric_time__extract_month
+        , subq_1.metric_time__extract_week
+        , subq_1.metric_time__extract_day
+        , subq_1.metric_time__extract_dayofweek
+        , subq_1.metric_time__extract_dayofyear
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -80,6 +87,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql
index 82ded0a878..3d88c96009 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -326,6 +333,13 @@ FROM (
             , subq_5.ds__month AS metric_time__month
             , subq_5.ds__quarter AS metric_time__quarter
             , subq_5.ds__year AS metric_time__year
+            , subq_5.ds__extract_year AS metric_time__extract_year
+            , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_5.ds__extract_month AS metric_time__extract_month
+            , subq_5.ds__extract_week AS metric_time__extract_week
+            , subq_5.ds__extract_day AS metric_time__extract_day
+            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_5.listing
             , subq_5.guest
             , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
index f21c6e33a7..e2ff275b47 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 34b929887f..13d462ce84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
index 44073119ae..e3607ad97a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 66bd68c2c6..71e89d4432 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 9ab70d9a6a..9967c13e88 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -207,6 +207,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -535,6 +542,13 @@ FROM (
               , subq_8.ds__month AS metric_time__month
               , subq_8.ds__quarter AS metric_time__quarter
               , subq_8.ds__year AS metric_time__year
+              , subq_8.ds__extract_year AS metric_time__extract_year
+              , subq_8.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_8.ds__extract_month AS metric_time__extract_month
+              , subq_8.ds__extract_week AS metric_time__extract_week
+              , subq_8.ds__extract_day AS metric_time__extract_day
+              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 34b0e577f7..b76e01d113 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -207,6 +207,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -536,6 +543,13 @@ FROM (
               , subq_8.ds__month AS metric_time__month
               , subq_8.ds__quarter AS metric_time__quarter
               , subq_8.ds__year AS metric_time__year
+              , subq_8.ds__extract_year AS metric_time__extract_year
+              , subq_8.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_8.ds__extract_month AS metric_time__extract_month
+              , subq_8.ds__extract_week AS metric_time__extract_week
+              , subq_8.ds__extract_day AS metric_time__extract_day
+              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
index 390f041085..615aae3ac7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
@@ -201,6 +201,13 @@ FROM (
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
             , subq_1.metric_time__year AS metric_time__year
+            , subq_1.metric_time__extract_year AS metric_time__extract_year
+            , subq_1.metric_time__extract_quarter AS metric_time__extract_quarter
+            , subq_1.metric_time__extract_month AS metric_time__extract_month
+            , subq_1.metric_time__extract_week AS metric_time__extract_week
+            , subq_1.metric_time__extract_day AS metric_time__extract_day
+            , subq_1.metric_time__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_1.metric_time__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -308,6 +315,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 3c8d87a17b..6f115474ac 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -201,6 +201,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql
index 3adff18e62..693e200db3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql
@@ -114,6 +114,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -298,6 +305,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
index eb70f04221..1a6844636c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -120,6 +120,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -304,6 +311,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
index 246522e063..ff0c914625 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
@@ -30,8 +30,8 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__extract_month AS listing__window_start__extract_month
-            , subq_4.window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
+            , subq_4.window_start__extract_year AS listing__window_start__extract_year
+            , subq_4.window_end__extract_year AS listing__window_end__extract_year
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -122,6 +122,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -236,8 +243,8 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__extract_month
-              , subq_3.window_end__extract_dayofweek
+              subq_3.window_start__extract_year
+              , subq_3.window_end__extract_year
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -308,12 +315,12 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__extract_month
+                subq_2.metric_time__day >= subq_4.window_start__extract_year
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__extract_dayofweek
+                  subq_2.metric_time__day < subq_4.window_end__extract_year
                 ) OR (
-                  subq_4.window_end__extract_dayofweek IS NULL
+                  subq_4.window_end__extract_year IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
index 710e67b149..c37cd61528 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,12 +32,12 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= EXTRACT(MONTH FROM listings_src_10017.active_from)
+        subq_12.metric_time__day >= EXTRACT(YEAR FROM listings_src_10017.active_from)
       ) AND (
         (
-          subq_12.metric_time__day < EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to)
+          subq_12.metric_time__day < EXTRACT(YEAR FROM listings_src_10017.active_to)
         ) OR (
-          EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) IS NULL
+          EXTRACT(YEAR FROM listings_src_10017.active_to) IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 6ef8853985..141c4fba09 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 29fb5d972e..a2adc126d3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
index 16e8afe8d0..7c85ab1cdb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql
index b00d690648..e89a957806 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql
@@ -98,6 +98,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
index 583b4a4bf0..436f0e7545 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
@@ -69,6 +69,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.listing
         , subq_0.user
         , subq_0.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql
index 437dc887b4..9223eebd6e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql
@@ -132,6 +132,13 @@ FROM (
                     , subq_0.ds__month AS metric_time__month
                     , subq_0.ds__quarter AS metric_time__quarter
                     , subq_0.ds__year AS metric_time__year
+                    , subq_0.ds__extract_year AS metric_time__extract_year
+                    , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_0.ds__extract_month AS metric_time__extract_month
+                    , subq_0.ds__extract_week AS metric_time__extract_week
+                    , subq_0.ds__extract_day AS metric_time__extract_day
+                    , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_0.listing
                     , subq_0.guest
                     , subq_0.host
@@ -316,6 +323,13 @@ FROM (
                     , subq_3.ds__month AS metric_time__month
                     , subq_3.ds__quarter AS metric_time__quarter
                     , subq_3.ds__year AS metric_time__year
+                    , subq_3.ds__extract_year AS metric_time__extract_year
+                    , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_3.ds__extract_month AS metric_time__extract_month
+                    , subq_3.ds__extract_week AS metric_time__extract_week
+                    , subq_3.ds__extract_day AS metric_time__extract_day
+                    , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_3.listing
                     , subq_3.user
                     , subq_3.listing__user
@@ -529,6 +543,13 @@ FROM (
                     , subq_12.ds__month AS metric_time__month
                     , subq_12.ds__quarter AS metric_time__quarter
                     , subq_12.ds__year AS metric_time__year
+                    , subq_12.ds__extract_year AS metric_time__extract_year
+                    , subq_12.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_12.ds__extract_month AS metric_time__extract_month
+                    , subq_12.ds__extract_week AS metric_time__extract_week
+                    , subq_12.ds__extract_day AS metric_time__extract_day
+                    , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_12.listing
                     , subq_12.guest
                     , subq_12.host
@@ -713,6 +734,13 @@ FROM (
                     , subq_15.ds__month AS metric_time__month
                     , subq_15.ds__quarter AS metric_time__quarter
                     , subq_15.ds__year AS metric_time__year
+                    , subq_15.ds__extract_year AS metric_time__extract_year
+                    , subq_15.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_15.ds__extract_month AS metric_time__extract_month
+                    , subq_15.ds__extract_week AS metric_time__extract_week
+                    , subq_15.ds__extract_day AS metric_time__extract_day
+                    , subq_15.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_15.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_15.listing
                     , subq_15.user
                     , subq_15.listing__user
@@ -909,6 +937,13 @@ FROM (
             , subq_24.ds__month AS metric_time__month
             , subq_24.ds__quarter AS metric_time__quarter
             , subq_24.ds__year AS metric_time__year
+            , subq_24.ds__extract_year AS metric_time__extract_year
+            , subq_24.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_24.ds__extract_month AS metric_time__extract_month
+            , subq_24.ds__extract_week AS metric_time__extract_week
+            , subq_24.ds__extract_day AS metric_time__extract_day
+            , subq_24.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_24.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_24.listing
             , subq_24.guest
             , subq_24.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
index 9626242169..0512790e47 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
@@ -117,6 +117,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -342,6 +349,13 @@ FROM (
             , subq_7.ds__month AS metric_time__month
             , subq_7.ds__quarter AS metric_time__quarter
             , subq_7.ds__year AS metric_time__year
+            , subq_7.ds__extract_year AS metric_time__extract_year
+            , subq_7.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_7.ds__extract_month AS metric_time__extract_month
+            , subq_7.ds__extract_week AS metric_time__extract_week
+            , subq_7.ds__extract_day AS metric_time__extract_day
+            , subq_7.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_7.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_7.listing
             , subq_7.guest
             , subq_7.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index a495423238..2d8a10e755 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -111,6 +111,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index c868e3cfd9..f000943d3d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -99,6 +99,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -292,6 +299,13 @@ FROM (
             , subq_5.ds__month AS metric_time__month
             , subq_5.ds__quarter AS metric_time__quarter
             , subq_5.ds__year AS metric_time__year
+            , subq_5.ds__extract_year AS metric_time__extract_year
+            , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_5.ds__extract_month AS metric_time__extract_month
+            , subq_5.ds__extract_week AS metric_time__extract_week
+            , subq_5.ds__extract_day AS metric_time__extract_day
+            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_5.listing
             , subq_5.user
             , subq_5.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
index 677ba894bd..6644918147 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__extract_month AS listing__window_start__extract_month
-        , subq_7.window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
+        , subq_7.window_start__extract_year AS listing__window_start__extract_year
+        , subq_7.window_end__extract_year AS listing__window_end__extract_year
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
         , subq_2.bookings AS bookings
@@ -112,6 +112,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -226,8 +233,8 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__extract_month
-          , subq_6.window_end__extract_dayofweek
+          subq_6.window_start__extract_year
+          , subq_6.window_end__extract_year
           , subq_6.listing
           , subq_6.user__home_state_latest
         FROM (
@@ -464,12 +471,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__extract_month
+            subq_2.metric_time__day >= subq_7.window_start__extract_year
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.window_end__extract_dayofweek
+              subq_2.metric_time__day < subq_7.window_end__extract_year
             ) OR (
-              subq_7.window_end__extract_dayofweek IS NULL
+              subq_7.window_end__extract_year IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index 425b62e62c..8fcb6ec7af 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,8 +23,8 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-    , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
+    EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
+    , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
   FROM ***************************.dim_listings listings_src_10017
@@ -38,12 +38,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__extract_month
+      subq_13.metric_time__day >= subq_18.window_start__extract_year
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.window_end__extract_dayofweek
+        subq_13.metric_time__day < subq_18.window_end__extract_year
       ) OR (
-        subq_18.window_end__extract_dayofweek IS NULL
+        subq_18.window_end__extract_year IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
index 72619bc97f..9397ea8d7a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.lux_listing__window_start__extract_quarter AS listing__lux_listing__window_start__extract_quarter
-        , subq_7.lux_listing__window_end__extract_dayofweek AS listing__lux_listing__window_end__extract_dayofweek
+        , subq_7.lux_listing__window_start__extract_dayofweek AS listing__lux_listing__window_start__extract_dayofweek
+        , subq_7.lux_listing__window_end__day AS listing__lux_listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
         , subq_2.bookings AS bookings
@@ -112,6 +112,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -229,8 +236,8 @@ FROM (
         --    'lux_listing__window_end__day',
         --    'listing']
         SELECT
-          subq_6.lux_listing__window_start__extract_quarter
-          , subq_6.lux_listing__window_end__extract_dayofweek
+          subq_6.lux_listing__window_start__extract_dayofweek
+          , subq_6.lux_listing__window_end__day
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
         FROM (
@@ -443,12 +450,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_quarter
+            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_dayofweek
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_dayofweek
+              subq_2.metric_time__day < subq_7.lux_listing__window_end__day
             ) OR (
-              subq_7.lux_listing__window_end__extract_dayofweek IS NULL
+              subq_7.lux_listing__window_end__day IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index d0d8ae085c..926cc6d3ad 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -26,8 +26,8 @@ LEFT OUTER JOIN (
   --    'lux_listing__window_end__day',
   --    'listing']
   SELECT
-    EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
-    , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
+    EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
+    , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
   FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_10018
@@ -41,12 +41,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_quarter
+      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_dayofweek
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_dayofweek
+        subq_13.metric_time__day < subq_18.lux_listing__window_end__day
       ) OR (
-        subq_18.lux_listing__window_end__extract_dayofweek IS NULL
+        subq_18.lux_listing__window_end__day IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
index fbddd59f54..7638105966 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
@@ -84,6 +84,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.account_id
             , subq_0.account_month
             , subq_0.account_id__account_month
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
index eb31a4fb3a..3d8fba9b22 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
@@ -95,6 +95,13 @@ FROM (
           , subq_1.metric_time__month
           , subq_1.metric_time__quarter
           , subq_1.metric_time__year
+          , subq_1.metric_time__extract_year
+          , subq_1.metric_time__extract_quarter
+          , subq_1.metric_time__extract_month
+          , subq_1.metric_time__extract_week
+          , subq_1.metric_time__extract_day
+          , subq_1.metric_time__extract_dayofweek
+          , subq_1.metric_time__extract_dayofyear
           , subq_1.listing
           , subq_1.guest
           , subq_1.host
@@ -196,6 +203,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -391,6 +405,13 @@ CROSS JOIN (
           , subq_7.metric_time__month
           , subq_7.metric_time__quarter
           , subq_7.metric_time__year
+          , subq_7.metric_time__extract_year
+          , subq_7.metric_time__extract_quarter
+          , subq_7.metric_time__extract_month
+          , subq_7.metric_time__extract_week
+          , subq_7.metric_time__extract_day
+          , subq_7.metric_time__extract_dayofweek
+          , subq_7.metric_time__extract_dayofyear
           , subq_7.listing
           , subq_7.user
           , subq_7.listing__user
@@ -459,6 +480,13 @@ CROSS JOIN (
             , subq_6.ds__month AS metric_time__month
             , subq_6.ds__quarter AS metric_time__quarter
             , subq_6.ds__year AS metric_time__year
+            , subq_6.ds__extract_year AS metric_time__extract_year
+            , subq_6.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_6.ds__extract_month AS metric_time__extract_month
+            , subq_6.ds__extract_week AS metric_time__extract_week
+            , subq_6.ds__extract_day AS metric_time__extract_day
+            , subq_6.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_6.listing
             , subq_6.user
             , subq_6.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql
index dc0afd0f09..138d3b47ca 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql
@@ -116,6 +116,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -338,6 +345,13 @@ FROM (
                 , subq_5.ds__month AS metric_time__month
                 , subq_5.ds__quarter AS metric_time__quarter
                 , subq_5.ds__year AS metric_time__year
+                , subq_5.ds__extract_year AS metric_time__extract_year
+                , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_5.ds__extract_month AS metric_time__extract_month
+                , subq_5.ds__extract_week AS metric_time__extract_week
+                , subq_5.ds__extract_day AS metric_time__extract_day
+                , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_5.listing
                 , subq_5.guest
                 , subq_5.host
@@ -572,6 +586,13 @@ FROM (
             , subq_12.ds__month AS metric_time__month
             , subq_12.ds__quarter AS metric_time__quarter
             , subq_12.ds__year AS metric_time__year
+            , subq_12.ds__extract_year AS metric_time__extract_year
+            , subq_12.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_12.ds__extract_month AS metric_time__extract_month
+            , subq_12.ds__extract_week AS metric_time__extract_week
+            , subq_12.ds__extract_day AS metric_time__extract_day
+            , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_12.listing
             , subq_12.guest
             , subq_12.host
@@ -804,6 +825,13 @@ FROM (
             , subq_17.ds__month AS metric_time__month
             , subq_17.ds__quarter AS metric_time__quarter
             , subq_17.ds__year AS metric_time__year
+            , subq_17.ds__extract_year AS metric_time__extract_year
+            , subq_17.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_17.ds__extract_month AS metric_time__extract_month
+            , subq_17.ds__extract_week AS metric_time__extract_week
+            , subq_17.ds__extract_day AS metric_time__extract_day
+            , subq_17.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_17.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_17.listing
             , subq_17.guest
             , subq_17.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql
index a53f3a075b..e43e265eff 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql
@@ -84,6 +84,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.verification
             , subq_0.user
             , subq_0.verification__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql
index 073c7964da..d2a3c6afd9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql
@@ -99,6 +99,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -321,6 +328,13 @@ FULL OUTER JOIN (
           , subq_5.ds__month AS metric_time__month
           , subq_5.ds__quarter AS metric_time__quarter
           , subq_5.ds__year AS metric_time__year
+          , subq_5.ds__extract_year AS metric_time__extract_year
+          , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_5.ds__extract_month AS metric_time__extract_month
+          , subq_5.ds__extract_week AS metric_time__extract_week
+          , subq_5.ds__extract_day AS metric_time__extract_day
+          , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index d5d52443ea..c45302afaf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -123,6 +123,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -307,6 +314,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -484,6 +498,13 @@ FROM (
                 , subq_10.ds__month AS metric_time__month
                 , subq_10.ds__quarter AS metric_time__quarter
                 , subq_10.ds__year AS metric_time__year
+                , subq_10.ds__extract_year AS metric_time__extract_year
+                , subq_10.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_10.ds__extract_month AS metric_time__extract_month
+                , subq_10.ds__extract_week AS metric_time__extract_week
+                , subq_10.ds__extract_day AS metric_time__extract_day
+                , subq_10.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_10.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_10.listing
                 , subq_10.user
                 , subq_10.view__listing
@@ -611,6 +632,13 @@ FROM (
                 , subq_13.ds__month AS metric_time__month
                 , subq_13.ds__quarter AS metric_time__quarter
                 , subq_13.ds__year AS metric_time__year
+                , subq_13.ds__extract_year AS metric_time__extract_year
+                , subq_13.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_13.ds__extract_month AS metric_time__extract_month
+                , subq_13.ds__extract_week AS metric_time__extract_week
+                , subq_13.ds__extract_day AS metric_time__extract_day
+                , subq_13.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_13.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_13.listing
                 , subq_13.user
                 , subq_13.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
index f52c8d6acf..ad08f90e35 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
index 4e79154b70..8c2ab1a915 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
index f44071348d..8d5b07c69a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
@@ -42,6 +42,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
index 4c321e73b0..d98f0f554a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 4821d797fe..26ab44afcc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_1.metric_time__month
         , subq_1.metric_time__quarter
         , subq_1.metric_time__year
+        , subq_1.metric_time__extract_year
+        , subq_1.metric_time__extract_quarter
+        , subq_1.metric_time__extract_month
+        , subq_1.metric_time__extract_week
+        , subq_1.metric_time__extract_day
+        , subq_1.metric_time__extract_dayofweek
+        , subq_1.metric_time__extract_dayofyear
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -80,6 +87,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
index 2a39c9282f..a670ac2189 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -45,6 +45,13 @@ FROM (
         , subq_1.metric_time__month
         , subq_1.metric_time__quarter
         , subq_1.metric_time__year
+        , subq_1.metric_time__extract_year
+        , subq_1.metric_time__extract_quarter
+        , subq_1.metric_time__extract_month
+        , subq_1.metric_time__extract_week
+        , subq_1.metric_time__extract_day
+        , subq_1.metric_time__extract_dayofweek
+        , subq_1.metric_time__extract_dayofyear
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -80,6 +87,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql
index 82ded0a878..3d88c96009 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -326,6 +333,13 @@ FROM (
             , subq_5.ds__month AS metric_time__month
             , subq_5.ds__quarter AS metric_time__quarter
             , subq_5.ds__year AS metric_time__year
+            , subq_5.ds__extract_year AS metric_time__extract_year
+            , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_5.ds__extract_month AS metric_time__extract_month
+            , subq_5.ds__extract_week AS metric_time__extract_week
+            , subq_5.ds__extract_day AS metric_time__extract_day
+            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_5.listing
             , subq_5.guest
             , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
index f21c6e33a7..e2ff275b47 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 34b929887f..13d462ce84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
index 44073119ae..e3607ad97a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 66bd68c2c6..71e89d4432 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -104,6 +104,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -429,6 +436,13 @@ FROM (
               , subq_5.ds__month AS metric_time__month
               , subq_5.ds__quarter AS metric_time__quarter
               , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 9ab70d9a6a..9967c13e88 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -207,6 +207,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -535,6 +542,13 @@ FROM (
               , subq_8.ds__month AS metric_time__month
               , subq_8.ds__quarter AS metric_time__quarter
               , subq_8.ds__year AS metric_time__year
+              , subq_8.ds__extract_year AS metric_time__extract_year
+              , subq_8.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_8.ds__extract_month AS metric_time__extract_month
+              , subq_8.ds__extract_week AS metric_time__extract_week
+              , subq_8.ds__extract_day AS metric_time__extract_day
+              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 34b0e577f7..b76e01d113 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -207,6 +207,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -536,6 +543,13 @@ FROM (
               , subq_8.ds__month AS metric_time__month
               , subq_8.ds__quarter AS metric_time__quarter
               , subq_8.ds__year AS metric_time__year
+              , subq_8.ds__extract_year AS metric_time__extract_year
+              , subq_8.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_8.ds__extract_month AS metric_time__extract_month
+              , subq_8.ds__extract_week AS metric_time__extract_week
+              , subq_8.ds__extract_day AS metric_time__extract_day
+              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
index 390f041085..615aae3ac7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
@@ -201,6 +201,13 @@ FROM (
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
             , subq_1.metric_time__year AS metric_time__year
+            , subq_1.metric_time__extract_year AS metric_time__extract_year
+            , subq_1.metric_time__extract_quarter AS metric_time__extract_quarter
+            , subq_1.metric_time__extract_month AS metric_time__extract_month
+            , subq_1.metric_time__extract_week AS metric_time__extract_week
+            , subq_1.metric_time__extract_day AS metric_time__extract_day
+            , subq_1.metric_time__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_1.metric_time__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -308,6 +315,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 3c8d87a17b..6f115474ac 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -201,6 +201,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql
index 3adff18e62..693e200db3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql
@@ -114,6 +114,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -298,6 +305,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
index eb70f04221..1a6844636c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -120,6 +120,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -304,6 +311,13 @@ FROM (
                 , subq_3.ds__month AS metric_time__month
                 , subq_3.ds__quarter AS metric_time__quarter
                 , subq_3.ds__year AS metric_time__year
+                , subq_3.ds__extract_year AS metric_time__extract_year
+                , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_3.ds__extract_month AS metric_time__extract_month
+                , subq_3.ds__extract_week AS metric_time__extract_week
+                , subq_3.ds__extract_day AS metric_time__extract_day
+                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
index f7de81777d..dbe82316e7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
@@ -31,7 +31,7 @@ FROM (
           SELECT
             subq_2.metric_time__day AS metric_time__day
             , subq_4.window_start__extract_month AS listing__window_start__extract_month
-            , subq_4.window_end__extract_day AS listing__window_end__extract_day
+            , subq_4.window_end__extract_month AS listing__window_end__extract_month
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -122,6 +122,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -237,7 +244,7 @@ FROM (
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
               subq_3.window_start__extract_month
-              , subq_3.window_end__extract_day
+              , subq_3.window_end__extract_month
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -311,9 +318,9 @@ FROM (
                 subq_2.metric_time__day >= subq_4.window_start__extract_month
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__extract_day
+                  subq_2.metric_time__day < subq_4.window_end__extract_month
                 ) OR (
-                  subq_4.window_end__extract_day IS NULL
+                  subq_4.window_end__extract_month IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
index 8e679fa648..24f243f464 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
@@ -35,9 +35,9 @@ FROM (
         subq_12.metric_time__day >= EXTRACT(MONTH FROM listings_src_10017.active_from)
       ) AND (
         (
-          subq_12.metric_time__day < EXTRACT(DAY FROM listings_src_10017.active_to)
+          subq_12.metric_time__day < EXTRACT(MONTH FROM listings_src_10017.active_to)
         ) OR (
-          EXTRACT(DAY FROM listings_src_10017.active_to) IS NULL
+          EXTRACT(MONTH FROM listings_src_10017.active_to) IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 6ef8853985..141c4fba09 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 29fb5d972e..a2adc126d3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
index 16e8afe8d0..7c85ab1cdb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -109,6 +109,13 @@ INNER JOIN (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql
index b00d690648..e89a957806 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql
@@ -98,6 +98,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
index 583b4a4bf0..436f0e7545 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
@@ -69,6 +69,13 @@ FROM (
         , subq_0.ds__month AS metric_time__month
         , subq_0.ds__quarter AS metric_time__quarter
         , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
         , subq_0.listing
         , subq_0.user
         , subq_0.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql
index 437dc887b4..9223eebd6e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql
@@ -132,6 +132,13 @@ FROM (
                     , subq_0.ds__month AS metric_time__month
                     , subq_0.ds__quarter AS metric_time__quarter
                     , subq_0.ds__year AS metric_time__year
+                    , subq_0.ds__extract_year AS metric_time__extract_year
+                    , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_0.ds__extract_month AS metric_time__extract_month
+                    , subq_0.ds__extract_week AS metric_time__extract_week
+                    , subq_0.ds__extract_day AS metric_time__extract_day
+                    , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_0.listing
                     , subq_0.guest
                     , subq_0.host
@@ -316,6 +323,13 @@ FROM (
                     , subq_3.ds__month AS metric_time__month
                     , subq_3.ds__quarter AS metric_time__quarter
                     , subq_3.ds__year AS metric_time__year
+                    , subq_3.ds__extract_year AS metric_time__extract_year
+                    , subq_3.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_3.ds__extract_month AS metric_time__extract_month
+                    , subq_3.ds__extract_week AS metric_time__extract_week
+                    , subq_3.ds__extract_day AS metric_time__extract_day
+                    , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_3.listing
                     , subq_3.user
                     , subq_3.listing__user
@@ -529,6 +543,13 @@ FROM (
                     , subq_12.ds__month AS metric_time__month
                     , subq_12.ds__quarter AS metric_time__quarter
                     , subq_12.ds__year AS metric_time__year
+                    , subq_12.ds__extract_year AS metric_time__extract_year
+                    , subq_12.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_12.ds__extract_month AS metric_time__extract_month
+                    , subq_12.ds__extract_week AS metric_time__extract_week
+                    , subq_12.ds__extract_day AS metric_time__extract_day
+                    , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_12.listing
                     , subq_12.guest
                     , subq_12.host
@@ -713,6 +734,13 @@ FROM (
                     , subq_15.ds__month AS metric_time__month
                     , subq_15.ds__quarter AS metric_time__quarter
                     , subq_15.ds__year AS metric_time__year
+                    , subq_15.ds__extract_year AS metric_time__extract_year
+                    , subq_15.ds__extract_quarter AS metric_time__extract_quarter
+                    , subq_15.ds__extract_month AS metric_time__extract_month
+                    , subq_15.ds__extract_week AS metric_time__extract_week
+                    , subq_15.ds__extract_day AS metric_time__extract_day
+                    , subq_15.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                    , subq_15.ds__extract_dayofyear AS metric_time__extract_dayofyear
                     , subq_15.listing
                     , subq_15.user
                     , subq_15.listing__user
@@ -909,6 +937,13 @@ FROM (
             , subq_24.ds__month AS metric_time__month
             , subq_24.ds__quarter AS metric_time__quarter
             , subq_24.ds__year AS metric_time__year
+            , subq_24.ds__extract_year AS metric_time__extract_year
+            , subq_24.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_24.ds__extract_month AS metric_time__extract_month
+            , subq_24.ds__extract_week AS metric_time__extract_week
+            , subq_24.ds__extract_day AS metric_time__extract_day
+            , subq_24.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_24.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_24.listing
             , subq_24.guest
             , subq_24.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
index 37ad3a608e..1f9e7a4524 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
@@ -117,6 +117,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -342,6 +349,13 @@ FROM (
             , subq_7.ds__month AS metric_time__month
             , subq_7.ds__quarter AS metric_time__quarter
             , subq_7.ds__year AS metric_time__year
+            , subq_7.ds__extract_year AS metric_time__extract_year
+            , subq_7.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_7.ds__extract_month AS metric_time__extract_month
+            , subq_7.ds__extract_week AS metric_time__extract_week
+            , subq_7.ds__extract_day AS metric_time__extract_day
+            , subq_7.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_7.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_7.listing
             , subq_7.guest
             , subq_7.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index a495423238..2d8a10e755 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -111,6 +111,13 @@ FROM (
               , subq_0.ds__month AS metric_time__month
               , subq_0.ds__quarter AS metric_time__quarter
               , subq_0.ds__year AS metric_time__year
+              , subq_0.ds__extract_year AS metric_time__extract_year
+              , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_0.ds__extract_month AS metric_time__extract_month
+              , subq_0.ds__extract_week AS metric_time__extract_week
+              , subq_0.ds__extract_day AS metric_time__extract_day
+              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 0e4cdb1a6a..4ef0714be2 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -99,6 +99,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -292,6 +299,13 @@ FROM (
             , subq_5.ds__month AS metric_time__month
             , subq_5.ds__quarter AS metric_time__quarter
             , subq_5.ds__year AS metric_time__year
+            , subq_5.ds__extract_year AS metric_time__extract_year
+            , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_5.ds__extract_month AS metric_time__extract_month
+            , subq_5.ds__extract_week AS metric_time__extract_week
+            , subq_5.ds__extract_day AS metric_time__extract_day
+            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_5.listing
             , subq_5.user
             , subq_5.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
index 7509855402..a4dc109e27 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
@@ -21,7 +21,7 @@ FROM (
       SELECT
         subq_2.metric_time__day AS metric_time__day
         , subq_7.window_start__extract_month AS listing__window_start__extract_month
-        , subq_7.window_end__extract_day AS listing__window_end__extract_day
+        , subq_7.window_end__extract_month AS listing__window_end__extract_month
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
         , subq_2.bookings AS bookings
@@ -112,6 +112,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -227,7 +234,7 @@ FROM (
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
           subq_6.window_start__extract_month
-          , subq_6.window_end__extract_day
+          , subq_6.window_end__extract_month
           , subq_6.listing
           , subq_6.user__home_state_latest
         FROM (
@@ -467,9 +474,9 @@ FROM (
             subq_2.metric_time__day >= subq_7.window_start__extract_month
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.window_end__extract_day
+              subq_2.metric_time__day < subq_7.window_end__extract_month
             ) OR (
-              subq_7.window_end__extract_day IS NULL
+              subq_7.window_end__extract_month IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index dac9dfcf79..004fe3196a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -24,7 +24,7 @@ LEFT OUTER JOIN (
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
     EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-    , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
+    , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
   FROM ***************************.dim_listings listings_src_10017
@@ -41,9 +41,9 @@ ON
       subq_13.metric_time__day >= subq_18.window_start__extract_month
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.window_end__extract_day
+        subq_13.metric_time__day < subq_18.window_end__extract_month
       ) OR (
-        subq_18.window_end__extract_day IS NULL
+        subq_18.window_end__extract_month IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
index 27cc3589f7..a3b53ef6af 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.lux_listing__window_start__extract_month AS listing__lux_listing__window_start__extract_month
-        , subq_7.lux_listing__window_end__extract_week AS listing__lux_listing__window_end__extract_week
+        , subq_7.lux_listing__window_start__extract_dayofyear AS listing__lux_listing__window_start__extract_dayofyear
+        , subq_7.lux_listing__window_end__extract_quarter AS listing__lux_listing__window_end__extract_quarter
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
         , subq_2.bookings AS bookings
@@ -112,6 +112,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -229,8 +236,8 @@ FROM (
         --    'lux_listing__window_end__day',
         --    'listing']
         SELECT
-          subq_6.lux_listing__window_start__extract_month
-          , subq_6.lux_listing__window_end__extract_week
+          subq_6.lux_listing__window_start__extract_dayofyear
+          , subq_6.lux_listing__window_end__extract_quarter
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
         FROM (
@@ -443,12 +450,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_month
+            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_dayofyear
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_week
+              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_quarter
             ) OR (
-              subq_7.lux_listing__window_end__extract_week IS NULL
+              subq_7.lux_listing__window_end__extract_quarter IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index f84156c6f9..8dc33d857c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -26,8 +26,8 @@ LEFT OUTER JOIN (
   --    'lux_listing__window_end__day',
   --    'listing']
   SELECT
-    EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
-    , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+    EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
+    , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
   FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_10018
@@ -41,12 +41,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_month
+      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_dayofyear
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_week
+        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_quarter
       ) OR (
-        subq_18.lux_listing__window_end__extract_week IS NULL
+        subq_18.lux_listing__window_end__extract_quarter IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
index fbddd59f54..7638105966 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
@@ -84,6 +84,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.account_id
             , subq_0.account_month
             , subq_0.account_id__account_month
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
index eb31a4fb3a..3d8fba9b22 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
@@ -95,6 +95,13 @@ FROM (
           , subq_1.metric_time__month
           , subq_1.metric_time__quarter
           , subq_1.metric_time__year
+          , subq_1.metric_time__extract_year
+          , subq_1.metric_time__extract_quarter
+          , subq_1.metric_time__extract_month
+          , subq_1.metric_time__extract_week
+          , subq_1.metric_time__extract_day
+          , subq_1.metric_time__extract_dayofweek
+          , subq_1.metric_time__extract_dayofyear
           , subq_1.listing
           , subq_1.guest
           , subq_1.host
@@ -196,6 +203,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -391,6 +405,13 @@ CROSS JOIN (
           , subq_7.metric_time__month
           , subq_7.metric_time__quarter
           , subq_7.metric_time__year
+          , subq_7.metric_time__extract_year
+          , subq_7.metric_time__extract_quarter
+          , subq_7.metric_time__extract_month
+          , subq_7.metric_time__extract_week
+          , subq_7.metric_time__extract_day
+          , subq_7.metric_time__extract_dayofweek
+          , subq_7.metric_time__extract_dayofyear
           , subq_7.listing
           , subq_7.user
           , subq_7.listing__user
@@ -459,6 +480,13 @@ CROSS JOIN (
             , subq_6.ds__month AS metric_time__month
             , subq_6.ds__quarter AS metric_time__quarter
             , subq_6.ds__year AS metric_time__year
+            , subq_6.ds__extract_year AS metric_time__extract_year
+            , subq_6.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_6.ds__extract_month AS metric_time__extract_month
+            , subq_6.ds__extract_week AS metric_time__extract_week
+            , subq_6.ds__extract_day AS metric_time__extract_day
+            , subq_6.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_6.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_6.listing
             , subq_6.user
             , subq_6.listing__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql
index dc0afd0f09..138d3b47ca 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql
@@ -116,6 +116,13 @@ FROM (
                 , subq_0.ds__month AS metric_time__month
                 , subq_0.ds__quarter AS metric_time__quarter
                 , subq_0.ds__year AS metric_time__year
+                , subq_0.ds__extract_year AS metric_time__extract_year
+                , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_0.ds__extract_month AS metric_time__extract_month
+                , subq_0.ds__extract_week AS metric_time__extract_week
+                , subq_0.ds__extract_day AS metric_time__extract_day
+                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -338,6 +345,13 @@ FROM (
                 , subq_5.ds__month AS metric_time__month
                 , subq_5.ds__quarter AS metric_time__quarter
                 , subq_5.ds__year AS metric_time__year
+                , subq_5.ds__extract_year AS metric_time__extract_year
+                , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+                , subq_5.ds__extract_month AS metric_time__extract_month
+                , subq_5.ds__extract_week AS metric_time__extract_week
+                , subq_5.ds__extract_day AS metric_time__extract_day
+                , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
+                , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
                 , subq_5.listing
                 , subq_5.guest
                 , subq_5.host
@@ -572,6 +586,13 @@ FROM (
             , subq_12.ds__month AS metric_time__month
             , subq_12.ds__quarter AS metric_time__quarter
             , subq_12.ds__year AS metric_time__year
+            , subq_12.ds__extract_year AS metric_time__extract_year
+            , subq_12.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_12.ds__extract_month AS metric_time__extract_month
+            , subq_12.ds__extract_week AS metric_time__extract_week
+            , subq_12.ds__extract_day AS metric_time__extract_day
+            , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_12.listing
             , subq_12.guest
             , subq_12.host
@@ -804,6 +825,13 @@ FROM (
             , subq_17.ds__month AS metric_time__month
             , subq_17.ds__quarter AS metric_time__quarter
             , subq_17.ds__year AS metric_time__year
+            , subq_17.ds__extract_year AS metric_time__extract_year
+            , subq_17.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_17.ds__extract_month AS metric_time__extract_month
+            , subq_17.ds__extract_week AS metric_time__extract_week
+            , subq_17.ds__extract_day AS metric_time__extract_day
+            , subq_17.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_17.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_17.listing
             , subq_17.guest
             , subq_17.host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql
index a53f3a075b..e43e265eff 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql
@@ -84,6 +84,13 @@ FROM (
             , subq_0.ds__month AS metric_time__month
             , subq_0.ds__quarter AS metric_time__quarter
             , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
             , subq_0.verification
             , subq_0.user
             , subq_0.verification__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml
index c0830e210b..97591729c5 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml
@@ -31,11 +31,11 @@
             <!-- node_id = ss_10 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
             <!-- where = None -->
@@ -44,7 +44,7 @@
                 <!-- node_id = ss_9 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -53,7 +53,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -63,11 +63,11 @@
                     <!-- node_id = ss_8 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                     <!-- where = None -->
@@ -76,395 +76,423 @@
                         <!-- node_id = ss_7 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                         <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                         <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                         <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                         <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                         <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                         <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                         <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                         <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                         <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                         <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                         <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                         <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                         <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                         <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                         <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                         <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                         <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                         <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                         <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                         <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                         <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                         <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                         <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                         <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                         <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                         <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                         <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                         <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                         <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                         <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                         <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                         <!-- col50 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                         <!-- col51 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                         <!-- col52 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                         <!-- col53 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                         <!-- col54 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                         <!-- col55 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                         <!-- col56 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                         <!-- col57 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                         <!-- col58 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                         <!-- col59 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                         <!-- col60 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                         <!--    'column_alias': 'booking__paid_at__day'}               -->
                         <!-- col61 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                         <!--    'column_alias': 'booking__paid_at__week'}              -->
                         <!-- col62 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                         <!--    'column_alias': 'booking__paid_at__month'}             -->
                         <!-- col63 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                         <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                         <!-- col64 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                         <!--    'column_alias': 'booking__paid_at__year'}              -->
                         <!-- col65 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                         <!-- col66 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                         <!-- col67 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                         <!-- col68 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                         <!-- col69 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                         <!-- col70 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                         <!-- col71 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                         <!-- col72 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col73 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                         <!--    'column_alias': 'metric_time__week'}                   -->
                         <!-- col74 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                         <!--    'column_alias': 'metric_time__month'}                  -->
                         <!-- col75 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                         <!--    'column_alias': 'metric_time__quarter'}                -->
                         <!-- col76 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                         <!--    'column_alias': 'metric_time__year'}                   -->
                         <!-- col77 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                        <!--    'column_alias': 'listing'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                        <!--    'column_alias': 'metric_time__extract_year'}           -->
                         <!-- col78 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                        <!--    'column_alias': 'guest'}                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                        <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                         <!-- col79 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                        <!--    'column_alias': 'host'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                        <!--    'column_alias': 'metric_time__extract_month'}          -->
                         <!-- col80 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                        <!--    'column_alias': 'metric_time__extract_week'}           -->
                         <!-- col81 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                        <!--    'column_alias': 'metric_time__extract_day'}            -->
                         <!-- col82 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                         <!-- col83 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                         <!-- col84 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                        <!--    'column_alias': 'listing'}                             -->
                         <!-- col85 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                        <!--    'column_alias': 'bookings'}                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                        <!--    'column_alias': 'guest'}                               -->
                         <!-- col86 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                        <!--    'column_alias': 'host'}                                -->
                         <!-- col87 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
                         <!-- col88 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
                         <!-- col89 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
                         <!-- col90 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                        <!--    'column_alias': 'bookers'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                        <!--    'column_alias': 'is_instant'}                          -->
                         <!-- col91 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                 -->
                         <!-- col92 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                        <!--    'column_alias': 'bookings'}                            -->
                         <!-- col93 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                        <!--    'column_alias': 'instant_bookings'}                    -->
                         <!-- col94 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                        <!--    'column_alias': 'booking_value_p99'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                        <!--    'column_alias': 'booking_value'}                       -->
                         <!-- col95 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!-- col96 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!-- col97 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                        <!--    'column_alias': 'bookers'}                             -->
+                        <!-- col98 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!-- col99 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!-- col100 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!-- col101 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                        <!--    'column_alias': 'booking_value_p99'}                   -->
+                        <!-- col102 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                        <!-- col96 =                                                         -->
+                        <!-- col103 =                                                        -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col97 =                                                       -->
+                        <!-- col104 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
@@ -864,11 +892,11 @@
             <!-- node_id = ss_14 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
             <!--    'column_alias': 'booking_value'}                       -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
             <!-- where = None -->
@@ -877,7 +905,7 @@
                 <!-- node_id = ss_13 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -886,7 +914,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -896,11 +924,11 @@
                     <!-- node_id = ss_12 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
                     <!--    'column_alias': 'booking_value'}                       -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                     <!-- where = None -->
@@ -909,395 +937,423 @@
                         <!-- node_id = ss_11 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                         <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                         <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                         <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                         <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                         <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                         <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                         <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                         <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                         <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                         <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                         <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                         <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                         <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                         <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                         <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                         <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                         <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                         <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                         <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                         <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                         <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                         <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                         <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                         <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                         <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                         <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                         <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                         <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                         <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                         <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                         <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                         <!-- col50 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                         <!-- col51 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                         <!-- col52 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                         <!-- col53 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                         <!-- col54 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),        -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                         <!-- col55 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),      -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                         <!-- col56 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                         <!-- col57 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                         <!-- col58 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                         <!-- col59 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                         <!-- col60 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                         <!--    'column_alias': 'booking__paid_at__day'}               -->
                         <!-- col61 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                         <!--    'column_alias': 'booking__paid_at__week'}              -->
                         <!-- col62 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                         <!--    'column_alias': 'booking__paid_at__month'}             -->
                         <!-- col63 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                         <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                         <!-- col64 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                         <!--    'column_alias': 'booking__paid_at__year'}              -->
                         <!-- col65 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                         <!-- col66 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                         <!-- col67 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                         <!-- col68 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                         <!-- col69 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                         <!-- col70 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                         <!-- col71 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                         <!-- col72 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col73 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                         <!--    'column_alias': 'metric_time__week'}                   -->
                         <!-- col74 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
                         <!--    'column_alias': 'metric_time__month'}                  -->
                         <!-- col75 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
                         <!--    'column_alias': 'metric_time__quarter'}                -->
                         <!-- col76 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
                         <!--    'column_alias': 'metric_time__year'}                   -->
                         <!-- col77 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
-                        <!--    'column_alias': 'listing'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                        <!--    'column_alias': 'metric_time__extract_year'}           -->
                         <!-- col78 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                        <!--    'column_alias': 'guest'}                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                        <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                         <!-- col79 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                        <!--    'column_alias': 'host'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                        <!--    'column_alias': 'metric_time__extract_month'}          -->
                         <!-- col80 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                        <!--    'column_alias': 'metric_time__extract_week'}           -->
                         <!-- col81 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                        <!--    'column_alias': 'metric_time__extract_day'}            -->
                         <!-- col82 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                         <!-- col83 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
-                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                         <!-- col84 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
-                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                        <!--    'column_alias': 'listing'}                             -->
                         <!-- col85 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                        <!--    'column_alias': 'bookings'}                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                        <!--    'column_alias': 'guest'}                               -->
                         <!-- col86 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                        <!--    'column_alias': 'host'}                                -->
                         <!-- col87 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
                         <!-- col88 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
                         <!-- col89 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
                         <!-- col90 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                        <!--    'column_alias': 'bookers'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                        <!--    'column_alias': 'is_instant'}                          -->
                         <!-- col91 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                 -->
                         <!-- col92 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                        <!--    'column_alias': 'bookings'}                            -->
                         <!-- col93 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
-                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                        <!--    'column_alias': 'instant_bookings'}                    -->
                         <!-- col94 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
-                        <!--    'column_alias': 'booking_value_p99'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                        <!--    'column_alias': 'booking_value'}                       -->
                         <!-- col95 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!-- col96 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!-- col97 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                        <!--    'column_alias': 'bookers'}                             -->
+                        <!-- col98 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!-- col99 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!-- col100 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!-- col101 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                        <!--    'column_alias': 'booking_value_p99'}                   -->
+                        <!-- col102 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                        <!-- col96 =                                                         -->
+                        <!-- col103 =                                                        -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col97 =                                                       -->
+                        <!-- col104 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
index 9315fdef74..7fc551df80 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_24 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
         <!--    'column_alias': 'ds__day'}                             -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),  -->
         <!--    'column_alias': 'listing__country_latest'}             -->
         <!-- col2 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
@@ -29,11 +29,11 @@
             <!--    'column_alias': 'listing__country_latest'}                                     -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- col3 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
             <!--    'column_alias': 'views'}                               -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
             <!-- join_0 =                                                   -->
@@ -48,15 +48,15 @@
                 <!-- node_id = ss_14 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                 <!--    'column_alias': 'ds__day'}                             -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
                 <!--    'column_alias': 'listing__country_latest'}             -->
                 <!-- col2 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
@@ -65,11 +65,11 @@
                     <!-- node_id = ss_13 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- col2 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -78,11 +78,11 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- group_by1 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -92,15 +92,15 @@
                         <!-- node_id = ss_12 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                         <!--    'column_alias': 'listing__country_latest'}             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
@@ -109,19 +109,19 @@
                             <!-- node_id = ss_11 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                             <!--    'column_alias': 'listing__country_latest'}             -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- join_0 =                                                    -->
@@ -138,15 +138,15 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
@@ -155,395 +155,423 @@
                                     <!-- node_id = ss_7 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                                     <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                                     <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                                     <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                                     <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                                     <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                                     <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                                     <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                                     <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                                     <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                                     <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                                     <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                                     <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                                     <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                                     <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                                     <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                                     <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                                     <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                                     <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                                     <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                                     <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                     <!-- col53 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                     <!-- col54 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                     <!-- col55 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                     <!-- col56 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                     <!-- col57 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                     <!-- col58 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                     <!-- col59 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}               -->
                                     <!-- col61 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}              -->
                                     <!-- col62 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}             -->
                                     <!-- col63 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                     <!-- col64 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}              -->
                                     <!-- col65 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                     <!-- col66 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                     <!-- col67 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                     <!-- col68 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                     <!-- col69 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                     <!-- col70 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                     <!-- col71 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col73 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                                     <!--    'column_alias': 'metric_time__week'}                   -->
                                     <!-- col74 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                                     <!--    'column_alias': 'metric_time__month'}                  -->
                                     <!-- col75 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                                     <!--    'column_alias': 'metric_time__quarter'}                -->
                                     <!-- col76 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                                     <!--    'column_alias': 'metric_time__year'}                   -->
                                     <!-- col77 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                                     <!-- col78 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                     <!-- col79 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                    <!--    'column_alias': 'metric_time__extract_month'}          -->
                                     <!-- col80 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                    <!--    'column_alias': 'metric_time__extract_week'}           -->
                                     <!-- col81 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                    <!--    'column_alias': 'metric_time__extract_day'}            -->
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
                                     <!-- col85 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
                                     <!-- col86 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                    <!--    'column_alias': 'host'}                                -->
                                     <!-- col87 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
                                     <!-- col88 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
                                     <!-- col89 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
                                     <!-- col90 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
                                     <!-- col91 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
                                     <!-- col92 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
                                     <!-- col93 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
                                     <!-- col94 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
                                     <!-- col95 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!-- col96 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!-- col97 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col98 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!-- col99 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!-- col100 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!-- col101 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                                    <!-- col102 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                    <!-- col96 =                                                         -->
+                                    <!-- col103 =                                                        -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                    <!-- col97 =                                                       -->
+                                    <!-- col104 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
@@ -943,11 +971,11 @@
                                 <!-- node_id = ss_10 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
                                 <!--    'column_alias': 'country_latest'}                      -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                                 <!-- where = None -->
@@ -956,263 +984,291 @@
                                     <!-- node_id = ss_9 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                                     <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                                     <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                                     <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                                     <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                                     <!--    'column_alias': 'created_at__day'}                     -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                                     <!--    'column_alias': 'created_at__week'}                    -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                                     <!--    'column_alias': 'created_at__month'}                   -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                                     <!--    'column_alias': 'created_at__quarter'}                 -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                                     <!--    'column_alias': 'created_at__year'}                    -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                                     <!--    'column_alias': 'created_at__extract_year'}            -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                                     <!--    'column_alias': 'created_at__extract_quarter'}         -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                                     <!--    'column_alias': 'created_at__extract_month'}           -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                                     <!--    'column_alias': 'created_at__extract_week'}            -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                                     <!--    'column_alias': 'created_at__extract_day'}             -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                                     <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                                     <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                                     <!--    'column_alias': 'listing__ds__day'}                    -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                                     <!--    'column_alias': 'listing__ds__week'}                   -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                                     <!--    'column_alias': 'listing__ds__month'}                  -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                                     <!--    'column_alias': 'listing__ds__quarter'}                -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                                     <!--    'column_alias': 'listing__ds__year'}                   -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                                     <!--    'column_alias': 'listing__ds__extract_year'}           -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                                     <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                                     <!--    'column_alias': 'listing__ds__extract_month'}          -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                                     <!--    'column_alias': 'listing__ds__extract_week'}           -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                                     <!--    'column_alias': 'listing__ds__extract_day'}            -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                                     <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                                     <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                     <!--    'column_alias': 'listing__created_at__day'}            -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                                     <!--    'column_alias': 'listing__created_at__week'}           -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                                     <!--    'column_alias': 'listing__created_at__month'}          -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                                     <!--    'column_alias': 'listing__created_at__quarter'}        -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                                     <!--    'column_alias': 'listing__created_at__year'}           -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_year'}   -->
                                     <!-- col42 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),    -->
                                     <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_month'}  -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_week'}   -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_day'}    -->
                                     <!-- col46 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),      -->
                                     <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
                                     <!-- col47 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),      -->
                                     <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                                     <!--    'column_alias': 'metric_time__week'}                   -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                                     <!--    'column_alias': 'metric_time__month'}                  -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                                     <!--    'column_alias': 'metric_time__quarter'}                -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                                     <!--    'column_alias': 'metric_time__year'}                   -->
                                     <!-- col53 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                                     <!-- col54 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
-                                    <!--    'column_alias': 'user'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                     <!-- col55 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
-                                    <!--    'column_alias': 'listing__user'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                                    <!--    'column_alias': 'metric_time__extract_month'}          -->
                                     <!-- col56 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                                    <!--    'column_alias': 'country_latest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                                    <!--    'column_alias': 'metric_time__extract_week'}           -->
                                     <!-- col57 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                                    <!--    'column_alias': 'metric_time__extract_day'}            -->
                                     <!-- col58 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                     <!-- col59 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
                                     <!-- col61 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                                    <!--    'column_alias': 'user'}                                -->
                                     <!-- col62 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
-                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                                    <!--    'column_alias': 'listing__user'}                       -->
                                     <!-- col63 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
-                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                    <!--    'column_alias': 'country_latest'}                      -->
                                     <!-- col64 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!-- col65 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!-- col66 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!-- col67 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!-- col68 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!-- col69 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!-- col70 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!-- col71 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                                     <!--    'column_alias': 'smallest_listing'}                    -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                     <!-- where = None -->
@@ -1478,15 +1534,15 @@
                 <!-- node_id = ss_22 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
                 <!--    'column_alias': 'ds__day'}                             -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
                 <!--    'column_alias': 'listing__country_latest'}             -->
                 <!-- col2 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
                 <!--    'column_alias': 'views'}                               -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_21) -->
                 <!-- where = None -->
@@ -1495,11 +1551,11 @@
                     <!-- node_id = ss_21 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- col2 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -1508,11 +1564,11 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_20) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- group_by1 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -1522,15 +1578,15 @@
                         <!-- node_id = ss_20 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
                         <!--    'column_alias': 'listing__country_latest'}             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
                         <!--    'column_alias': 'views'}                               -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
                         <!-- where = None -->
@@ -1539,19 +1595,19 @@
                             <!-- node_id = ss_19 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
                             <!--    'column_alias': 'listing__country_latest'}             -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
                             <!--    'column_alias': 'views'}                               -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
                             <!-- join_0 =                                                    -->
@@ -1568,15 +1624,15 @@
                                 <!-- node_id = ss_16 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
                                 <!--    'column_alias': 'views'}                               -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                                 <!-- where = None -->
@@ -1585,235 +1641,263 @@
                                     <!-- node_id = ss_15 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
                                     <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
                                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
                                     <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
                                     <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
                                     <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
                                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
                                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
                                     <!--    'column_alias': 'view__ds__day'}                       -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
                                     <!--    'column_alias': 'view__ds__week'}                      -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
                                     <!--    'column_alias': 'view__ds__month'}                     -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
                                     <!--    'column_alias': 'view__ds__quarter'}                   -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
                                     <!--    'column_alias': 'view__ds__year'}                      -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
                                     <!--    'column_alias': 'view__ds__extract_year'}              -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
                                     <!--    'column_alias': 'view__ds__extract_quarter'}           -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
                                     <!--    'column_alias': 'view__ds__extract_month'}             -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
                                     <!--    'column_alias': 'view__ds__extract_week'}              -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
                                     <!--    'column_alias': 'view__ds__extract_day'}               -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
                                     <!--    'column_alias': 'view__ds__extract_dayofweek'}         -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
                                     <!--    'column_alias': 'view__ds__extract_dayofyear'}         -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
                                     <!--    'column_alias': 'view__ds_partitioned__day'}           -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
                                     <!--    'column_alias': 'view__ds_partitioned__week'}          -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
                                     <!--    'column_alias': 'view__ds_partitioned__month'}         -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
                                     <!--    'column_alias': 'view__ds_partitioned__quarter'}       -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
                                     <!--    'column_alias': 'view__ds_partitioned__year'}          -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
                                     <!--    'column_alias': 'view__ds_partitioned__extract_year'}  -->
                                     <!-- col42 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),     -->
                                     <!--    'column_alias': 'view__ds_partitioned__extract_quarter'}  -->
                                     <!-- col43 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),   -->
                                     <!--    'column_alias': 'view__ds_partitioned__extract_month'}  -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
                                     <!--    'column_alias': 'view__ds_partitioned__extract_week'}  -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
                                     <!--    'column_alias': 'view__ds_partitioned__extract_day'}   -->
                                     <!-- col46 =                                                        -->
                                     <!--   {'class': 'SqlSelectColumn',                                 -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),       -->
                                     <!--    'column_alias': 'view__ds_partitioned__extract_dayofweek'}  -->
                                     <!-- col47 =                                                        -->
                                     <!--   {'class': 'SqlSelectColumn',                                 -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),       -->
                                     <!--    'column_alias': 'view__ds_partitioned__extract_dayofyear'}  -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
                                     <!--    'column_alias': 'metric_time__week'}                   -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
                                     <!--    'column_alias': 'metric_time__month'}                  -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                                     <!--    'column_alias': 'metric_time__quarter'}                -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                                     <!--    'column_alias': 'metric_time__year'}                   -->
                                     <!-- col53 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
+                                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                                     <!-- col54 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
-                                    <!--    'column_alias': 'user'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
+                                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                     <!-- col55 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
-                                    <!--    'column_alias': 'view__listing'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                                    <!--    'column_alias': 'metric_time__extract_month'}          -->
                                     <!-- col56 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
-                                    <!--    'column_alias': 'view__user'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                                    <!--    'column_alias': 'metric_time__extract_week'}           -->
                                     <!-- col57 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                                    <!--    'column_alias': 'metric_time__extract_day'}            -->
+                                    <!-- col58 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                    <!-- col59 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                    <!-- col60 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!-- col61 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
+                                    <!--    'column_alias': 'user'}                                -->
+                                    <!-- col62 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
+                                    <!--    'column_alias': 'view__listing'}                       -->
+                                    <!-- col63 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
+                                    <!--    'column_alias': 'view__user'}                          -->
+                                    <!-- col64 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
                                     <!--    'column_alias': 'views'}                               -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10009) -->
                                     <!-- where = None -->
@@ -2049,11 +2133,11 @@
                                 <!-- node_id = ss_18 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
                                 <!--    'column_alias': 'country_latest'}                      -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                                 <!-- where = None -->
@@ -2062,263 +2146,291 @@
                                     <!-- node_id = ss_17 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
                                     <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
                                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
                                     <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
                                     <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
                                     <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
                                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
                                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
                                     <!--    'column_alias': 'created_at__day'}                     -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
                                     <!--    'column_alias': 'created_at__week'}                    -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
                                     <!--    'column_alias': 'created_at__month'}                   -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
                                     <!--    'column_alias': 'created_at__quarter'}                 -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
                                     <!--    'column_alias': 'created_at__year'}                    -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
                                     <!--    'column_alias': 'created_at__extract_year'}            -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
                                     <!--    'column_alias': 'created_at__extract_quarter'}         -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
                                     <!--    'column_alias': 'created_at__extract_month'}           -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
                                     <!--    'column_alias': 'created_at__extract_week'}            -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                                     <!--    'column_alias': 'created_at__extract_day'}             -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                                     <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
                                     <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
                                     <!--    'column_alias': 'listing__ds__day'}                    -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
                                     <!--    'column_alias': 'listing__ds__week'}                   -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
                                     <!--    'column_alias': 'listing__ds__month'}                  -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
                                     <!--    'column_alias': 'listing__ds__quarter'}                -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
                                     <!--    'column_alias': 'listing__ds__year'}                   -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
                                     <!--    'column_alias': 'listing__ds__extract_year'}           -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
                                     <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
                                     <!--    'column_alias': 'listing__ds__extract_month'}          -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
                                     <!--    'column_alias': 'listing__ds__extract_week'}           -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
                                     <!--    'column_alias': 'listing__ds__extract_day'}            -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
                                     <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
                                     <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
                                     <!--    'column_alias': 'listing__created_at__day'}            -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
                                     <!--    'column_alias': 'listing__created_at__week'}           -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
                                     <!--    'column_alias': 'listing__created_at__month'}          -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
                                     <!--    'column_alias': 'listing__created_at__quarter'}        -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
                                     <!--    'column_alias': 'listing__created_at__year'}           -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_year'}   -->
                                     <!-- col42 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),    -->
                                     <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_month'}  -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_week'}   -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_day'}    -->
                                     <!-- col46 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),      -->
                                     <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
                                     <!-- col47 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),      -->
                                     <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
                                     <!--    'column_alias': 'metric_time__week'}                   -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
                                     <!--    'column_alias': 'metric_time__month'}                  -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
                                     <!--    'column_alias': 'metric_time__quarter'}                -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
                                     <!--    'column_alias': 'metric_time__year'}                   -->
                                     <!-- col53 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
+                                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                                     <!-- col54 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
-                                    <!--    'column_alias': 'user'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
+                                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                     <!-- col55 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
-                                    <!--    'column_alias': 'listing__user'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
+                                    <!--    'column_alias': 'metric_time__extract_month'}          -->
                                     <!-- col56 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
-                                    <!--    'column_alias': 'country_latest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
+                                    <!--    'column_alias': 'metric_time__extract_week'}           -->
                                     <!-- col57 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
-                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
+                                    <!--    'column_alias': 'metric_time__extract_day'}            -->
                                     <!-- col58 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
-                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                     <!-- col59 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
-                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
-                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
                                     <!-- col61 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
-                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
+                                    <!--    'column_alias': 'user'}                                -->
                                     <!-- col62 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
-                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
+                                    <!--    'column_alias': 'listing__user'}                       -->
                                     <!-- col63 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
-                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
+                                    <!--    'column_alias': 'country_latest'}                      -->
                                     <!-- col64 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
+                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!-- col65 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
+                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!-- col66 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
+                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!-- col67 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
+                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!-- col68 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
+                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!-- col69 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
+                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!-- col70 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
+                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!-- col71 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                                     <!--    'column_alias': 'smallest_listing'}                    -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
index 767372469e..37c8fa43eb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_10 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
         <!--    'column_alias': 'ds__month'}                           -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
         <!--    'column_alias': 'trailing_2_months_revenue'}           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_9 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_8 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                 <!--    'column_alias': 'ds__month'}                           -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
@@ -49,131 +49,159 @@
                     <!-- node_id = ss_7 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
                     <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
                     <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
                     <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                     <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
                     <!--    'column_alias': 'company__ds__day'}                    -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
                     <!--    'column_alias': 'company__ds__week'}                   -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                     <!--    'column_alias': 'company__ds__month'}                  -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                     <!--    'column_alias': 'company__ds__quarter'}                -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                     <!--    'column_alias': 'company__ds__year'}                   -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                     <!--    'column_alias': 'company__ds__extract_year'}           -->
                     <!-- col18 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                     <!--    'column_alias': 'company__ds__extract_quarter'}        -->
                     <!-- col19 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                     <!--    'column_alias': 'company__ds__extract_month'}          -->
                     <!-- col20 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                     <!--    'column_alias': 'company__ds__extract_week'}           -->
                     <!-- col21 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                     <!--    'column_alias': 'company__ds__extract_day'}            -->
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                     <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                     <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col25 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- col26 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                     <!--    'column_alias': 'metric_time__month'}                  -->
                     <!-- col27 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- col28 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- col29 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                     <!-- col30 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                     <!-- col31 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                    <!--    'column_alias': 'metric_time__extract_month'}          -->
+                    <!-- col32 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                    <!--    'column_alias': 'metric_time__extract_week'}           -->
+                    <!-- col33 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                    <!--    'column_alias': 'metric_time__extract_day'}            -->
+                    <!-- col34 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                    <!-- col35 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                    <!-- col36 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
+                    <!--    'column_alias': 'user'}                                -->
+                    <!-- col37 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                    <!--    'column_alias': 'company__user'}                       -->
+                    <!-- col38 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
index 0ee72e4356..5dc0f7e4cf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_10 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
         <!--    'column_alias': 'ds__month'}                           -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
         <!--    'column_alias': 'revenue_mtd'}                         -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_9 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_8 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                 <!--    'column_alias': 'ds__month'}                           -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
@@ -49,131 +49,159 @@
                     <!-- node_id = ss_7 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
                     <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
                     <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
                     <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                     <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
                     <!--    'column_alias': 'company__ds__day'}                    -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
                     <!--    'column_alias': 'company__ds__week'}                   -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                     <!--    'column_alias': 'company__ds__month'}                  -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                     <!--    'column_alias': 'company__ds__quarter'}                -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                     <!--    'column_alias': 'company__ds__year'}                   -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                     <!--    'column_alias': 'company__ds__extract_year'}           -->
                     <!-- col18 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                     <!--    'column_alias': 'company__ds__extract_quarter'}        -->
                     <!-- col19 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                     <!--    'column_alias': 'company__ds__extract_month'}          -->
                     <!-- col20 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                     <!--    'column_alias': 'company__ds__extract_week'}           -->
                     <!-- col21 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                     <!--    'column_alias': 'company__ds__extract_day'}            -->
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                     <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                     <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col25 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- col26 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                     <!--    'column_alias': 'metric_time__month'}                  -->
                     <!-- col27 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- col28 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- col29 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                     <!-- col30 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                     <!-- col31 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                    <!--    'column_alias': 'metric_time__extract_month'}          -->
+                    <!-- col32 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                    <!--    'column_alias': 'metric_time__extract_week'}           -->
+                    <!-- col33 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                    <!--    'column_alias': 'metric_time__extract_day'}            -->
+                    <!-- col34 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                    <!-- col35 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                    <!-- col36 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
+                    <!--    'column_alias': 'user'}                                -->
+                    <!-- col37 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                    <!--    'column_alias': 'company__user'}                       -->
+                    <!-- col38 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
index 02d428e68a..ea17474430 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_10 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
         <!--    'column_alias': 'trailing_2_months_revenue'}           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
@@ -24,7 +24,7 @@
                 <!-- node_id = ss_8 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
@@ -33,131 +33,159 @@
                     <!-- node_id = ss_7 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
                     <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
                     <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
                     <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                     <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
                     <!--    'column_alias': 'company__ds__day'}                    -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
                     <!--    'column_alias': 'company__ds__week'}                   -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                     <!--    'column_alias': 'company__ds__month'}                  -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                     <!--    'column_alias': 'company__ds__quarter'}                -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                     <!--    'column_alias': 'company__ds__year'}                   -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                     <!--    'column_alias': 'company__ds__extract_year'}           -->
                     <!-- col18 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                     <!--    'column_alias': 'company__ds__extract_quarter'}        -->
                     <!-- col19 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                     <!--    'column_alias': 'company__ds__extract_month'}          -->
                     <!-- col20 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                     <!--    'column_alias': 'company__ds__extract_week'}           -->
                     <!-- col21 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                     <!--    'column_alias': 'company__ds__extract_day'}            -->
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                     <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                     <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col25 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- col26 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                     <!--    'column_alias': 'metric_time__month'}                  -->
                     <!-- col27 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- col28 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- col29 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                     <!-- col30 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                     <!-- col31 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                    <!--    'column_alias': 'metric_time__extract_month'}          -->
+                    <!-- col32 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                    <!--    'column_alias': 'metric_time__extract_week'}           -->
+                    <!-- col33 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                    <!--    'column_alias': 'metric_time__extract_day'}            -->
+                    <!-- col34 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                    <!-- col35 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                    <!-- col36 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
+                    <!--    'column_alias': 'user'}                                -->
+                    <!-- col37 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                    <!--    'column_alias': 'company__user'}                       -->
+                    <!-- col38 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
index a5c78af24a..e1894ad698 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_10 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
         <!--    'column_alias': 'ds__month'}                           -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
         <!--    'column_alias': 'revenue_all_time'}                    -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_9 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_8 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                 <!--    'column_alias': 'ds__month'}                           -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
@@ -49,131 +49,159 @@
                     <!-- node_id = ss_7 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
                     <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
                     <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
                     <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                     <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
                     <!--    'column_alias': 'company__ds__day'}                    -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
                     <!--    'column_alias': 'company__ds__week'}                   -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                     <!--    'column_alias': 'company__ds__month'}                  -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                     <!--    'column_alias': 'company__ds__quarter'}                -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                     <!--    'column_alias': 'company__ds__year'}                   -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                     <!--    'column_alias': 'company__ds__extract_year'}           -->
                     <!-- col18 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                     <!--    'column_alias': 'company__ds__extract_quarter'}        -->
                     <!-- col19 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                     <!--    'column_alias': 'company__ds__extract_month'}          -->
                     <!-- col20 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                     <!--    'column_alias': 'company__ds__extract_week'}           -->
                     <!-- col21 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                     <!--    'column_alias': 'company__ds__extract_day'}            -->
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                     <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                     <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col25 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- col26 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                     <!--    'column_alias': 'metric_time__month'}                  -->
                     <!-- col27 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- col28 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- col29 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                     <!-- col30 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                     <!-- col31 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                    <!--    'column_alias': 'metric_time__extract_month'}          -->
+                    <!-- col32 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                    <!--    'column_alias': 'metric_time__extract_week'}           -->
+                    <!-- col33 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                    <!--    'column_alias': 'metric_time__extract_day'}            -->
+                    <!-- col34 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                    <!-- col35 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                    <!-- col36 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
+                    <!--    'column_alias': 'user'}                                -->
+                    <!-- col37 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                    <!--    'column_alias': 'company__user'}                       -->
+                    <!-- col38 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
index 836bc1a09c..015b695d28 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_13 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
         <!--    'column_alias': 'ds__month'}                           -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
         <!--    'column_alias': 'revenue_all_time'}                    -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_12 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_11 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                 <!--    'column_alias': 'ds__month'}                           -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                 <!-- where = None -->
@@ -50,131 +50,159 @@
                     <!-- node_id = ss_10 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                     <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                     <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                     <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                     <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                     <!--    'column_alias': 'company__ds__day'}                    -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                     <!--    'column_alias': 'company__ds__week'}                   -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                     <!--    'column_alias': 'company__ds__month'}                  -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                     <!--    'column_alias': 'company__ds__quarter'}                -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                     <!--    'column_alias': 'company__ds__year'}                   -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                     <!--    'column_alias': 'company__ds__extract_year'}           -->
                     <!-- col18 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                     <!--    'column_alias': 'company__ds__extract_quarter'}        -->
                     <!-- col19 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                     <!--    'column_alias': 'company__ds__extract_month'}          -->
                     <!-- col20 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                     <!--    'column_alias': 'company__ds__extract_week'}           -->
                     <!-- col21 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                     <!--    'column_alias': 'company__ds__extract_day'}            -->
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                     <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                     <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col25 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- col26 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                     <!--    'column_alias': 'metric_time__month'}                  -->
                     <!-- col27 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- col28 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- col29 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                     <!-- col30 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                     <!-- col31 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                    <!--    'column_alias': 'metric_time__extract_month'}          -->
+                    <!-- col32 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                    <!--    'column_alias': 'metric_time__extract_week'}           -->
+                    <!-- col33 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                    <!--    'column_alias': 'metric_time__extract_day'}            -->
+                    <!-- col34 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                    <!-- col35 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                    <!-- col36 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                    <!--    'column_alias': 'user'}                                -->
+                    <!-- col37 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                    <!--    'column_alias': 'company__user'}                       -->
+                    <!-- col38 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                     <!-- where = SqlBetweenExpression(node_id=betw_1) -->
@@ -183,131 +211,159 @@
                         <!-- node_id = ss_9 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
                         <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
                         <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                         <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                         <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                         <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                         <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                         <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
                         <!--    'column_alias': 'company__ds__day'}                    -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
                         <!--    'column_alias': 'company__ds__week'}                   -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
                         <!--    'column_alias': 'company__ds__month'}                  -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
                         <!--    'column_alias': 'company__ds__quarter'}                -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
                         <!--    'column_alias': 'company__ds__year'}                   -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
                         <!--    'column_alias': 'company__ds__extract_year'}           -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
                         <!--    'column_alias': 'company__ds__extract_quarter'}        -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
                         <!--    'column_alias': 'company__ds__extract_month'}          -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
                         <!--    'column_alias': 'company__ds__extract_week'}           -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
                         <!--    'column_alias': 'company__ds__extract_day'}            -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
                         <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
                         <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                         <!--    'column_alias': 'metric_time__week'}                   -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                         <!--    'column_alias': 'metric_time__month'}                  -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
                         <!--    'column_alias': 'metric_time__quarter'}                -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                         <!--    'column_alias': 'metric_time__year'}                   -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                        <!--    'column_alias': 'user'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                        <!--    'column_alias': 'metric_time__extract_year'}           -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                        <!--    'column_alias': 'company__user'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                        <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                        <!--    'column_alias': 'metric_time__extract_month'}          -->
+                        <!-- col32 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                        <!--    'column_alias': 'metric_time__extract_week'}           -->
+                        <!-- col33 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                        <!--    'column_alias': 'metric_time__extract_day'}            -->
+                        <!-- col34 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                        <!-- col35 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                        <!-- col36 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                        <!--    'column_alias': 'user'}                                -->
+                        <!-- col37 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                        <!--    'column_alias': 'company__user'}                       -->
+                        <!-- col38 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                         <!--    'column_alias': 'txn_revenue'}                         -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
index db9917690c..dfb4ab1ff7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_13 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
         <!--    'column_alias': 'ds__month'}                           -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
         <!--    'column_alias': 'trailing_2_months_revenue'}           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_12 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
             <!--    'column_alias': 'ds__month'}                           -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_11 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                 <!--    'column_alias': 'ds__month'}                           -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                 <!--    'column_alias': 'txn_revenue'}                         -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                 <!-- where = None -->
@@ -50,131 +50,159 @@
                     <!-- node_id = ss_10 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                     <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                     <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                     <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                     <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                     <!--    'column_alias': 'company__ds__day'}                    -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                     <!--    'column_alias': 'company__ds__week'}                   -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                     <!--    'column_alias': 'company__ds__month'}                  -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                     <!--    'column_alias': 'company__ds__quarter'}                -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                     <!--    'column_alias': 'company__ds__year'}                   -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                     <!--    'column_alias': 'company__ds__extract_year'}           -->
                     <!-- col18 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                     <!--    'column_alias': 'company__ds__extract_quarter'}        -->
                     <!-- col19 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                     <!--    'column_alias': 'company__ds__extract_month'}          -->
                     <!-- col20 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                     <!--    'column_alias': 'company__ds__extract_week'}           -->
                     <!-- col21 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                     <!--    'column_alias': 'company__ds__extract_day'}            -->
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                     <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                     <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col25 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- col26 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                     <!--    'column_alias': 'metric_time__month'}                  -->
                     <!-- col27 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- col28 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- col29 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                     <!-- col30 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
-                    <!--    'column_alias': 'company__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                     <!-- col31 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                    <!--    'column_alias': 'metric_time__extract_month'}          -->
+                    <!-- col32 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                    <!--    'column_alias': 'metric_time__extract_week'}           -->
+                    <!-- col33 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                    <!--    'column_alias': 'metric_time__extract_day'}            -->
+                    <!-- col34 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                    <!-- col35 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                    <!-- col36 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                    <!--    'column_alias': 'user'}                                -->
+                    <!-- col37 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                    <!--    'column_alias': 'company__user'}                       -->
+                    <!-- col38 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
                     <!--    'column_alias': 'txn_revenue'}                         -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                     <!-- where = SqlBetweenExpression(node_id=betw_1) -->
@@ -183,131 +211,159 @@
                         <!-- node_id = ss_9 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
                         <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
                         <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                         <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                         <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                         <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                         <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                         <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
                         <!--    'column_alias': 'company__ds__day'}                    -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
                         <!--    'column_alias': 'company__ds__week'}                   -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
                         <!--    'column_alias': 'company__ds__month'}                  -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
                         <!--    'column_alias': 'company__ds__quarter'}                -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
                         <!--    'column_alias': 'company__ds__year'}                   -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
                         <!--    'column_alias': 'company__ds__extract_year'}           -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
                         <!--    'column_alias': 'company__ds__extract_quarter'}        -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
                         <!--    'column_alias': 'company__ds__extract_month'}          -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
                         <!--    'column_alias': 'company__ds__extract_week'}           -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
                         <!--    'column_alias': 'company__ds__extract_day'}            -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
                         <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
                         <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                         <!--    'column_alias': 'metric_time__week'}                   -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                         <!--    'column_alias': 'metric_time__month'}                  -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
                         <!--    'column_alias': 'metric_time__quarter'}                -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                         <!--    'column_alias': 'metric_time__year'}                   -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                        <!--    'column_alias': 'user'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                        <!--    'column_alias': 'metric_time__extract_year'}           -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                        <!--    'column_alias': 'company__user'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                        <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                        <!--    'column_alias': 'metric_time__extract_month'}          -->
+                        <!-- col32 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                        <!--    'column_alias': 'metric_time__extract_week'}           -->
+                        <!-- col33 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                        <!--    'column_alias': 'metric_time__extract_day'}            -->
+                        <!-- col34 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                        <!-- col35 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                        <!-- col36 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                        <!--    'column_alias': 'user'}                                -->
+                        <!-- col37 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                        <!--    'column_alias': 'company__user'}                       -->
+                        <!-- col38 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                         <!--    'column_alias': 'txn_revenue'}                         -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10006) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml
index 47028f82c6..dd9355e958 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_16 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                                              -->
         <!--   {'class': 'SqlSelectColumn',                                                                      -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
             <!--    'column_alias': 'ref_bookings'}                        -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                 <!--    'column_alias': 'ref_bookings'}                        -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_9 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                         <!--    'column_alias': 'referred_bookings'}                   -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -85,395 +85,423 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -873,11 +901,11 @@
                 <!-- node_id = ss_14 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
@@ -886,7 +914,7 @@
                     <!-- node_id = ss_13 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -895,7 +923,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -905,11 +933,11 @@
                         <!-- node_id = ss_12 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
@@ -918,395 +946,423 @@
                             <!-- node_id = ss_11 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml
index 9b112de652..d630756d83 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_18 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                                         -->
         <!--   {'class': 'SqlSelectColumn',                                                                 -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
             <!--    'column_alias': 'bookings_at_start_of_month'}          -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_9 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -85,395 +85,423 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -873,11 +901,11 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
                 <!--    'column_alias': 'bookings_at_start_of_month'}          -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -886,7 +914,7 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -895,7 +923,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -905,11 +933,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -918,379 +946,379 @@
                             <!-- node_id = ss_13 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col54 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col55 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col56 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col57 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col58 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col60 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col70 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col72 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
                             <!--    'column_alias': 'guest'}                               -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
                             <!--    'column_alias': 'host'}                                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
                             <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
                             <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
                             <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
                             <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
                             <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
                             <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
                             <!--    'column_alias': 'max_booking_value'}                   -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
                             <!--    'column_alias': 'min_booking_value'}                   -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
                             <!--    'column_alias': 'bookers'}                             -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
                             <!--    'column_alias': 'referred_bookings'}                   -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
                             <!--    'column_alias': 'median_booking_value'}                -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
                             <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                             <!-- join_0 =                                                    -->
@@ -1305,7 +1333,7 @@
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -1320,395 +1348,423 @@
                                 <!-- node_id = ss_11 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                                 <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                                 <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                                 <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                                 <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                                 <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                                 <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                                 <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                                 <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                                 <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                                 <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                                 <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                                 <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                                 <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                                 <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                                 <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                                 <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                                 <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                                 <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                                 <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                                 <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                                 <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                                 <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                                 <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                 <!-- col53 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                 <!-- col54 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),        -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                 <!-- col55 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),      -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                 <!-- col56 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                 <!-- col57 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                 <!-- col58 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                 <!-- col59 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}               -->
                                 <!-- col61 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}              -->
                                 <!-- col62 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}             -->
                                 <!-- col63 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                 <!-- col64 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}              -->
                                 <!-- col65 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                 <!-- col66 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                 <!-- col67 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                 <!-- col68 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                 <!-- col69 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                 <!-- col70 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                 <!-- col71 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col73 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                                 <!--    'column_alias': 'metric_time__week'}                   -->
                                 <!-- col74 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
                                 <!--    'column_alias': 'metric_time__month'}                  -->
                                 <!-- col75 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
                                 <!--    'column_alias': 'metric_time__quarter'}                -->
                                 <!-- col76 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
                                 <!--    'column_alias': 'metric_time__year'}                   -->
                                 <!-- col77 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                <!--    'column_alias': 'metric_time__extract_year'}           -->
                                 <!-- col78 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                 <!-- col79 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                                <!--    'column_alias': 'metric_time__extract_month'}          -->
                                 <!-- col80 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                                <!--    'column_alias': 'metric_time__extract_week'}           -->
                                 <!-- col81 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                                <!--    'column_alias': 'metric_time__extract_day'}            -->
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                <!--    'column_alias': 'listing'}                             -->
                                 <!-- col85 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                <!--    'column_alias': 'guest'}                               -->
                                 <!-- col86 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                <!--    'column_alias': 'host'}                                -->
                                 <!-- col87 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
                                 <!-- col88 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
                                 <!-- col89 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
                                 <!-- col90 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
                                 <!-- col91 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
                                 <!-- col92 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
                                 <!-- col93 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
                                 <!-- col94 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
-                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
                                 <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col96 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col97 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col98 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col99 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col100 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col101 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!-- col102 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col96 =                                                         -->
+                                <!-- col103 =                                                        -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col97 =                                                       -->
+                                <!-- col104 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml
index 50437f494c..62931da30f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_18 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
         <!--    'column_alias': 'metric_time__week'}                   -->
         <!-- col1 =                                                                                         -->
         <!--   {'class': 'SqlSelectColumn',                                                                 -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__week'}                                           -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
             <!--    'column_alias': 'bookings_at_start_of_month'}          -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
                 <!--    'column_alias': 'metric_time__week'}                   -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_9 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                         <!--    'column_alias': 'metric_time__week'}                   -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -85,395 +85,423 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -873,11 +901,11 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
                 <!--    'column_alias': 'metric_time__week'}                   -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
                 <!--    'column_alias': 'bookings_at_start_of_month'}          -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -886,7 +914,7 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -895,7 +923,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -905,11 +933,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
                         <!--    'column_alias': 'metric_time__week'}                   -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -922,375 +950,375 @@
                             <!--    'column_alias': 'metric_time__week'}           -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col54 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col55 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col56 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col57 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col58 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col60 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col70 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col72 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
                             <!--    'column_alias': 'guest'}                               -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
                             <!--    'column_alias': 'host'}                                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
                             <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
                             <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
                             <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
                             <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
                             <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
                             <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
                             <!--    'column_alias': 'max_booking_value'}                   -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
                             <!--    'column_alias': 'min_booking_value'}                   -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
                             <!--    'column_alias': 'bookers'}                             -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
                             <!--    'column_alias': 'referred_bookings'}                   -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
                             <!--    'column_alias': 'median_booking_value'}                -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
                             <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                             <!-- join_0 =                                                    -->
@@ -1305,7 +1333,7 @@
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -1320,395 +1348,423 @@
                                 <!-- node_id = ss_11 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                                 <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                                 <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                                 <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                                 <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                                 <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                                 <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                                 <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                                 <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                                 <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                                 <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                                 <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                                 <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                                 <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                                 <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                                 <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                                 <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                                 <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                                 <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                                 <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                                 <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                                 <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                                 <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                                 <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                 <!-- col53 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                 <!-- col54 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),        -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                 <!-- col55 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),      -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                 <!-- col56 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                 <!-- col57 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                 <!-- col58 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                 <!-- col59 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}               -->
                                 <!-- col61 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}              -->
                                 <!-- col62 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}             -->
                                 <!-- col63 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                 <!-- col64 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}              -->
                                 <!-- col65 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                 <!-- col66 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                 <!-- col67 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                 <!-- col68 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                 <!-- col69 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                 <!-- col70 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                 <!-- col71 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col73 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                                 <!--    'column_alias': 'metric_time__week'}                   -->
                                 <!-- col74 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
                                 <!--    'column_alias': 'metric_time__month'}                  -->
                                 <!-- col75 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
                                 <!--    'column_alias': 'metric_time__quarter'}                -->
                                 <!-- col76 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
                                 <!--    'column_alias': 'metric_time__year'}                   -->
                                 <!-- col77 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                <!--    'column_alias': 'metric_time__extract_year'}           -->
                                 <!-- col78 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                 <!-- col79 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                                <!--    'column_alias': 'metric_time__extract_month'}          -->
                                 <!-- col80 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                                <!--    'column_alias': 'metric_time__extract_week'}           -->
                                 <!-- col81 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                                <!--    'column_alias': 'metric_time__extract_day'}            -->
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                <!--    'column_alias': 'listing'}                             -->
                                 <!-- col85 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                <!--    'column_alias': 'guest'}                               -->
                                 <!-- col86 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                <!--    'column_alias': 'host'}                                -->
                                 <!-- col87 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
                                 <!-- col88 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
                                 <!-- col89 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
                                 <!-- col90 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
                                 <!-- col91 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
                                 <!-- col92 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
                                 <!-- col93 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
                                 <!-- col94 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
-                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
                                 <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col96 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col97 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col98 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col99 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col100 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col101 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!-- col102 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col96 =                                                         -->
+                                <!-- col103 =                                                        -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col97 =                                                       -->
+                                <!-- col104 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml
index c61572cec8..f0fad5688e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_18 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                                   -->
         <!--   {'class': 'SqlSelectColumn',                                                           -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
             <!--    'column_alias': 'bookings_2_weeks_ago'}                -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_9 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -85,395 +85,423 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -873,11 +901,11 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
                 <!--    'column_alias': 'bookings_2_weeks_ago'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -886,7 +914,7 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -895,7 +923,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -905,11 +933,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -918,379 +946,379 @@
                             <!-- node_id = ss_13 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col54 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col55 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col56 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col57 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col58 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col60 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col70 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col72 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
                             <!--    'column_alias': 'guest'}                               -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
                             <!--    'column_alias': 'host'}                                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
                             <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
                             <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
                             <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
                             <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
                             <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
                             <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
                             <!--    'column_alias': 'max_booking_value'}                   -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
                             <!--    'column_alias': 'min_booking_value'}                   -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
                             <!--    'column_alias': 'bookers'}                             -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
                             <!--    'column_alias': 'referred_bookings'}                   -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
                             <!--    'column_alias': 'median_booking_value'}                -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
                             <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                             <!-- join_0 =                                                    -->
@@ -1305,7 +1333,7 @@
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -1320,395 +1348,423 @@
                                 <!-- node_id = ss_11 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                                 <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                                 <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                                 <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                                 <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                                 <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                                 <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                                 <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                                 <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                                 <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                                 <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                                 <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                                 <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                                 <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                                 <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                                 <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                                 <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                                 <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                                 <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                                 <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                                 <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                                 <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                                 <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                                 <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                 <!-- col53 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                 <!-- col54 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),        -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                 <!-- col55 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),      -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                 <!-- col56 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                 <!-- col57 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                 <!-- col58 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                 <!-- col59 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}               -->
                                 <!-- col61 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}              -->
                                 <!-- col62 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}             -->
                                 <!-- col63 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                 <!-- col64 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}              -->
                                 <!-- col65 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                 <!-- col66 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                 <!-- col67 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                 <!-- col68 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                 <!-- col69 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                 <!-- col70 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                 <!-- col71 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col73 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                                 <!--    'column_alias': 'metric_time__week'}                   -->
                                 <!-- col74 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
                                 <!--    'column_alias': 'metric_time__month'}                  -->
                                 <!-- col75 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
                                 <!--    'column_alias': 'metric_time__quarter'}                -->
                                 <!-- col76 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
                                 <!--    'column_alias': 'metric_time__year'}                   -->
                                 <!-- col77 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                <!--    'column_alias': 'metric_time__extract_year'}           -->
                                 <!-- col78 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                 <!-- col79 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                                <!--    'column_alias': 'metric_time__extract_month'}          -->
                                 <!-- col80 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                                <!--    'column_alias': 'metric_time__extract_week'}           -->
                                 <!-- col81 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                                <!--    'column_alias': 'metric_time__extract_day'}            -->
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                <!--    'column_alias': 'listing'}                             -->
                                 <!-- col85 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                <!--    'column_alias': 'guest'}                               -->
                                 <!-- col86 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                <!--    'column_alias': 'host'}                                -->
                                 <!-- col87 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
                                 <!-- col88 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
                                 <!-- col89 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
                                 <!-- col90 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
                                 <!-- col91 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
                                 <!-- col92 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
                                 <!-- col93 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
                                 <!-- col94 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
-                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
                                 <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col96 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col97 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col98 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col99 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col100 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col101 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!-- col102 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col96 =                                                         -->
+                                <!-- col103 =                                                        -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col97 =                                                       -->
+                                <!-- col104 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml
index ab7df49f61..df2164f79a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_18 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
         <!--    'column_alias': 'metric_time__quarter'}                -->
         <!-- col1 =                                                                                   -->
         <!--   {'class': 'SqlSelectColumn',                                                           -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__quarter'}                                        -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
             <!--    'column_alias': 'bookings_2_weeks_ago'}                -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
                 <!--    'column_alias': 'metric_time__quarter'}                -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_9 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                         <!--    'column_alias': 'metric_time__quarter'}                -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -85,395 +85,423 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -873,11 +901,11 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
                 <!--    'column_alias': 'metric_time__quarter'}                -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
                 <!--    'column_alias': 'bookings_2_weeks_ago'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -886,7 +914,7 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -895,7 +923,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -905,11 +933,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
                         <!--    'column_alias': 'metric_time__quarter'}                -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -922,375 +950,375 @@
                             <!--    'column_alias': 'metric_time__quarter'}        -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col54 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col55 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col56 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col57 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col58 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col60 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col70 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col72 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
                             <!--    'column_alias': 'guest'}                               -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
                             <!--    'column_alias': 'host'}                                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
                             <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
                             <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
                             <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
                             <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
                             <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
                             <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
                             <!--    'column_alias': 'max_booking_value'}                   -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
                             <!--    'column_alias': 'min_booking_value'}                   -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
                             <!--    'column_alias': 'bookers'}                             -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
                             <!--    'column_alias': 'referred_bookings'}                   -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
                             <!--    'column_alias': 'median_booking_value'}                -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
                             <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                             <!-- join_0 =                                                    -->
@@ -1305,7 +1333,7 @@
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -1320,395 +1348,423 @@
                                 <!-- node_id = ss_11 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                                 <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                                 <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                                 <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                                 <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                                 <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                                 <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                                 <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                                 <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                                 <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                                 <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                                 <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                                 <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                                 <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                                 <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                                 <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                                 <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                                 <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                                 <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                                 <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                                 <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                                 <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                                 <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                                 <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                 <!-- col53 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                 <!-- col54 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),        -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                 <!-- col55 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),      -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                 <!-- col56 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                 <!-- col57 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                 <!-- col58 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                 <!-- col59 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}               -->
                                 <!-- col61 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}              -->
                                 <!-- col62 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}             -->
                                 <!-- col63 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                 <!-- col64 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}              -->
                                 <!-- col65 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                 <!-- col66 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                 <!-- col67 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                 <!-- col68 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                 <!-- col69 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                 <!-- col70 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                 <!-- col71 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col73 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                                 <!--    'column_alias': 'metric_time__week'}                   -->
                                 <!-- col74 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
                                 <!--    'column_alias': 'metric_time__month'}                  -->
                                 <!-- col75 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
                                 <!--    'column_alias': 'metric_time__quarter'}                -->
                                 <!-- col76 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
                                 <!--    'column_alias': 'metric_time__year'}                   -->
                                 <!-- col77 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                <!--    'column_alias': 'metric_time__extract_year'}           -->
                                 <!-- col78 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                 <!-- col79 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                                <!--    'column_alias': 'metric_time__extract_month'}          -->
                                 <!-- col80 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                                <!--    'column_alias': 'metric_time__extract_week'}           -->
                                 <!-- col81 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                                <!--    'column_alias': 'metric_time__extract_day'}            -->
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                <!--    'column_alias': 'listing'}                             -->
                                 <!-- col85 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                <!--    'column_alias': 'guest'}                               -->
                                 <!-- col86 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                <!--    'column_alias': 'host'}                                -->
                                 <!-- col87 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
                                 <!-- col88 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
                                 <!-- col89 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
                                 <!-- col90 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
                                 <!-- col91 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
                                 <!-- col92 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
                                 <!-- col93 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
                                 <!-- col94 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
-                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
                                 <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col96 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col97 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col98 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col99 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col100 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col101 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!-- col102 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col96 =                                                         -->
+                                <!-- col103 =                                                        -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col97 =                                                       -->
+                                <!-- col104 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml
index 964ca40404..aec16b0428 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_20 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_905),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                                               -->
         <!--   {'class': 'SqlSelectColumn',                                                                       -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_901),  -->
             <!--    'column_alias': 'month_start_bookings'}                -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_902),  -->
             <!--    'column_alias': 'bookings_1_month_ago'}                -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_12 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
                 <!--    'column_alias': 'month_start_bookings'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_11 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_10 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                         <!-- where = None -->
@@ -85,379 +85,379 @@
                             <!-- node_id = ss_9 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col54 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col55 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col56 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col57 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col58 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col60 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col70 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col72 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
                             <!--    'column_alias': 'guest'}                               -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
                             <!--    'column_alias': 'host'}                                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                             <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                             <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
                             <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                             <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
                             <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                             <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
                             <!--    'column_alias': 'max_booking_value'}                   -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
                             <!--    'column_alias': 'min_booking_value'}                   -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
                             <!--    'column_alias': 'bookers'}                             -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
                             <!--    'column_alias': 'referred_bookings'}                   -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
                             <!--    'column_alias': 'median_booking_value'}                -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
                             <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- join_0 =                                                    -->
@@ -472,7 +472,7 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -487,395 +487,423 @@
                                 <!-- node_id = ss_7 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                                 <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                                 <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                                 <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                                 <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                                 <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                                 <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                                 <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                                 <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                                 <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                                 <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                                 <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                                 <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                                 <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                                 <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                                 <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                                 <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                                 <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                                 <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                                 <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                                 <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                                 <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                                 <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                                 <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                 <!-- col53 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                 <!-- col54 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                 <!-- col55 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                 <!-- col56 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                 <!-- col57 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                 <!-- col58 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                 <!-- col59 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}               -->
                                 <!-- col61 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}              -->
                                 <!-- col62 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}             -->
                                 <!-- col63 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                 <!-- col64 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}              -->
                                 <!-- col65 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                 <!-- col66 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                 <!-- col67 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                 <!-- col68 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                 <!-- col69 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                 <!-- col70 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                 <!-- col71 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col73 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                                 <!--    'column_alias': 'metric_time__week'}                   -->
                                 <!-- col74 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                                 <!--    'column_alias': 'metric_time__month'}                  -->
                                 <!-- col75 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                                 <!--    'column_alias': 'metric_time__quarter'}                -->
                                 <!-- col76 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                                 <!--    'column_alias': 'metric_time__year'}                   -->
                                 <!-- col77 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                <!--    'column_alias': 'metric_time__extract_year'}           -->
                                 <!-- col78 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                 <!-- col79 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                <!--    'column_alias': 'metric_time__extract_month'}          -->
                                 <!-- col80 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                <!--    'column_alias': 'metric_time__extract_week'}           -->
                                 <!-- col81 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                <!--    'column_alias': 'metric_time__extract_day'}            -->
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                <!--    'column_alias': 'listing'}                             -->
                                 <!-- col85 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                <!--    'column_alias': 'guest'}                               -->
                                 <!-- col86 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                <!--    'column_alias': 'host'}                                -->
                                 <!-- col87 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
                                 <!-- col88 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
                                 <!-- col89 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
                                 <!-- col90 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
                                 <!-- col91 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
                                 <!-- col92 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
                                 <!-- col93 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
                                 <!-- col94 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
                                 <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col96 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col97 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col98 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col99 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col100 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col101 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!-- col102 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col96 =                                                         -->
+                                <!-- col103 =                                                        -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col97 =                                                       -->
+                                <!-- col104 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
@@ -1276,11 +1304,11 @@
                 <!-- node_id = ss_18 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_898),  -->
                 <!--    'column_alias': 'bookings_1_month_ago'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                 <!-- where = None -->
@@ -1289,7 +1317,7 @@
                     <!-- node_id = ss_17 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -1298,7 +1326,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -1308,11 +1336,11 @@
                         <!-- node_id = ss_16 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_894),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_893),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                         <!-- where = None -->
@@ -1321,379 +1349,379 @@
                             <!-- node_id = ss_15 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_892),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_845),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_853),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_857),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_858),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_859),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_864),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_865),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_866),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col54 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col55 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_868),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col56 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_869),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col57 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_870),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col58 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col60 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_875),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_876),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_877),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_878),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_879),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_881),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_882),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col70 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col72 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_887),  -->
                             <!--    'column_alias': 'guest'}                               -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_888),  -->
                             <!--    'column_alias': 'host'}                                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_889),  -->
                             <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_890),  -->
                             <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_891),  -->
                             <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
                             <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
                             <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
                             <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
                             <!--    'column_alias': 'max_booking_value'}                   -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
                             <!--    'column_alias': 'min_booking_value'}                   -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
                             <!--    'column_alias': 'bookers'}                             -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
                             <!--    'column_alias': 'referred_bookings'}                   -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
                             <!--    'column_alias': 'median_booking_value'}                -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
                             <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                             <!-- join_0 =                                                    -->
@@ -1708,7 +1736,7 @@
                                 <!-- node_id = ss_14 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_1) -->
                                 <!-- where = None -->
@@ -1723,395 +1751,423 @@
                                 <!-- node_id = ss_13 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
                                 <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
                                 <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
                                 <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
                                 <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
                                 <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
                                 <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
                                 <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
                                 <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
                                 <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                                 <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                                 <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
                                 <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                                 <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                                 <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                                 <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
                                 <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
                                 <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                                 <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
                                 <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
                                 <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
                                 <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
                                 <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                                 <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                 <!-- col53 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                 <!-- col54 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),        -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                 <!-- col55 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),      -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                 <!-- col56 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                 <!-- col57 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                 <!-- col58 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                 <!-- col59 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}               -->
                                 <!-- col61 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}              -->
                                 <!-- col62 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}             -->
                                 <!-- col63 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                 <!-- col64 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}              -->
                                 <!-- col65 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                 <!-- col66 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                 <!-- col67 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                 <!-- col68 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                 <!-- col69 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                 <!-- col70 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                 <!-- col71 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col73 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                                 <!--    'column_alias': 'metric_time__week'}                   -->
                                 <!-- col74 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
                                 <!--    'column_alias': 'metric_time__month'}                  -->
                                 <!-- col75 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
                                 <!--    'column_alias': 'metric_time__quarter'}                -->
                                 <!-- col76 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
                                 <!--    'column_alias': 'metric_time__year'}                   -->
                                 <!-- col77 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
+                                <!--    'column_alias': 'metric_time__extract_year'}           -->
                                 <!-- col78 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
+                                <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                 <!-- col79 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
+                                <!--    'column_alias': 'metric_time__extract_month'}          -->
                                 <!-- col80 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
+                                <!--    'column_alias': 'metric_time__extract_week'}           -->
                                 <!-- col81 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                                <!--    'column_alias': 'metric_time__extract_day'}            -->
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
+                                <!--    'column_alias': 'listing'}                             -->
                                 <!-- col85 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
+                                <!--    'column_alias': 'guest'}                               -->
                                 <!-- col86 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                                <!--    'column_alias': 'host'}                                -->
                                 <!-- col87 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
                                 <!-- col88 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
                                 <!-- col89 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
                                 <!-- col90 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
                                 <!-- col91 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
                                 <!-- col92 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
                                 <!-- col93 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
                                 <!-- col94 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
-                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
                                 <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col96 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col97 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col98 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col99 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col100 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col101 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!-- col102 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col96 =                                                         -->
+                                <!-- col103 =                                                        -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col97 =                                                       -->
+                                <!-- col104 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml
index bf2ebf93fd..600937f011 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_20 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_905),  -->
         <!--    'column_alias': 'metric_time__year'}                   -->
         <!-- col1 =                                                                                               -->
         <!--   {'class': 'SqlSelectColumn',                                                                       -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__year'}                                           -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_901),  -->
             <!--    'column_alias': 'month_start_bookings'}                -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_902),  -->
             <!--    'column_alias': 'bookings_1_month_ago'}                -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_12 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
                 <!--    'column_alias': 'metric_time__year'}                   -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
                 <!--    'column_alias': 'month_start_bookings'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_11 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_10 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
                         <!--    'column_alias': 'metric_time__year'}                   -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                         <!-- where = None -->
@@ -89,375 +89,375 @@
                             <!--    'column_alias': 'metric_time__year'}           -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col54 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col55 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col56 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col57 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col58 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col60 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col70 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col72 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
                             <!--    'column_alias': 'guest'}                               -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
                             <!--    'column_alias': 'host'}                                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                             <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                             <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
                             <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                             <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
                             <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                             <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
                             <!--    'column_alias': 'max_booking_value'}                   -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
                             <!--    'column_alias': 'min_booking_value'}                   -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
                             <!--    'column_alias': 'bookers'}                             -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
                             <!--    'column_alias': 'referred_bookings'}                   -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
                             <!--    'column_alias': 'median_booking_value'}                -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
                             <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- join_0 =                                                    -->
@@ -472,7 +472,7 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -487,395 +487,423 @@
                                 <!-- node_id = ss_7 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                                 <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                                 <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                                 <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                                 <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                                 <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                                 <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                                 <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                                 <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                                 <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                                 <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                                 <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                                 <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                                 <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                                 <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                                 <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                                 <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                                 <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                                 <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                                 <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                                 <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                                 <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                                 <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                                 <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                 <!-- col53 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                 <!-- col54 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                 <!-- col55 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                 <!-- col56 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                 <!-- col57 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                 <!-- col58 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                 <!-- col59 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}               -->
                                 <!-- col61 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}              -->
                                 <!-- col62 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}             -->
                                 <!-- col63 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                 <!-- col64 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}              -->
                                 <!-- col65 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                 <!-- col66 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                 <!-- col67 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                 <!-- col68 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                 <!-- col69 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                 <!-- col70 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                 <!-- col71 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col73 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                                 <!--    'column_alias': 'metric_time__week'}                   -->
                                 <!-- col74 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                                 <!--    'column_alias': 'metric_time__month'}                  -->
                                 <!-- col75 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                                 <!--    'column_alias': 'metric_time__quarter'}                -->
                                 <!-- col76 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                                 <!--    'column_alias': 'metric_time__year'}                   -->
                                 <!-- col77 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                <!--    'column_alias': 'metric_time__extract_year'}           -->
                                 <!-- col78 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                 <!-- col79 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                <!--    'column_alias': 'metric_time__extract_month'}          -->
                                 <!-- col80 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                <!--    'column_alias': 'metric_time__extract_week'}           -->
                                 <!-- col81 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                <!--    'column_alias': 'metric_time__extract_day'}            -->
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                <!--    'column_alias': 'listing'}                             -->
                                 <!-- col85 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                <!--    'column_alias': 'guest'}                               -->
                                 <!-- col86 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                <!--    'column_alias': 'host'}                                -->
                                 <!-- col87 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
                                 <!-- col88 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
                                 <!-- col89 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
                                 <!-- col90 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
                                 <!-- col91 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
                                 <!-- col92 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
                                 <!-- col93 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
                                 <!-- col94 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
                                 <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col96 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col97 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col98 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col99 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col100 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col101 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!-- col102 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col96 =                                                         -->
+                                <!-- col103 =                                                        -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col97 =                                                       -->
+                                <!-- col104 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
@@ -1276,11 +1304,11 @@
                 <!-- node_id = ss_18 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),  -->
                 <!--    'column_alias': 'metric_time__year'}                   -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_898),  -->
                 <!--    'column_alias': 'bookings_1_month_ago'}                -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                 <!-- where = None -->
@@ -1289,7 +1317,7 @@
                     <!-- node_id = ss_17 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -1298,7 +1326,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -1308,11 +1336,11 @@
                         <!-- node_id = ss_16 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_894),  -->
                         <!--    'column_alias': 'metric_time__year'}                   -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_893),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                         <!-- where = None -->
@@ -1325,375 +1353,375 @@
                             <!--    'column_alias': 'metric_time__year'}           -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_845),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_853),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_857),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_858),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_859),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_864),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_865),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_866),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col54 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col55 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_868),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col56 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_869),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col57 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_870),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col58 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col60 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_875),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_876),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_877),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_878),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_879),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_881),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_882),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col70 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col72 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_887),  -->
                             <!--    'column_alias': 'guest'}                               -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_888),  -->
                             <!--    'column_alias': 'host'}                                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_889),  -->
                             <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_890),  -->
                             <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_891),  -->
                             <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
                             <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
                             <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
                             <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
                             <!--    'column_alias': 'max_booking_value'}                   -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
                             <!--    'column_alias': 'min_booking_value'}                   -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
                             <!--    'column_alias': 'bookers'}                             -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
                             <!--    'column_alias': 'referred_bookings'}                   -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
                             <!--    'column_alias': 'median_booking_value'}                -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
                             <!--    'column_alias': 'booking_value_p99'}                   -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
                             <!-- col92 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                             <!-- col93 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                             <!-- join_0 =                                                    -->
@@ -1708,7 +1736,7 @@
                                 <!-- node_id = ss_14 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_1) -->
                                 <!-- where = None -->
@@ -1723,395 +1751,423 @@
                                 <!-- node_id = ss_13 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
                                 <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
                                 <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
                                 <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
                                 <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
                                 <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
                                 <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
                                 <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
                                 <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
                                 <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                                 <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                                 <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
                                 <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                                 <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                                 <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                                 <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
                                 <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
                                 <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                                 <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
                                 <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
                                 <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
                                 <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
                                 <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                                 <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                 <!-- col53 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                 <!-- col54 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),        -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                 <!-- col55 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),      -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                 <!-- col56 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                 <!-- col57 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                 <!-- col58 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                 <!-- col59 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}               -->
                                 <!-- col61 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}              -->
                                 <!-- col62 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}             -->
                                 <!-- col63 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                 <!-- col64 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}              -->
                                 <!-- col65 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                 <!-- col66 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                 <!-- col67 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                 <!-- col68 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                 <!-- col69 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                 <!-- col70 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                 <!-- col71 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col73 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                                 <!--    'column_alias': 'metric_time__week'}                   -->
                                 <!-- col74 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
                                 <!--    'column_alias': 'metric_time__month'}                  -->
                                 <!-- col75 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
                                 <!--    'column_alias': 'metric_time__quarter'}                -->
                                 <!-- col76 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
                                 <!--    'column_alias': 'metric_time__year'}                   -->
                                 <!-- col77 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
+                                <!--    'column_alias': 'metric_time__extract_year'}           -->
                                 <!-- col78 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
+                                <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                 <!-- col79 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
+                                <!--    'column_alias': 'metric_time__extract_month'}          -->
                                 <!-- col80 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
+                                <!--    'column_alias': 'metric_time__extract_week'}           -->
                                 <!-- col81 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                                <!--    'column_alias': 'metric_time__extract_day'}            -->
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
+                                <!--    'column_alias': 'listing'}                             -->
                                 <!-- col85 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
+                                <!--    'column_alias': 'guest'}                               -->
                                 <!-- col86 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                                <!--    'column_alias': 'host'}                                -->
                                 <!-- col87 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
                                 <!-- col88 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
                                 <!-- col89 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
                                 <!-- col90 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
                                 <!-- col91 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
                                 <!-- col92 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
                                 <!-- col93 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
                                 <!-- col94 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
-                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
                                 <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col96 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col97 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col98 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col99 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col100 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col101 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!-- col102 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col96 =                                                         -->
+                                <!-- col103 =                                                        -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col97 =                                                       -->
+                                <!-- col104 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml
index b4604d9a7a..30d603cdd8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_15 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                                   -->
         <!--   {'class': 'SqlSelectColumn',                                                           -->
@@ -17,11 +17,11 @@
             <!-- node_id = ss_14 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
             <!--    'column_alias': 'every_2_days_bookers_2_days_ago'}     -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
             <!-- where = None -->
@@ -30,7 +30,7 @@
                 <!-- node_id = ss_13 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                                  -->
                 <!--   {'class': 'SqlSelectColumn',                                                          -->
@@ -39,7 +39,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -49,11 +49,11 @@
                     <!-- node_id = ss_12 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
                     <!--    'column_alias': 'bookers'}                             -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                     <!-- where = None -->
@@ -62,379 +62,379 @@
                         <!-- node_id = ss_11 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
                         <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
                         <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
                         <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
                         <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
                         <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
                         <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
                         <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
                         <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
                         <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
                         <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
                         <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                         <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
                         <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
                         <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
                         <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
                         <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
                         <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                         <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
                         <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
                         <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
                         <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                         <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
                         <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
                         <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
                         <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
                         <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
                         <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
                         <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
                         <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
                         <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
                         <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                         <!-- col50 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                         <!-- col51 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                         <!-- col52 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                         <!-- col53 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                         <!-- col54 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                         <!-- col55 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),        -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                         <!-- col56 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),      -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                         <!-- col57 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                         <!-- col58 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                         <!-- col59 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                         <!-- col60 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                         <!-- col61 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
                         <!--    'column_alias': 'booking__paid_at__day'}               -->
                         <!-- col62 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
                         <!--    'column_alias': 'booking__paid_at__week'}              -->
                         <!-- col63 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
                         <!--    'column_alias': 'booking__paid_at__month'}             -->
                         <!-- col64 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
                         <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                         <!-- col65 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                         <!--    'column_alias': 'booking__paid_at__year'}              -->
                         <!-- col66 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                         <!-- col67 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                         <!-- col68 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                         <!-- col69 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                         <!-- col70 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                         <!-- col71 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                         <!-- col72 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                         <!-- col73 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
                         <!--    'column_alias': 'listing'}                             -->
                         <!-- col74 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
                         <!--    'column_alias': 'guest'}                               -->
                         <!-- col75 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
                         <!--    'column_alias': 'host'}                                -->
                         <!-- col76 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
                         <!--    'column_alias': 'booking__listing'}                    -->
                         <!-- col77 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
                         <!--    'column_alias': 'booking__guest'}                      -->
                         <!-- col78 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
                         <!--    'column_alias': 'booking__host'}                       -->
                         <!-- col79 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
                         <!--    'column_alias': 'is_instant'}                          -->
                         <!-- col80 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
                         <!--    'column_alias': 'booking__is_instant'}                 -->
                         <!-- col81 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- col82 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
                         <!--    'column_alias': 'instant_bookings'}                    -->
                         <!-- col83 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
                         <!--    'column_alias': 'booking_value'}                       -->
                         <!-- col84 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
                         <!--    'column_alias': 'max_booking_value'}                   -->
                         <!-- col85 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
                         <!--    'column_alias': 'min_booking_value'}                   -->
                         <!-- col86 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
                         <!--    'column_alias': 'bookers'}                             -->
                         <!-- col87 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
                         <!--    'column_alias': 'average_booking_value'}               -->
                         <!-- col88 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
                         <!--    'column_alias': 'referred_bookings'}                   -->
                         <!-- col89 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
                         <!--    'column_alias': 'median_booking_value'}                -->
                         <!-- col90 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
                         <!--    'column_alias': 'booking_value_p99'}                   -->
                         <!-- col91 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
                         <!-- col92 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                         <!-- col93 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                         <!-- join_0 =                                                    -->
@@ -449,7 +449,7 @@
                             <!-- node_id = ss_10 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_1) -->
                             <!-- where = None -->
@@ -464,395 +464,423 @@
                             <!-- node_id = ss_9 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col54 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col55 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col56 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col57 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col58 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col60 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col70 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col72 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- join_0 =                                                  -->
@@ -867,7 +895,7 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                                 <!-- where = None -->
@@ -882,395 +910,423 @@
                                 <!-- node_id = ss_7 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                                 <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                                 <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                                 <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                                 <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                                 <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                                 <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                                 <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                                 <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                                 <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                                 <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                                 <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                                 <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                                 <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                                 <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                                 <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                                 <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                                 <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                                 <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                                 <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                                 <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                                 <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                                 <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                                 <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                 <!-- col53 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                 <!-- col54 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                 <!-- col55 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                 <!-- col56 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                 <!-- col57 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                 <!-- col58 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                 <!-- col59 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}               -->
                                 <!-- col61 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}              -->
                                 <!-- col62 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}             -->
                                 <!-- col63 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                 <!-- col64 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}              -->
                                 <!-- col65 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                 <!-- col66 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                 <!-- col67 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                 <!-- col68 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                 <!-- col69 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                 <!-- col70 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                 <!-- col71 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col73 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                                 <!--    'column_alias': 'metric_time__week'}                   -->
                                 <!-- col74 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                                 <!--    'column_alias': 'metric_time__month'}                  -->
                                 <!-- col75 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                                 <!--    'column_alias': 'metric_time__quarter'}                -->
                                 <!-- col76 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                                 <!--    'column_alias': 'metric_time__year'}                   -->
                                 <!-- col77 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                <!--    'column_alias': 'metric_time__extract_year'}           -->
                                 <!-- col78 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                 <!-- col79 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                <!--    'column_alias': 'metric_time__extract_month'}          -->
                                 <!-- col80 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                <!--    'column_alias': 'metric_time__extract_week'}           -->
                                 <!-- col81 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                <!--    'column_alias': 'metric_time__extract_day'}            -->
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                <!--    'column_alias': 'listing'}                             -->
                                 <!-- col85 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                <!--    'column_alias': 'guest'}                               -->
                                 <!-- col86 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                <!--    'column_alias': 'host'}                                -->
                                 <!-- col87 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
                                 <!-- col88 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
                                 <!-- col89 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
                                 <!-- col90 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
                                 <!-- col91 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
                                 <!-- col92 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
                                 <!-- col93 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
                                 <!-- col94 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
                                 <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col96 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col97 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col98 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col99 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col100 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col101 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!-- col102 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col96 =                                                         -->
+                                <!-- col103 =                                                        -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col97 =                                                       -->
+                                <!-- col104 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml
index edcddda734..3a6e566a97 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_13 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                       -->
         <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -17,11 +17,11 @@
             <!-- node_id = ss_12 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
             <!--    'column_alias': 'bookings_5_days_ago'}                 -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
             <!-- where = None -->
@@ -30,7 +30,7 @@
                 <!-- node_id = ss_11 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -39,7 +39,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -49,11 +49,11 @@
                     <!-- node_id = ss_10 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                     <!-- where = None -->
@@ -62,379 +62,379 @@
                         <!-- node_id = ss_9 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                         <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                         <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                         <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                         <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                         <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                         <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                         <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                         <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                         <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                         <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                         <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                         <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                         <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                         <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                         <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                         <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                         <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                         <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                         <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                         <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                         <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                         <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                         <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                         <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                         <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                         <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                         <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                         <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                         <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                         <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                         <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                         <!-- col50 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                         <!-- col51 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                         <!-- col52 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                         <!-- col53 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                         <!-- col54 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                         <!-- col55 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),        -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                         <!-- col56 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),      -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                         <!-- col57 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                         <!-- col58 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                         <!-- col59 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                         <!-- col60 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                         <!-- col61 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
                         <!--    'column_alias': 'booking__paid_at__day'}               -->
                         <!-- col62 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
                         <!--    'column_alias': 'booking__paid_at__week'}              -->
                         <!-- col63 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
                         <!--    'column_alias': 'booking__paid_at__month'}             -->
                         <!-- col64 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                         <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                         <!-- col65 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                         <!--    'column_alias': 'booking__paid_at__year'}              -->
                         <!-- col66 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                         <!-- col67 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                         <!-- col68 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                         <!-- col69 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                         <!-- col70 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                         <!-- col71 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                         <!-- col72 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                         <!-- col73 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                         <!--    'column_alias': 'listing'}                             -->
                         <!-- col74 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
                         <!--    'column_alias': 'guest'}                               -->
                         <!-- col75 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
                         <!--    'column_alias': 'host'}                                -->
                         <!-- col76 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                         <!--    'column_alias': 'booking__listing'}                    -->
                         <!-- col77 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                         <!--    'column_alias': 'booking__guest'}                      -->
                         <!-- col78 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
                         <!--    'column_alias': 'booking__host'}                       -->
                         <!-- col79 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                         <!--    'column_alias': 'is_instant'}                          -->
                         <!-- col80 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                         <!--    'column_alias': 'booking__is_instant'}                 -->
                         <!-- col81 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- col82 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
                         <!--    'column_alias': 'instant_bookings'}                    -->
                         <!-- col83 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                         <!--    'column_alias': 'booking_value'}                       -->
                         <!-- col84 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
                         <!--    'column_alias': 'max_booking_value'}                   -->
                         <!-- col85 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
                         <!--    'column_alias': 'min_booking_value'}                   -->
                         <!-- col86 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
                         <!--    'column_alias': 'bookers'}                             -->
                         <!-- col87 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
                         <!--    'column_alias': 'average_booking_value'}               -->
                         <!-- col88 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
                         <!--    'column_alias': 'referred_bookings'}                   -->
                         <!-- col89 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
                         <!--    'column_alias': 'median_booking_value'}                -->
                         <!-- col90 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                         <!--    'column_alias': 'booking_value_p99'}                   -->
                         <!-- col91 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
                         <!-- col92 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
                         <!-- col93 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                         <!-- join_0 =                                                    -->
@@ -449,7 +449,7 @@
                             <!-- node_id = ss_8 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
                             <!-- where = None -->
@@ -464,395 +464,423 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml
index 07444a9b99..b0116367f0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml
@@ -4,13 +4,13 @@
         <!-- node_id = ss_16 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
         <!--    'column_alias': 'listing__country_latest'}             -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
         <!-- where = None -->
         <!-- order_by0 =                                               -->
         <!--   {'class': 'SqlOrderByDescription',                      -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
         <!--    'desc': False}                                         -->
         <SqlSelectStatementNode>
             <!-- description =                    -->
@@ -19,7 +19,7 @@
             <!-- node_id = ss_15 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
             <!--    'column_alias': 'listing__country_latest'}             -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
             <!-- where = None -->
@@ -28,11 +28,11 @@
                 <!-- node_id = ss_14 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                 <!--    'column_alias': 'listing__country_latest'}             -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
@@ -41,7 +41,7 @@
                     <!-- node_id = ss_13 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -50,7 +50,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -60,11 +60,11 @@
                         <!-- node_id = ss_12 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                         <!--    'column_alias': 'listing__country_latest'}             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
@@ -73,15 +73,15 @@
                             <!-- node_id = ss_11 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
                             <!--    'column_alias': 'listing__country_latest'}             -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- join_0 =                                                    -->
@@ -98,11 +98,11 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
@@ -111,395 +111,423 @@
                                     <!-- node_id = ss_7 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                                     <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                                     <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                                     <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                                     <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                                     <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                                     <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                                     <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                                     <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                                     <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                                     <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                                     <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                                     <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                                     <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                                     <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                                     <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                                     <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                                     <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                                     <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                                     <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                                     <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                     <!-- col53 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                     <!-- col54 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                     <!-- col55 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                     <!-- col56 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                     <!-- col57 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                     <!-- col58 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                     <!-- col59 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}               -->
                                     <!-- col61 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}              -->
                                     <!-- col62 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}             -->
                                     <!-- col63 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                     <!-- col64 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}              -->
                                     <!-- col65 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                     <!-- col66 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                     <!-- col67 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                     <!-- col68 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                     <!-- col69 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                     <!-- col70 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                     <!-- col71 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col73 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                                     <!--    'column_alias': 'metric_time__week'}                   -->
                                     <!-- col74 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                                     <!--    'column_alias': 'metric_time__month'}                  -->
                                     <!-- col75 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                                     <!--    'column_alias': 'metric_time__quarter'}                -->
                                     <!-- col76 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                                     <!--    'column_alias': 'metric_time__year'}                   -->
                                     <!-- col77 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                                     <!-- col78 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                     <!-- col79 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                    <!--    'column_alias': 'metric_time__extract_month'}          -->
                                     <!-- col80 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                    <!--    'column_alias': 'metric_time__extract_week'}           -->
                                     <!-- col81 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                    <!--    'column_alias': 'metric_time__extract_day'}            -->
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
                                     <!-- col85 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
                                     <!-- col86 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                    <!--    'column_alias': 'host'}                                -->
                                     <!-- col87 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
                                     <!-- col88 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
                                     <!-- col89 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
                                     <!-- col90 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
                                     <!-- col91 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
                                     <!-- col92 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
                                     <!-- col93 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
                                     <!-- col94 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
                                     <!-- col95 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!-- col96 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!-- col97 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col98 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!-- col99 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!-- col100 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!-- col101 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                                    <!-- col102 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                    <!-- col96 =                                                         -->
+                                    <!-- col103 =                                                        -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                    <!-- col97 =                                                       -->
+                                    <!-- col104 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
@@ -899,11 +927,11 @@
                                 <!-- node_id = ss_10 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
                                 <!--    'column_alias': 'country_latest'}                      -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                                 <!-- where = None -->
@@ -912,263 +940,291 @@
                                     <!-- node_id = ss_9 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                                     <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                                     <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                                     <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                                     <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                                     <!--    'column_alias': 'created_at__day'}                     -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                                     <!--    'column_alias': 'created_at__week'}                    -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                                     <!--    'column_alias': 'created_at__month'}                   -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                                     <!--    'column_alias': 'created_at__quarter'}                 -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                                     <!--    'column_alias': 'created_at__year'}                    -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                                     <!--    'column_alias': 'created_at__extract_year'}            -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                                     <!--    'column_alias': 'created_at__extract_quarter'}         -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                                     <!--    'column_alias': 'created_at__extract_month'}           -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                                     <!--    'column_alias': 'created_at__extract_week'}            -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                                     <!--    'column_alias': 'created_at__extract_day'}             -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                                     <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                                     <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                                     <!--    'column_alias': 'listing__ds__day'}                    -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                                     <!--    'column_alias': 'listing__ds__week'}                   -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                                     <!--    'column_alias': 'listing__ds__month'}                  -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                                     <!--    'column_alias': 'listing__ds__quarter'}                -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                                     <!--    'column_alias': 'listing__ds__year'}                   -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                                     <!--    'column_alias': 'listing__ds__extract_year'}           -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                                     <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                                     <!--    'column_alias': 'listing__ds__extract_month'}          -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                                     <!--    'column_alias': 'listing__ds__extract_week'}           -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                                     <!--    'column_alias': 'listing__ds__extract_day'}            -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                                     <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                                     <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                                     <!--    'column_alias': 'listing__created_at__day'}            -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                     <!--    'column_alias': 'listing__created_at__week'}           -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                                     <!--    'column_alias': 'listing__created_at__month'}          -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                                     <!--    'column_alias': 'listing__created_at__quarter'}        -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                                     <!--    'column_alias': 'listing__created_at__year'}           -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_year'}   -->
                                     <!-- col42 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),    -->
                                     <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_month'}  -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_week'}   -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_day'}    -->
                                     <!-- col46 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),      -->
                                     <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
                                     <!-- col47 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),      -->
                                     <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                                     <!--    'column_alias': 'metric_time__week'}                   -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                                     <!--    'column_alias': 'metric_time__month'}                  -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                                     <!--    'column_alias': 'metric_time__quarter'}                -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                                     <!--    'column_alias': 'metric_time__year'}                   -->
                                     <!-- col53 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                                     <!-- col54 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
-                                    <!--    'column_alias': 'user'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                     <!-- col55 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
-                                    <!--    'column_alias': 'listing__user'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                                    <!--    'column_alias': 'metric_time__extract_month'}          -->
                                     <!-- col56 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
-                                    <!--    'column_alias': 'country_latest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                                    <!--    'column_alias': 'metric_time__extract_week'}           -->
                                     <!-- col57 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                                    <!--    'column_alias': 'metric_time__extract_day'}            -->
                                     <!-- col58 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                     <!-- col59 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
                                     <!-- col61 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                                    <!--    'column_alias': 'user'}                                -->
                                     <!-- col62 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
-                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                                    <!--    'column_alias': 'listing__user'}                       -->
                                     <!-- col63 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
-                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                    <!--    'column_alias': 'country_latest'}                      -->
                                     <!-- col64 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!-- col65 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!-- col66 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!-- col67 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!-- col68 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!-- col69 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!-- col70 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!-- col71 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
                                     <!--    'column_alias': 'smallest_listing'}                    -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml
index 38e7f01169..a809f0c726 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_16 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
         <!--    'column_alias': 'is_instant'}                          -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_15 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
             <!--    'column_alias': 'is_instant'}                          -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
             <!--    'column_alias': 'is_instant'}                          -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_14 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                 <!--    'column_alias': 'is_instant'}                          -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
@@ -49,15 +49,15 @@
                     <!-- node_id = ss_13 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                     <!--    'column_alias': 'is_instant'}                          -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                     <!--    'column_alias': 'listing__country_latest'}             -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                     <!-- where =                                                                       -->
@@ -69,15 +69,15 @@
                         <!-- node_id = ss_12 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                         <!--    'column_alias': 'is_instant'}                          -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                         <!--    'column_alias': 'listing__country_latest'}             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
@@ -86,19 +86,19 @@
                             <!-- node_id = ss_11 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
                             <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                             <!--    'column_alias': 'listing__country_latest'}             -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- join_0 =                                                    -->
@@ -115,15 +115,15 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                                 <!--    'column_alias': 'is_instant'}                          -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
@@ -132,395 +132,423 @@
                                     <!-- node_id = ss_7 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                                     <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                                     <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                                     <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                                     <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                                     <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                                     <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                                     <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                                     <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                                     <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                                     <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                                     <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                                     <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                                     <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                                     <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                                     <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                                     <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                                     <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                                     <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                                     <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                                     <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                     <!-- col53 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                     <!-- col54 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                     <!-- col55 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                     <!-- col56 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                     <!-- col57 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                     <!-- col58 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                     <!-- col59 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}               -->
                                     <!-- col61 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}              -->
                                     <!-- col62 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}             -->
                                     <!-- col63 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                     <!-- col64 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}              -->
                                     <!-- col65 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                     <!-- col66 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                     <!-- col67 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                     <!-- col68 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                     <!-- col69 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                     <!-- col70 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                     <!-- col71 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col73 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                                     <!--    'column_alias': 'metric_time__week'}                   -->
                                     <!-- col74 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                                     <!--    'column_alias': 'metric_time__month'}                  -->
                                     <!-- col75 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                                     <!--    'column_alias': 'metric_time__quarter'}                -->
                                     <!-- col76 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                                     <!--    'column_alias': 'metric_time__year'}                   -->
                                     <!-- col77 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                                     <!-- col78 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                     <!-- col79 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                    <!--    'column_alias': 'metric_time__extract_month'}          -->
                                     <!-- col80 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                    <!--    'column_alias': 'metric_time__extract_week'}           -->
                                     <!-- col81 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                    <!--    'column_alias': 'metric_time__extract_day'}            -->
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
                                     <!-- col85 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
                                     <!-- col86 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                    <!--    'column_alias': 'host'}                                -->
                                     <!-- col87 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
                                     <!-- col88 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
                                     <!-- col89 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
                                     <!-- col90 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
                                     <!-- col91 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
                                     <!-- col92 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
                                     <!-- col93 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
                                     <!-- col94 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
                                     <!-- col95 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!-- col96 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!-- col97 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col98 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!-- col99 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!-- col100 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!-- col101 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                                    <!-- col102 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                    <!-- col96 =                                                         -->
+                                    <!-- col103 =                                                        -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                    <!-- col97 =                                                       -->
+                                    <!-- col104 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
@@ -920,11 +948,11 @@
                                 <!-- node_id = ss_10 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
                                 <!--    'column_alias': 'country_latest'}                      -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                                 <!-- where = None -->
@@ -933,263 +961,291 @@
                                     <!-- node_id = ss_9 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                                     <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                                     <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                                     <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                                     <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                                     <!--    'column_alias': 'created_at__day'}                     -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                                     <!--    'column_alias': 'created_at__week'}                    -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                                     <!--    'column_alias': 'created_at__month'}                   -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                                     <!--    'column_alias': 'created_at__quarter'}                 -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                                     <!--    'column_alias': 'created_at__year'}                    -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                                     <!--    'column_alias': 'created_at__extract_year'}            -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                                     <!--    'column_alias': 'created_at__extract_quarter'}         -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                                     <!--    'column_alias': 'created_at__extract_month'}           -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                                     <!--    'column_alias': 'created_at__extract_week'}            -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                                     <!--    'column_alias': 'created_at__extract_day'}             -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                                     <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                                     <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                                     <!--    'column_alias': 'listing__ds__day'}                    -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                                     <!--    'column_alias': 'listing__ds__week'}                   -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                                     <!--    'column_alias': 'listing__ds__month'}                  -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                                     <!--    'column_alias': 'listing__ds__quarter'}                -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                                     <!--    'column_alias': 'listing__ds__year'}                   -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                                     <!--    'column_alias': 'listing__ds__extract_year'}           -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                                     <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                                     <!--    'column_alias': 'listing__ds__extract_month'}          -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                                     <!--    'column_alias': 'listing__ds__extract_week'}           -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                                     <!--    'column_alias': 'listing__ds__extract_day'}            -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                                     <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                                     <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                     <!--    'column_alias': 'listing__created_at__day'}            -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                                     <!--    'column_alias': 'listing__created_at__week'}           -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                                     <!--    'column_alias': 'listing__created_at__month'}          -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                                     <!--    'column_alias': 'listing__created_at__quarter'}        -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                                     <!--    'column_alias': 'listing__created_at__year'}           -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_year'}   -->
                                     <!-- col42 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),    -->
                                     <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_month'}  -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_week'}   -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_day'}    -->
                                     <!-- col46 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),      -->
                                     <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
                                     <!-- col47 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),      -->
                                     <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                                     <!--    'column_alias': 'metric_time__week'}                   -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                                     <!--    'column_alias': 'metric_time__month'}                  -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                                     <!--    'column_alias': 'metric_time__quarter'}                -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                                     <!--    'column_alias': 'metric_time__year'}                   -->
                                     <!-- col53 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                                     <!-- col54 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
-                                    <!--    'column_alias': 'user'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                     <!-- col55 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
-                                    <!--    'column_alias': 'listing__user'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                                    <!--    'column_alias': 'metric_time__extract_month'}          -->
                                     <!-- col56 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                                    <!--    'column_alias': 'country_latest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                                    <!--    'column_alias': 'metric_time__extract_week'}           -->
                                     <!-- col57 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                                    <!--    'column_alias': 'metric_time__extract_day'}            -->
                                     <!-- col58 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                     <!-- col59 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
                                     <!-- col61 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                                    <!--    'column_alias': 'user'}                                -->
                                     <!-- col62 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
-                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                                    <!--    'column_alias': 'listing__user'}                       -->
                                     <!-- col63 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
-                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                    <!--    'column_alias': 'country_latest'}                      -->
                                     <!-- col64 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                                    <!-- col65 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                    <!--    'column_alias': 'capacity_latest'}                     -->
+                                    <!-- col66 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                    <!--    'column_alias': 'listing__country_latest'}             -->
+                                    <!-- col67 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                    <!-- col68 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                    <!-- col69 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                    <!--    'column_alias': 'listings'}                            -->
+                                    <!-- col70 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                    <!--    'column_alias': 'largest_listing'}                     -->
+                                    <!-- col71 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                                     <!--    'column_alias': 'smallest_listing'}                    -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
index bc1b1e86fe..9cc83dfb26 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_10 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
         <!--    'column_alias': 'family_bookings'}                     -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_9 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_8 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
@@ -49,15 +49,15 @@
                     <!-- node_id = ss_7 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
                     <!--    'column_alias': 'listing__capacity'}                   -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_6) -->
                     <!-- where =                                                              -->
@@ -69,15 +69,15 @@
                         <!-- node_id = ss_6 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
                         <!--    'column_alias': 'listing__capacity'}                   -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_5) -->
                         <!-- where = None -->
@@ -86,27 +86,27 @@
                             <!-- node_id = ss_5 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
-                            <!-- col1 =                                                     -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),   -->
-                            <!--    'column_alias': 'listing__window_start__extract_week'}  -->
+                            <!-- col1 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                            <!--    'column_alias': 'listing__window_start__day'}          -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
                             <!--    'column_alias': 'listing__window_end__day'}            -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
                             <!--    'column_alias': 'listing__capacity'}                   -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_3) -->
                             <!-- join_0 =                                                  -->
@@ -123,15 +123,15 @@
                                 <!-- node_id = ss_3 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_2) -->
                                 <!-- where = None -->
@@ -140,371 +140,399 @@
                                     <!-- node_id = ss_2 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_187),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_201),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_188),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_202),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_189),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_203),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_190),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_204),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_191),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_205),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_192),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_206),  -->
                                     <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_193),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_207),  -->
                                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_194),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_208),  -->
                                     <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_195),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_209),  -->
                                     <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_196),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_210),  -->
                                     <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_197),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_211),  -->
                                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_198),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_212),  -->
                                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_199),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_213),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_200),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_214),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_201),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_215),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_202),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_216),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_203),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_217),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_204),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_218),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_205),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_219),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_206),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_220),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_207),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_221),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_208),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_222),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_209),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_223),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_210),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_224),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_211),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_225),  -->
                                     <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_212),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_226),  -->
                                     <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_213),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_227),  -->
                                     <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_214),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_228),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_215),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_229),  -->
                                     <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_216),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_230),  -->
                                     <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_217),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_231),  -->
                                     <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_218),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_232),  -->
                                     <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_219),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_233),  -->
                                     <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_220),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_234),  -->
                                     <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_221),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_235),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_222),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_236),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_223),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_237),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_224),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
                                     <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_225),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
                                     <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_226),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_227),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
                                     <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_228),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
                                     <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_229),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
                                     <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_230),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
                                     <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_231),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
                                     <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_232),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_233),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_234),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_235),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_236),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_237),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                     <!-- col53 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                     <!-- col54 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),        -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                     <!-- col55 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),      -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                     <!-- col56 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                     <!-- col57 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                     <!-- col58 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                     <!-- col59 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}               -->
                                     <!-- col61 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}              -->
                                     <!-- col62 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}             -->
                                     <!-- col63 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                     <!-- col64 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}              -->
                                     <!-- col65 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                     <!-- col66 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                     <!-- col67 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                     <!-- col68 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                     <!-- col69 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                     <!-- col70 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                     <!-- col71 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col73 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
                                     <!--    'column_alias': 'metric_time__week'}                   -->
                                     <!-- col74 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
                                     <!--    'column_alias': 'metric_time__month'}                  -->
                                     <!-- col75 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
                                     <!--    'column_alias': 'metric_time__quarter'}                -->
                                     <!-- col76 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
                                     <!--    'column_alias': 'metric_time__year'}                   -->
                                     <!-- col77 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
+                                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                                     <!-- col78 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
+                                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                     <!-- col79 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
+                                    <!--    'column_alias': 'metric_time__extract_month'}          -->
                                     <!-- col80 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                                    <!--    'column_alias': 'user'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
+                                    <!--    'column_alias': 'metric_time__extract_week'}           -->
                                     <!-- col81 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
+                                    <!--    'column_alias': 'metric_time__extract_day'}            -->
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
-                                    <!--    'column_alias': 'booking__user'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
                                     <!-- col85 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_185),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
                                     <!-- col86 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_186),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
+                                    <!--    'column_alias': 'host'}                                -->
                                     <!-- col87 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_180),  -->
-                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
+                                    <!--    'column_alias': 'user'}                                -->
                                     <!-- col88 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_181),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
                                     <!-- col89 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_182),  -->
-                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
                                     <!-- col90 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_183),  -->
-                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
                                     <!-- col91 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_184),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
+                                    <!--    'column_alias': 'booking__user'}                       -->
+                                    <!-- col92 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_199),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!-- col93 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_200),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!-- col94 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_194),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!-- col95 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_195),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!-- col96 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_196),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!-- col97 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_197),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col98 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_198),  -->
                                     <!--    'column_alias': 'average_booking_value'}               -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10015) -->
                                     <!-- where = None -->
@@ -880,19 +908,19 @@
                                 <!-- node_id = ss_4 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
-                                <!--    'column_alias': 'window_start__extract_week'}          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                                <!--    'column_alias': 'window_start__day'}                   -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
                                 <!--    'column_alias': 'window_end__day'}                     -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
                                 <!--    'column_alias': 'listing'}                             -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
                                 <!--    'column_alias': 'capacity'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10017) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
index d707b51e98..deb1256c84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
@@ -4,15 +4,15 @@
         <!-- node_id = ss_5 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_112),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_119),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_111),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_118),  -->
         <!--    'column_alias': 'listing'}                             -->
         <!-- col2 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_117),  -->
         <!--    'column_alias': 'booking_fees'}                        -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_4) -->
         <!-- join_0 =                                                    -->
@@ -27,7 +27,7 @@
             <!-- node_id = ss_4 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_106),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_113),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
             <!-- where = SqlBetweenExpression(node_id=betw_0) -->
@@ -42,11 +42,11 @@
             <!-- node_id = ss_3 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_111),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_105),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_112),  -->
             <!--    'column_alias': 'listing'}                             -->
             <!-- col2 =                                                                        -->
             <!--   {'class': 'SqlSelectColumn',                                                -->
@@ -59,11 +59,11 @@
                 <!-- node_id = ss_2 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_109),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
                 <!--    'column_alias': 'listing'}                             -->
                 <!-- col2 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -72,11 +72,11 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_1) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_109),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- group_by1 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
                 <!--    'column_alias': 'listing'}                             -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -84,18 +84,18 @@
                     <!--   Pass Only Elements:                                 -->
                     <!--     ['booking_value', 'metric_time__day', 'listing']  -->
                     <!-- node_id = ss_1 -->
-                    <!-- col0 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
-                    <!--    'column_alias': 'metric_time__day'}                   -->
+                    <!-- col0 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_106),  -->
+                    <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_107),  -->
                     <!--    'column_alias': 'listing'}                             -->
-                    <!-- col2 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
-                    <!--    'column_alias': 'booking_value'}                      -->
+                    <!-- col2 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_105),  -->
+                    <!--    'column_alias': 'booking_value'}                       -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_0) -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -412,84 +412,112 @@
                         <!-- col77 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_92),  -->
-                        <!--    'column_alias': 'listing'}                            -->
+                        <!--    'column_alias': 'metric_time__extract_year'}          -->
                         <!-- col78 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_93),  -->
-                        <!--    'column_alias': 'guest'}                              -->
+                        <!--    'column_alias': 'metric_time__extract_quarter'}       -->
                         <!-- col79 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_94),  -->
-                        <!--    'column_alias': 'host'}                               -->
+                        <!--    'column_alias': 'metric_time__extract_month'}         -->
                         <!-- col80 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_95),  -->
-                        <!--    'column_alias': 'booking__listing'}                   -->
+                        <!--    'column_alias': 'metric_time__extract_week'}          -->
                         <!-- col81 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_96),  -->
-                        <!--    'column_alias': 'booking__guest'}                     -->
+                        <!--    'column_alias': 'metric_time__extract_day'}           -->
                         <!-- col82 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
-                        <!--    'column_alias': 'booking__host'}                      -->
+                        <!--    'column_alias': 'metric_time__extract_dayofweek'}     -->
                         <!-- col83 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofyear'}     -->
+                        <!-- col84 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
+                        <!--    'column_alias': 'listing'}                            -->
+                        <!-- col85 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+                        <!--    'column_alias': 'guest'}                               -->
+                        <!-- col86 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_101),  -->
+                        <!--    'column_alias': 'host'}                                -->
+                        <!-- col87 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!-- col88 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!-- col89 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!-- col90 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_13),  -->
                         <!--    'column_alias': 'is_instant'}                         -->
-                        <!-- col84 =                                                  -->
+                        <!-- col91 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_14),  -->
                         <!--    'column_alias': 'booking__is_instant'}                -->
-                        <!-- col85 =                                                 -->
+                        <!-- col92 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_0),  -->
                         <!--    'column_alias': 'bookings'}                          -->
-                        <!-- col86 =                                                 -->
+                        <!-- col93 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1),  -->
                         <!--    'column_alias': 'instant_bookings'}                  -->
-                        <!-- col87 =                                                 -->
+                        <!-- col94 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_2),  -->
                         <!--    'column_alias': 'booking_value'}                     -->
-                        <!-- col88 =                                                 -->
+                        <!-- col95 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_3),  -->
                         <!--    'column_alias': 'max_booking_value'}                 -->
-                        <!-- col89 =                                                 -->
+                        <!-- col96 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_4),  -->
                         <!--    'column_alias': 'min_booking_value'}                 -->
-                        <!-- col90 =                                                 -->
+                        <!-- col97 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_5),  -->
                         <!--    'column_alias': 'bookers'}                           -->
-                        <!-- col91 =                                                 -->
+                        <!-- col98 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_6),  -->
                         <!--    'column_alias': 'average_booking_value'}             -->
-                        <!-- col92 =                                                 -->
+                        <!-- col99 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_7),  -->
                         <!--    'column_alias': 'referred_bookings'}                 -->
-                        <!-- col93 =                                                 -->
+                        <!-- col100 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_8),  -->
                         <!--    'column_alias': 'median_booking_value'}              -->
-                        <!-- col94 =                                                 -->
+                        <!-- col101 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_9),  -->
                         <!--    'column_alias': 'booking_value_p99'}                 -->
-                        <!-- col95 =                                                  -->
+                        <!-- col102 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}         -->
-                        <!-- col96 =                                                         -->
+                        <!-- col103 =                                                        -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_11),         -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col97 =                                                       -->
+                        <!-- col104 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_12),       -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
index d707b51e98..deb1256c84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
@@ -4,15 +4,15 @@
         <!-- node_id = ss_5 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_112),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_119),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_111),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_118),  -->
         <!--    'column_alias': 'listing'}                             -->
         <!-- col2 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_117),  -->
         <!--    'column_alias': 'booking_fees'}                        -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_4) -->
         <!-- join_0 =                                                    -->
@@ -27,7 +27,7 @@
             <!-- node_id = ss_4 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_106),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_113),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
             <!-- where = SqlBetweenExpression(node_id=betw_0) -->
@@ -42,11 +42,11 @@
             <!-- node_id = ss_3 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_111),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_105),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_112),  -->
             <!--    'column_alias': 'listing'}                             -->
             <!-- col2 =                                                                        -->
             <!--   {'class': 'SqlSelectColumn',                                                -->
@@ -59,11 +59,11 @@
                 <!-- node_id = ss_2 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_109),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
                 <!--    'column_alias': 'listing'}                             -->
                 <!-- col2 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -72,11 +72,11 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_1) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_109),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- group_by1 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
                 <!--    'column_alias': 'listing'}                             -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -84,18 +84,18 @@
                     <!--   Pass Only Elements:                                 -->
                     <!--     ['booking_value', 'metric_time__day', 'listing']  -->
                     <!-- node_id = ss_1 -->
-                    <!-- col0 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
-                    <!--    'column_alias': 'metric_time__day'}                   -->
+                    <!-- col0 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_106),  -->
+                    <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_107),  -->
                     <!--    'column_alias': 'listing'}                             -->
-                    <!-- col2 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
-                    <!--    'column_alias': 'booking_value'}                      -->
+                    <!-- col2 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_105),  -->
+                    <!--    'column_alias': 'booking_value'}                       -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_0) -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -412,84 +412,112 @@
                         <!-- col77 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_92),  -->
-                        <!--    'column_alias': 'listing'}                            -->
+                        <!--    'column_alias': 'metric_time__extract_year'}          -->
                         <!-- col78 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_93),  -->
-                        <!--    'column_alias': 'guest'}                              -->
+                        <!--    'column_alias': 'metric_time__extract_quarter'}       -->
                         <!-- col79 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_94),  -->
-                        <!--    'column_alias': 'host'}                               -->
+                        <!--    'column_alias': 'metric_time__extract_month'}         -->
                         <!-- col80 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_95),  -->
-                        <!--    'column_alias': 'booking__listing'}                   -->
+                        <!--    'column_alias': 'metric_time__extract_week'}          -->
                         <!-- col81 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_96),  -->
-                        <!--    'column_alias': 'booking__guest'}                     -->
+                        <!--    'column_alias': 'metric_time__extract_day'}           -->
                         <!-- col82 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
-                        <!--    'column_alias': 'booking__host'}                      -->
+                        <!--    'column_alias': 'metric_time__extract_dayofweek'}     -->
                         <!-- col83 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofyear'}     -->
+                        <!-- col84 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
+                        <!--    'column_alias': 'listing'}                            -->
+                        <!-- col85 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+                        <!--    'column_alias': 'guest'}                               -->
+                        <!-- col86 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_101),  -->
+                        <!--    'column_alias': 'host'}                                -->
+                        <!-- col87 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!-- col88 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!-- col89 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!-- col90 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_13),  -->
                         <!--    'column_alias': 'is_instant'}                         -->
-                        <!-- col84 =                                                  -->
+                        <!-- col91 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_14),  -->
                         <!--    'column_alias': 'booking__is_instant'}                -->
-                        <!-- col85 =                                                 -->
+                        <!-- col92 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_0),  -->
                         <!--    'column_alias': 'bookings'}                          -->
-                        <!-- col86 =                                                 -->
+                        <!-- col93 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1),  -->
                         <!--    'column_alias': 'instant_bookings'}                  -->
-                        <!-- col87 =                                                 -->
+                        <!-- col94 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_2),  -->
                         <!--    'column_alias': 'booking_value'}                     -->
-                        <!-- col88 =                                                 -->
+                        <!-- col95 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_3),  -->
                         <!--    'column_alias': 'max_booking_value'}                 -->
-                        <!-- col89 =                                                 -->
+                        <!-- col96 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_4),  -->
                         <!--    'column_alias': 'min_booking_value'}                 -->
-                        <!-- col90 =                                                 -->
+                        <!-- col97 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_5),  -->
                         <!--    'column_alias': 'bookers'}                           -->
-                        <!-- col91 =                                                 -->
+                        <!-- col98 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_6),  -->
                         <!--    'column_alias': 'average_booking_value'}             -->
-                        <!-- col92 =                                                 -->
+                        <!-- col99 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_7),  -->
                         <!--    'column_alias': 'referred_bookings'}                 -->
-                        <!-- col93 =                                                 -->
+                        <!-- col100 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_8),  -->
                         <!--    'column_alias': 'median_booking_value'}              -->
-                        <!-- col94 =                                                 -->
+                        <!-- col101 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_9),  -->
                         <!--    'column_alias': 'booking_value_p99'}                 -->
-                        <!-- col95 =                                                  -->
+                        <!-- col102 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}         -->
-                        <!-- col96 =                                                         -->
+                        <!-- col103 =                                                        -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_11),         -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col97 =                                                       -->
+                        <!-- col104 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_12),       -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml
index d707b51e98..deb1256c84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml
@@ -4,15 +4,15 @@
         <!-- node_id = ss_5 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_112),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_119),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_111),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_118),  -->
         <!--    'column_alias': 'listing'}                             -->
         <!-- col2 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_117),  -->
         <!--    'column_alias': 'booking_fees'}                        -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_4) -->
         <!-- join_0 =                                                    -->
@@ -27,7 +27,7 @@
             <!-- node_id = ss_4 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_106),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_113),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
             <!-- where = SqlBetweenExpression(node_id=betw_0) -->
@@ -42,11 +42,11 @@
             <!-- node_id = ss_3 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_111),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_105),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_112),  -->
             <!--    'column_alias': 'listing'}                             -->
             <!-- col2 =                                                                        -->
             <!--   {'class': 'SqlSelectColumn',                                                -->
@@ -59,11 +59,11 @@
                 <!-- node_id = ss_2 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_109),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
                 <!--    'column_alias': 'listing'}                             -->
                 <!-- col2 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -72,11 +72,11 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_1) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_109),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- group_by1 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_110),  -->
                 <!--    'column_alias': 'listing'}                             -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -84,18 +84,18 @@
                     <!--   Pass Only Elements:                                 -->
                     <!--     ['booking_value', 'metric_time__day', 'listing']  -->
                     <!-- node_id = ss_1 -->
-                    <!-- col0 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
-                    <!--    'column_alias': 'metric_time__day'}                   -->
+                    <!-- col0 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_106),  -->
+                    <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_107),  -->
                     <!--    'column_alias': 'listing'}                             -->
-                    <!-- col2 =                                                   -->
-                    <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
-                    <!--    'column_alias': 'booking_value'}                      -->
+                    <!-- col2 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_105),  -->
+                    <!--    'column_alias': 'booking_value'}                       -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_0) -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -412,84 +412,112 @@
                         <!-- col77 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_92),  -->
-                        <!--    'column_alias': 'listing'}                            -->
+                        <!--    'column_alias': 'metric_time__extract_year'}          -->
                         <!-- col78 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_93),  -->
-                        <!--    'column_alias': 'guest'}                              -->
+                        <!--    'column_alias': 'metric_time__extract_quarter'}       -->
                         <!-- col79 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_94),  -->
-                        <!--    'column_alias': 'host'}                               -->
+                        <!--    'column_alias': 'metric_time__extract_month'}         -->
                         <!-- col80 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_95),  -->
-                        <!--    'column_alias': 'booking__listing'}                   -->
+                        <!--    'column_alias': 'metric_time__extract_week'}          -->
                         <!-- col81 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_96),  -->
-                        <!--    'column_alias': 'booking__guest'}                     -->
+                        <!--    'column_alias': 'metric_time__extract_day'}           -->
                         <!-- col82 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
-                        <!--    'column_alias': 'booking__host'}                      -->
+                        <!--    'column_alias': 'metric_time__extract_dayofweek'}     -->
                         <!-- col83 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofyear'}     -->
+                        <!-- col84 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
+                        <!--    'column_alias': 'listing'}                            -->
+                        <!-- col85 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+                        <!--    'column_alias': 'guest'}                               -->
+                        <!-- col86 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_101),  -->
+                        <!--    'column_alias': 'host'}                                -->
+                        <!-- col87 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!-- col88 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!-- col89 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!-- col90 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_13),  -->
                         <!--    'column_alias': 'is_instant'}                         -->
-                        <!-- col84 =                                                  -->
+                        <!-- col91 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_14),  -->
                         <!--    'column_alias': 'booking__is_instant'}                -->
-                        <!-- col85 =                                                 -->
+                        <!-- col92 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_0),  -->
                         <!--    'column_alias': 'bookings'}                          -->
-                        <!-- col86 =                                                 -->
+                        <!-- col93 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1),  -->
                         <!--    'column_alias': 'instant_bookings'}                  -->
-                        <!-- col87 =                                                 -->
+                        <!-- col94 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_2),  -->
                         <!--    'column_alias': 'booking_value'}                     -->
-                        <!-- col88 =                                                 -->
+                        <!-- col95 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_3),  -->
                         <!--    'column_alias': 'max_booking_value'}                 -->
-                        <!-- col89 =                                                 -->
+                        <!-- col96 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_4),  -->
                         <!--    'column_alias': 'min_booking_value'}                 -->
-                        <!-- col90 =                                                 -->
+                        <!-- col97 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_5),  -->
                         <!--    'column_alias': 'bookers'}                           -->
-                        <!-- col91 =                                                 -->
+                        <!-- col98 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_6),  -->
                         <!--    'column_alias': 'average_booking_value'}             -->
-                        <!-- col92 =                                                 -->
+                        <!-- col99 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_7),  -->
                         <!--    'column_alias': 'referred_bookings'}                 -->
-                        <!-- col93 =                                                 -->
+                        <!-- col100 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_8),  -->
                         <!--    'column_alias': 'median_booking_value'}              -->
-                        <!-- col94 =                                                 -->
+                        <!-- col101 =                                                -->
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_9),  -->
                         <!--    'column_alias': 'booking_value_p99'}                 -->
-                        <!-- col95 =                                                  -->
+                        <!-- col102 =                                                 -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}         -->
-                        <!-- col96 =                                                         -->
+                        <!-- col103 =                                                        -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_11),         -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col97 =                                                       -->
+                        <!-- col104 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_12),       -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml
index eb918937d1..0c0b947455 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_11 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
         <!--    'column_alias': 'ds__day'}                             -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
         <!-- where = None -->
@@ -17,11 +17,11 @@
             <!-- node_id = ss_10 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
             <!--    'column_alias': 'ds__day'}                             -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
             <!-- where = None -->
@@ -30,7 +30,7 @@
                 <!-- node_id = ss_9 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                 <!--    'column_alias': 'ds__day'}                             -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -39,7 +39,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                 <!--    'column_alias': 'ds__day'}                             -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -49,11 +49,11 @@
                     <!-- node_id = ss_8 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                     <!-- where = None -->
@@ -62,395 +62,423 @@
                         <!-- node_id = ss_7 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                         <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                         <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                         <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                         <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                         <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                         <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                         <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                         <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                         <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                         <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                         <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                         <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                         <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                         <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                         <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                         <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                         <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                         <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                         <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                         <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                         <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                         <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                         <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                         <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                         <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                         <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                         <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                         <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                         <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                         <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                         <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                         <!-- col50 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                         <!-- col51 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                         <!-- col52 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                         <!-- col53 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                         <!-- col54 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                         <!-- col55 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                         <!-- col56 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                         <!-- col57 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                         <!-- col58 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                         <!-- col59 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                         <!-- col60 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                         <!--    'column_alias': 'booking__paid_at__day'}               -->
                         <!-- col61 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                         <!--    'column_alias': 'booking__paid_at__week'}              -->
                         <!-- col62 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                         <!--    'column_alias': 'booking__paid_at__month'}             -->
                         <!-- col63 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                         <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                         <!-- col64 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                         <!--    'column_alias': 'booking__paid_at__year'}              -->
                         <!-- col65 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                         <!-- col66 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                         <!-- col67 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                         <!-- col68 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                         <!-- col69 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                         <!-- col70 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                         <!-- col71 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                         <!-- col72 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col73 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                         <!--    'column_alias': 'metric_time__week'}                   -->
                         <!-- col74 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                         <!--    'column_alias': 'metric_time__month'}                  -->
                         <!-- col75 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                         <!--    'column_alias': 'metric_time__quarter'}                -->
                         <!-- col76 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                         <!--    'column_alias': 'metric_time__year'}                   -->
                         <!-- col77 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                        <!--    'column_alias': 'listing'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                        <!--    'column_alias': 'metric_time__extract_year'}           -->
                         <!-- col78 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                        <!--    'column_alias': 'guest'}                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                        <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                         <!-- col79 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                        <!--    'column_alias': 'host'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                        <!--    'column_alias': 'metric_time__extract_month'}          -->
                         <!-- col80 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                        <!--    'column_alias': 'metric_time__extract_week'}           -->
                         <!-- col81 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                        <!--    'column_alias': 'metric_time__extract_day'}            -->
                         <!-- col82 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                         <!-- col83 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                         <!-- col84 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                        <!--    'column_alias': 'listing'}                             -->
                         <!-- col85 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                        <!--    'column_alias': 'bookings'}                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                        <!--    'column_alias': 'guest'}                               -->
                         <!-- col86 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                        <!--    'column_alias': 'host'}                                -->
                         <!-- col87 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
                         <!-- col88 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
                         <!-- col89 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
                         <!-- col90 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                        <!--    'column_alias': 'bookers'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                        <!--    'column_alias': 'is_instant'}                          -->
                         <!-- col91 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                 -->
                         <!-- col92 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                        <!--    'column_alias': 'bookings'}                            -->
                         <!-- col93 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                        <!--    'column_alias': 'instant_bookings'}                    -->
                         <!-- col94 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                        <!--    'column_alias': 'booking_value_p99'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                        <!--    'column_alias': 'booking_value'}                       -->
                         <!-- col95 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!-- col96 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!-- col97 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                        <!--    'column_alias': 'bookers'}                             -->
+                        <!-- col98 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!-- col99 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!-- col100 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!-- col101 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                        <!--    'column_alias': 'booking_value_p99'}                   -->
+                        <!-- col102 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                        <!-- col96 =                                                         -->
+                        <!-- col103 =                                                        -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col97 =                                                       -->
+                        <!-- col104 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml
index 0c406fa13f..90cd7de9ba 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_10 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
         <!--    'column_alias': 'listing__country_latest'}             -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
         <!--    'column_alias': 'listings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_9 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
             <!--    'column_alias': 'listing__country_latest'}             -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
             <!--    'column_alias': 'listing__country_latest'}             -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_8 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
                 <!--    'column_alias': 'listing__country_latest'}             -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
                 <!--    'column_alias': 'listings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                 <!-- where = None -->
@@ -49,263 +49,291 @@
                     <!-- node_id = ss_7 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
                     <!--    'column_alias': 'ds__day'}                             -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                     <!--    'column_alias': 'ds__week'}                            -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
                     <!--    'column_alias': 'ds__month'}                           -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
                     <!--    'column_alias': 'ds__quarter'}                         -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
                     <!--    'column_alias': 'ds__year'}                            -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
                     <!--    'column_alias': 'ds__extract_year'}                    -->
                     <!-- col6 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                     <!-- col7 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                     <!--    'column_alias': 'ds__extract_month'}                   -->
                     <!-- col8 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                     <!--    'column_alias': 'ds__extract_week'}                    -->
                     <!-- col9 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                     <!--    'column_alias': 'ds__extract_day'}                     -->
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                     <!--    'column_alias': 'created_at__day'}                     -->
                     <!-- col13 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                     <!--    'column_alias': 'created_at__week'}                    -->
                     <!-- col14 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                     <!--    'column_alias': 'created_at__month'}                   -->
                     <!-- col15 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                     <!--    'column_alias': 'created_at__quarter'}                 -->
                     <!-- col16 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                     <!--    'column_alias': 'created_at__year'}                    -->
                     <!-- col17 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                     <!--    'column_alias': 'created_at__extract_year'}            -->
                     <!-- col18 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                     <!--    'column_alias': 'created_at__extract_quarter'}         -->
                     <!-- col19 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                     <!--    'column_alias': 'created_at__extract_month'}           -->
                     <!-- col20 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                     <!--    'column_alias': 'created_at__extract_week'}            -->
                     <!-- col21 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                     <!--    'column_alias': 'created_at__extract_day'}             -->
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                     <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                     <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                     <!--    'column_alias': 'listing__ds__day'}                    -->
                     <!-- col25 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                     <!--    'column_alias': 'listing__ds__week'}                   -->
                     <!-- col26 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                     <!--    'column_alias': 'listing__ds__month'}                  -->
                     <!-- col27 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                     <!--    'column_alias': 'listing__ds__quarter'}                -->
                     <!-- col28 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                     <!--    'column_alias': 'listing__ds__year'}                   -->
                     <!-- col29 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                     <!--    'column_alias': 'listing__ds__extract_year'}           -->
                     <!-- col30 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                     <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                     <!-- col31 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                     <!--    'column_alias': 'listing__ds__extract_month'}          -->
                     <!-- col32 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                     <!--    'column_alias': 'listing__ds__extract_week'}           -->
                     <!-- col33 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                     <!--    'column_alias': 'listing__ds__extract_day'}            -->
                     <!-- col34 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                     <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                     <!-- col35 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                     <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                     <!-- col36 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                     <!--    'column_alias': 'listing__created_at__day'}            -->
                     <!-- col37 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                     <!--    'column_alias': 'listing__created_at__week'}           -->
                     <!-- col38 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                     <!--    'column_alias': 'listing__created_at__month'}          -->
                     <!-- col39 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                     <!--    'column_alias': 'listing__created_at__quarter'}        -->
                     <!-- col40 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                     <!--    'column_alias': 'listing__created_at__year'}           -->
                     <!-- col41 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                     <!--    'column_alias': 'listing__created_at__extract_year'}   -->
                     <!-- col42 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),    -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),    -->
                     <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
                     <!-- col43 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                     <!--    'column_alias': 'listing__created_at__extract_month'}  -->
                     <!-- col44 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                     <!--    'column_alias': 'listing__created_at__extract_week'}   -->
                     <!-- col45 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                     <!--    'column_alias': 'listing__created_at__extract_day'}    -->
                     <!-- col46 =                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),      -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),      -->
                     <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
                     <!-- col47 =                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),      -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),      -->
                     <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
                     <!-- col48 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col49 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                     <!--    'column_alias': 'metric_time__week'}                   -->
                     <!-- col50 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                     <!--    'column_alias': 'metric_time__month'}                  -->
                     <!-- col51 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                     <!--    'column_alias': 'metric_time__quarter'}                -->
                     <!-- col52 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                     <!--    'column_alias': 'metric_time__year'}                   -->
                     <!-- col53 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
-                    <!--    'column_alias': 'listing'}                             -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                     <!-- col54 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
-                    <!--    'column_alias': 'user'}                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                     <!-- col55 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
-                    <!--    'column_alias': 'listing__user'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                    <!--    'column_alias': 'metric_time__extract_month'}          -->
                     <!-- col56 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                    <!--    'column_alias': 'country_latest'}                      -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                    <!--    'column_alias': 'metric_time__extract_week'}           -->
                     <!-- col57 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                    <!--    'column_alias': 'metric_time__extract_day'}            -->
                     <!-- col58 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                    <!--    'column_alias': 'capacity_latest'}                     -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                     <!-- col59 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                    <!--    'column_alias': 'listing__country_latest'}             -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                     <!-- col60 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                    <!--    'column_alias': 'listing'}                             -->
                     <!-- col61 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                    <!--    'column_alias': 'user'}                                -->
                     <!-- col62 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                    <!--    'column_alias': 'listings'}                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                    <!--    'column_alias': 'listing__user'}                       -->
                     <!-- col63 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                    <!--    'column_alias': 'largest_listing'}                     -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                    <!--    'column_alias': 'country_latest'}                      -->
                     <!-- col64 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                    <!--    'column_alias': 'is_lux_latest'}                       -->
+                    <!-- col65 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                    <!--    'column_alias': 'capacity_latest'}                     -->
+                    <!-- col66 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                    <!--    'column_alias': 'listing__country_latest'}             -->
+                    <!-- col67 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                    <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                    <!-- col68 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                    <!--    'column_alias': 'listing__capacity_latest'}            -->
+                    <!-- col69 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                    <!--    'column_alias': 'listings'}                            -->
+                    <!-- col70 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                    <!--    'column_alias': 'largest_listing'}                     -->
+                    <!-- col71 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
                     <!--    'column_alias': 'smallest_listing'}                    -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                     <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml
index 861a4944cd..2d8e684ff8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml
@@ -2,10 +2,10 @@
     <SqlSelectStatementNode>
         <!-- description = Compute Metrics via Expressions -->
         <!-- node_id = ss_32 -->
-        <!-- col0 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_920),  -->
-        <!--    'column_alias': 'metric_time__day'}                    -->
+        <!-- col0 =                                                     -->
+        <!--   {'class': 'SqlSelectColumn',                             -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1004),  -->
+        <!--    'column_alias': 'metric_time__day'}                     -->
         <!-- col1 =                                                                                                               -->
         <!--   {'class': 'SqlSelectColumn',                                                                                       -->
         <!--    'expr': SqlStringExpression(node_id=str_2 sql_expr=average_booking_value * bookings / NULLIF(booking_value, 0)),  -->
@@ -21,16 +21,16 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_914),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_998),  -->
             <!--    'column_alias': 'average_booking_value'}               -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_915),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_999),  -->
             <!--    'column_alias': 'bookings'}                            -->
-            <!-- col3 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_916),  -->
-            <!--    'column_alias': 'booking_value'}                       -->
+            <!-- col3 =                                                     -->
+            <!--   {'class': 'SqlSelectColumn',                             -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1000),  -->
+            <!--    'column_alias': 'booking_value'}                        -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
             <!-- join_0 =                                                   -->
             <!--   {'class': 'SqlJoinDescription',                          -->
@@ -50,11 +50,11 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                 <!--    'column_alias': 'average_booking_value'}               -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -63,7 +63,7 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                           -->
                     <!--   {'class': 'SqlSelectColumn',                                                   -->
@@ -72,7 +72,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -82,11 +82,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
                         <!--    'column_alias': 'average_booking_value'}               -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -95,15 +95,15 @@
                             <!-- node_id = ss_13 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                             <!--    'column_alias': 'listing__is_lux_latest'}              -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                             <!-- where =                                                               -->
@@ -115,15 +115,15 @@
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                                 <!--    'column_alias': 'listing__is_lux_latest'}              -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                                 <!--    'column_alias': 'average_booking_value'}               -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                                 <!-- where = None -->
@@ -132,19 +132,19 @@
                                     <!-- node_id = ss_11 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                                     <!--    'column_alias': 'listing'}                             -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                                     <!--    'column_alias': 'listing__is_lux_latest'}              -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
                                     <!--    'column_alias': 'average_booking_value'}               -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                                     <!-- join_0 =                                                    -->
@@ -161,15 +161,15 @@
                                         <!-- node_id = ss_8 -->
                                         <!-- col0 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                                         <!--    'column_alias': 'metric_time__day'}                    -->
                                         <!-- col1 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
                                         <!--    'column_alias': 'listing'}                             -->
                                         <!-- col2 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                                         <!--    'column_alias': 'average_booking_value'}               -->
                                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                         <!-- where = None -->
@@ -178,395 +178,423 @@
                                             <!-- node_id = ss_7 -->
                                             <!-- col0 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                                             <!--    'column_alias': 'ds__day'}                             -->
                                             <!-- col1 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                                             <!--    'column_alias': 'ds__week'}                            -->
                                             <!-- col2 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                                             <!--    'column_alias': 'ds__month'}                           -->
                                             <!-- col3 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                                             <!--    'column_alias': 'ds__quarter'}                         -->
                                             <!-- col4 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                                             <!--    'column_alias': 'ds__year'}                            -->
                                             <!-- col5 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                                             <!--    'column_alias': 'ds__extract_year'}                    -->
                                             <!-- col6 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                             <!-- col7 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                                             <!--    'column_alias': 'ds__extract_month'}                   -->
                                             <!-- col8 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                                             <!--    'column_alias': 'ds__extract_week'}                    -->
                                             <!-- col9 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                                             <!--    'column_alias': 'ds__extract_day'}                     -->
                                             <!-- col10 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                             <!-- col11 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                             <!-- col12 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                             <!-- col13 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                                             <!-- col14 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                                             <!-- col15 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                             <!-- col16 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                                             <!-- col17 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                             <!-- col18 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                             <!-- col19 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                             <!-- col20 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                             <!-- col21 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                             <!-- col22 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                             <!-- col23 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                             <!-- col24 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                                             <!--    'column_alias': 'paid_at__day'}                        -->
                                             <!-- col25 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                                             <!--    'column_alias': 'paid_at__week'}                       -->
                                             <!-- col26 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                                             <!--    'column_alias': 'paid_at__month'}                      -->
                                             <!-- col27 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                                             <!-- col28 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                                             <!--    'column_alias': 'paid_at__year'}                       -->
                                             <!-- col29 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                                             <!-- col30 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                             <!-- col31 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                                             <!-- col32 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                                             <!-- col33 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                                             <!-- col34 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                             <!-- col35 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                             <!-- col36 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                             <!--    'column_alias': 'booking__ds__day'}                    -->
                                             <!-- col37 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                                             <!--    'column_alias': 'booking__ds__week'}                   -->
                                             <!-- col38 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                                             <!--    'column_alias': 'booking__ds__month'}                  -->
                                             <!-- col39 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                                             <!-- col40 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                                             <!--    'column_alias': 'booking__ds__year'}                   -->
                                             <!-- col41 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                             <!-- col42 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                             <!-- col43 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                             <!-- col44 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                             <!-- col45 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                             <!-- col46 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                             <!-- col47 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                             <!-- col48 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                             <!-- col49 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                             <!-- col50 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                             <!-- col51 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                             <!-- col52 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                             <!-- col53 =                                                      -->
                                             <!--   {'class': 'SqlSelectColumn',                               -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                             <!-- col54 =                                                         -->
                                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                             <!-- col55 =                                                       -->
                                             <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                             <!-- col56 =                                                      -->
                                             <!--   {'class': 'SqlSelectColumn',                               -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                             <!-- col57 =                                                     -->
                                             <!--   {'class': 'SqlSelectColumn',                              -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                             <!-- col58 =                                                           -->
                                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                             <!-- col59 =                                                           -->
                                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                             <!-- col60 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                                             <!-- col61 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                                             <!-- col62 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                                             <!-- col63 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                             <!-- col64 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                                             <!-- col65 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                             <!-- col66 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                             <!-- col67 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                             <!-- col68 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                             <!-- col69 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                             <!-- col70 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                             -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                             <!-- col71 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                             -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                             <!-- col72 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                                             <!--    'column_alias': 'metric_time__day'}                    -->
                                             <!-- col73 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                                             <!--    'column_alias': 'metric_time__week'}                   -->
                                             <!-- col74 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                                             <!--    'column_alias': 'metric_time__month'}                  -->
                                             <!-- col75 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                                             <!--    'column_alias': 'metric_time__quarter'}                -->
                                             <!-- col76 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                                             <!--    'column_alias': 'metric_time__year'}                   -->
                                             <!-- col77 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                                            <!--    'column_alias': 'listing'}                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                                             <!-- col78 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                                            <!--    'column_alias': 'guest'}                               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                             <!-- col79 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                                            <!--    'column_alias': 'host'}                                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                                             <!-- col80 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                                            <!--    'column_alias': 'booking__listing'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                                             <!-- col81 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                                            <!--    'column_alias': 'booking__guest'}                      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                                             <!-- col82 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                                            <!--    'column_alias': 'booking__host'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                             <!-- col83 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                                            <!--    'column_alias': 'is_instant'}                          -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                             <!-- col84 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                            <!--    'column_alias': 'listing'}                             -->
                                             <!-- col85 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                                            <!--    'column_alias': 'bookings'}                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                            <!--    'column_alias': 'guest'}                               -->
                                             <!-- col86 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                                            <!--    'column_alias': 'instant_bookings'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                            <!--    'column_alias': 'host'}                                -->
                                             <!-- col87 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                                            <!--    'column_alias': 'booking_value'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                            <!--    'column_alias': 'booking__listing'}                    -->
                                             <!-- col88 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                                            <!--    'column_alias': 'max_booking_value'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                            <!--    'column_alias': 'booking__guest'}                      -->
                                             <!-- col89 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                                            <!--    'column_alias': 'min_booking_value'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                            <!--    'column_alias': 'booking__host'}                       -->
                                             <!-- col90 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                                            <!--    'column_alias': 'bookers'}                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                            <!--    'column_alias': 'is_instant'}                          -->
                                             <!-- col91 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                                            <!--    'column_alias': 'average_booking_value'}               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                            <!--    'column_alias': 'booking__is_instant'}                 -->
                                             <!-- col92 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                                            <!--    'column_alias': 'referred_bookings'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                            <!--    'column_alias': 'bookings'}                            -->
                                             <!-- col93 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                                            <!--    'column_alias': 'median_booking_value'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                            <!--    'column_alias': 'instant_bookings'}                    -->
                                             <!-- col94 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                            <!--    'column_alias': 'booking_value'}                       -->
                                             <!-- col95 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                            <!--    'column_alias': 'max_booking_value'}                   -->
+                                            <!-- col96 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                            <!--    'column_alias': 'min_booking_value'}                   -->
+                                            <!-- col97 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                            <!--    'column_alias': 'bookers'}                             -->
+                                            <!-- col98 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                            <!--    'column_alias': 'average_booking_value'}               -->
+                                            <!-- col99 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                            <!--    'column_alias': 'referred_bookings'}                   -->
+                                            <!-- col100 =                                                  -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                            <!--    'column_alias': 'median_booking_value'}                -->
+                                            <!-- col101 =                                                  -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                                            <!-- col102 =                                                  -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                            <!-- col96 =                                                         -->
+                                            <!-- col103 =                                                        -->
                                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                            <!-- col97 =                                                       -->
+                                            <!-- col104 =                                                      -->
                                             <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                             <!-- where = None -->
@@ -966,11 +994,11 @@
                                         <!-- node_id = ss_10 -->
                                         <!-- col0 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
                                         <!--    'column_alias': 'listing'}                             -->
                                         <!-- col1 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
                                         <!--    'column_alias': 'is_lux_latest'}                       -->
                                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                                         <!-- where = None -->
@@ -979,263 +1007,291 @@
                                             <!-- node_id = ss_9 -->
                                             <!-- col0 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                                             <!--    'column_alias': 'ds__day'}                             -->
                                             <!-- col1 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
                                             <!--    'column_alias': 'ds__week'}                            -->
                                             <!-- col2 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
                                             <!--    'column_alias': 'ds__month'}                           -->
                                             <!-- col3 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
                                             <!--    'column_alias': 'ds__quarter'}                         -->
                                             <!-- col4 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                                             <!--    'column_alias': 'ds__year'}                            -->
                                             <!-- col5 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                                             <!--    'column_alias': 'ds__extract_year'}                    -->
                                             <!-- col6 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                             <!-- col7 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                                             <!--    'column_alias': 'ds__extract_month'}                   -->
                                             <!-- col8 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                                             <!--    'column_alias': 'ds__extract_week'}                    -->
                                             <!-- col9 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                                             <!--    'column_alias': 'ds__extract_day'}                     -->
                                             <!-- col10 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                             <!-- col11 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                             <!-- col12 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                                             <!--    'column_alias': 'created_at__day'}                     -->
                                             <!-- col13 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                                             <!--    'column_alias': 'created_at__week'}                    -->
                                             <!-- col14 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                                             <!--    'column_alias': 'created_at__month'}                   -->
                                             <!-- col15 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                                             <!--    'column_alias': 'created_at__quarter'}                 -->
                                             <!-- col16 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                                             <!--    'column_alias': 'created_at__year'}                    -->
                                             <!-- col17 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                                             <!--    'column_alias': 'created_at__extract_year'}            -->
                                             <!-- col18 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                                             <!--    'column_alias': 'created_at__extract_quarter'}         -->
                                             <!-- col19 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                                             <!--    'column_alias': 'created_at__extract_month'}           -->
                                             <!-- col20 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                                             <!--    'column_alias': 'created_at__extract_week'}            -->
                                             <!-- col21 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                                             <!--    'column_alias': 'created_at__extract_day'}             -->
                                             <!-- col22 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                                             <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                                             <!-- col23 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                                             <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                                             <!-- col24 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                                             <!--    'column_alias': 'listing__ds__day'}                    -->
                                             <!-- col25 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                                             <!--    'column_alias': 'listing__ds__week'}                   -->
                                             <!-- col26 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                                             <!--    'column_alias': 'listing__ds__month'}                  -->
                                             <!-- col27 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                                             <!--    'column_alias': 'listing__ds__quarter'}                -->
                                             <!-- col28 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                                             <!--    'column_alias': 'listing__ds__year'}                   -->
                                             <!-- col29 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                                             <!--    'column_alias': 'listing__ds__extract_year'}           -->
                                             <!-- col30 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                                             <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                                             <!-- col31 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                                             <!--    'column_alias': 'listing__ds__extract_month'}          -->
                                             <!-- col32 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                                             <!--    'column_alias': 'listing__ds__extract_week'}           -->
                                             <!-- col33 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                                             <!--    'column_alias': 'listing__ds__extract_day'}            -->
                                             <!-- col34 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                                             <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                                             <!-- col35 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                                             <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                                             <!-- col36 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                             <!--    'column_alias': 'listing__created_at__day'}            -->
                                             <!-- col37 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                                             <!--    'column_alias': 'listing__created_at__week'}           -->
                                             <!-- col38 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                                             <!--    'column_alias': 'listing__created_at__month'}          -->
                                             <!-- col39 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                                             <!--    'column_alias': 'listing__created_at__quarter'}        -->
                                             <!-- col40 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                                             <!--    'column_alias': 'listing__created_at__year'}           -->
                                             <!-- col41 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                                             <!--    'column_alias': 'listing__created_at__extract_year'}   -->
                                             <!-- col42 =                                                     -->
                                             <!--   {'class': 'SqlSelectColumn',                              -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),    -->
                                             <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
                                             <!-- col43 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                                             <!--    'column_alias': 'listing__created_at__extract_month'}  -->
                                             <!-- col44 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                                             <!--    'column_alias': 'listing__created_at__extract_week'}   -->
                                             <!-- col45 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                                             <!--    'column_alias': 'listing__created_at__extract_day'}    -->
                                             <!-- col46 =                                                       -->
                                             <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),      -->
                                             <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
                                             <!-- col47 =                                                       -->
                                             <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),      -->
                                             <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
                                             <!-- col48 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                                             <!--    'column_alias': 'metric_time__day'}                    -->
                                             <!-- col49 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                                             <!--    'column_alias': 'metric_time__week'}                   -->
                                             <!-- col50 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                                             <!--    'column_alias': 'metric_time__month'}                  -->
                                             <!-- col51 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                                             <!--    'column_alias': 'metric_time__quarter'}                -->
                                             <!-- col52 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                                             <!--    'column_alias': 'metric_time__year'}                   -->
                                             <!-- col53 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
-                                            <!--    'column_alias': 'listing'}                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                                             <!-- col54 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
-                                            <!--    'column_alias': 'user'}                                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                             <!-- col55 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
-                                            <!--    'column_alias': 'listing__user'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                                             <!-- col56 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                                            <!--    'column_alias': 'country_latest'}                      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                                             <!-- col57 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                                            <!--    'column_alias': 'is_lux_latest'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                                             <!-- col58 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                                            <!--    'column_alias': 'capacity_latest'}                     -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                             <!-- col59 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                                            <!--    'column_alias': 'listing__country_latest'}             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                             <!-- col60 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                                            <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                                            <!--    'column_alias': 'listing'}                             -->
                                             <!-- col61 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                                            <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                                            <!--    'column_alias': 'user'}                                -->
                                             <!-- col62 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
-                                            <!--    'column_alias': 'listings'}                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                                            <!--    'column_alias': 'listing__user'}                       -->
                                             <!-- col63 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
-                                            <!--    'column_alias': 'largest_listing'}                     -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                            <!--    'column_alias': 'country_latest'}                      -->
                                             <!-- col64 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                            <!--    'column_alias': 'is_lux_latest'}                       -->
+                                            <!-- col65 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                            <!--    'column_alias': 'capacity_latest'}                     -->
+                                            <!-- col66 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                            <!--    'column_alias': 'listing__country_latest'}             -->
+                                            <!-- col67 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                            <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                            <!-- col68 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                            <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                            <!-- col69 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                            <!--    'column_alias': 'listings'}                            -->
+                                            <!-- col70 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                            <!--    'column_alias': 'largest_listing'}                     -->
+                                            <!-- col71 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                                             <!--    'column_alias': 'smallest_listing'}                    -->
                                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                             <!-- where = None -->
@@ -1503,11 +1559,11 @@
                 <!-- node_id = ss_26 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_881),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_882),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_25) -->
                 <!-- where = None -->
@@ -1516,7 +1572,7 @@
                     <!-- node_id = ss_25 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -1525,7 +1581,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_24) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -1535,11 +1591,11 @@
                         <!-- node_id = ss_24 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_878),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_877),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_23) -->
                         <!-- where = None -->
@@ -1548,15 +1604,15 @@
                             <!-- node_id = ss_23 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_876),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_875),  -->
                             <!--    'column_alias': 'listing__is_lux_latest'}              -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_22) -->
                             <!-- where =                                                               -->
@@ -1568,15 +1624,15 @@
                                 <!-- node_id = ss_22 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),  -->
                                 <!--    'column_alias': 'listing__is_lux_latest'}              -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),  -->
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_21) -->
                                 <!-- where = None -->
@@ -1585,19 +1641,19 @@
                                     <!-- node_id = ss_21 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_868),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_869),  -->
                                     <!--    'column_alias': 'listing'}                             -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_870),  -->
                                     <!--    'column_alias': 'listing__is_lux_latest'}              -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),  -->
                                     <!--    'column_alias': 'bookings'}                            -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_18) -->
                                     <!-- join_0 =                                                    -->
@@ -1614,15 +1670,15 @@
                                         <!-- node_id = ss_18 -->
                                         <!-- col0 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
                                         <!--    'column_alias': 'metric_time__day'}                    -->
                                         <!-- col1 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
                                         <!--    'column_alias': 'listing'}                             -->
                                         <!-- col2 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
                                         <!--    'column_alias': 'bookings'}                            -->
                                         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                                         <!-- where = None -->
@@ -1631,395 +1687,423 @@
                                             <!-- node_id = ss_17 -->
                                             <!-- col0 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
                                             <!--    'column_alias': 'ds__day'}                             -->
                                             <!-- col1 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
                                             <!--    'column_alias': 'ds__week'}                            -->
                                             <!-- col2 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
                                             <!--    'column_alias': 'ds__month'}                           -->
                                             <!-- col3 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
                                             <!--    'column_alias': 'ds__quarter'}                         -->
                                             <!-- col4 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
                                             <!--    'column_alias': 'ds__year'}                            -->
                                             <!-- col5 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
                                             <!--    'column_alias': 'ds__extract_year'}                    -->
                                             <!-- col6 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
                                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                             <!-- col7 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
                                             <!--    'column_alias': 'ds__extract_month'}                   -->
                                             <!-- col8 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
                                             <!--    'column_alias': 'ds__extract_week'}                    -->
                                             <!-- col9 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
                                             <!--    'column_alias': 'ds__extract_day'}                     -->
                                             <!-- col10 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
                                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                             <!-- col11 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
                                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                             <!-- col12 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
                                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                             <!-- col13 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
                                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                                             <!-- col14 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
                                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                                             <!-- col15 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
                                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                             <!-- col16 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
                                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                                             <!-- col17 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                             <!-- col18 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                             <!-- col19 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                             <!-- col20 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                             <!-- col21 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                             <!-- col22 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                             <!-- col23 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
                                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                             <!-- col24 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
                                             <!--    'column_alias': 'paid_at__day'}                        -->
                                             <!-- col25 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
                                             <!--    'column_alias': 'paid_at__week'}                       -->
                                             <!-- col26 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
                                             <!--    'column_alias': 'paid_at__month'}                      -->
                                             <!-- col27 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
                                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                                             <!-- col28 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
                                             <!--    'column_alias': 'paid_at__year'}                       -->
                                             <!-- col29 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
                                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                                             <!-- col30 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
                                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                             <!-- col31 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
                                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                                             <!-- col32 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
                                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                                             <!-- col33 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
                                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                                             <!-- col34 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                             <!-- col35 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                             <!-- col36 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                                             <!--    'column_alias': 'booking__ds__day'}                    -->
                                             <!-- col37 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
                                             <!--    'column_alias': 'booking__ds__week'}                   -->
                                             <!-- col38 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                                             <!--    'column_alias': 'booking__ds__month'}                  -->
                                             <!-- col39 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                                             <!-- col40 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                                             <!--    'column_alias': 'booking__ds__year'}                   -->
                                             <!-- col41 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
                                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                             <!-- col42 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
                                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                             <!-- col43 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
                                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                             <!-- col44 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
                                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                             <!-- col45 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
                                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                             <!-- col46 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                             <!-- col47 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
                                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                             <!-- col48 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
                                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                             <!-- col49 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
                                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                             <!-- col50 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
                                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                             <!-- col51 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
                                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                             <!-- col52 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                             <!-- col53 =                                                      -->
                                             <!--   {'class': 'SqlSelectColumn',                               -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),     -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),     -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                             <!-- col54 =                                                         -->
                                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),        -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),        -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                             <!-- col55 =                                                       -->
                                             <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),      -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                             <!-- col56 =                                                      -->
                                             <!--   {'class': 'SqlSelectColumn',                               -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),     -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),     -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                             <!-- col57 =                                                     -->
                                             <!--   {'class': 'SqlSelectColumn',                              -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),    -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                             <!-- col58 =                                                           -->
                                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),          -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),          -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                             <!-- col59 =                                                           -->
                                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),          -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),          -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                             <!-- col60 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
                                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                                             <!-- col61 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
                                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                                             <!-- col62 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
                                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                                             <!-- col63 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
                                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                             <!-- col64 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
                                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                                             <!-- col65 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
                                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                             <!-- col66 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
                                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                             <!-- col67 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
                                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                             <!-- col68 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
                                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                             <!-- col69 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
                                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                             <!-- col70 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                             -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),   -->
                                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                             <!-- col71 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                             -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),   -->
                                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                             <!-- col72 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
                                             <!--    'column_alias': 'metric_time__day'}                    -->
                                             <!-- col73 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
                                             <!--    'column_alias': 'metric_time__week'}                   -->
                                             <!-- col74 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
                                             <!--    'column_alias': 'metric_time__month'}                  -->
                                             <!-- col75 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
                                             <!--    'column_alias': 'metric_time__quarter'}                -->
                                             <!-- col76 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
                                             <!--    'column_alias': 'metric_time__year'}                   -->
                                             <!-- col77 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
-                                            <!--    'column_alias': 'listing'}                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
+                                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                                             <!-- col78 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
-                                            <!--    'column_alias': 'guest'}                               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
+                                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                             <!-- col79 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
-                                            <!--    'column_alias': 'host'}                                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
+                                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                                             <!-- col80 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
-                                            <!--    'column_alias': 'booking__listing'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
+                                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                                             <!-- col81 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
-                                            <!--    'column_alias': 'booking__guest'}                      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
+                                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                                             <!-- col82 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
-                                            <!--    'column_alias': 'booking__host'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
+                                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                             <!-- col83 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
-                                            <!--    'column_alias': 'is_instant'}                          -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
+                                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                             <!-- col84 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
-                                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
+                                            <!--    'column_alias': 'listing'}                             -->
                                             <!-- col85 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
-                                            <!--    'column_alias': 'bookings'}                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
+                                            <!--    'column_alias': 'guest'}                               -->
                                             <!-- col86 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
-                                            <!--    'column_alias': 'instant_bookings'}                    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
+                                            <!--    'column_alias': 'host'}                                -->
                                             <!-- col87 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
-                                            <!--    'column_alias': 'booking_value'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
+                                            <!--    'column_alias': 'booking__listing'}                    -->
                                             <!-- col88 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
-                                            <!--    'column_alias': 'max_booking_value'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
+                                            <!--    'column_alias': 'booking__guest'}                      -->
                                             <!-- col89 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
-                                            <!--    'column_alias': 'min_booking_value'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                                            <!--    'column_alias': 'booking__host'}                       -->
                                             <!-- col90 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
-                                            <!--    'column_alias': 'bookers'}                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                            <!--    'column_alias': 'is_instant'}                          -->
                                             <!-- col91 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
-                                            <!--    'column_alias': 'average_booking_value'}               -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                            <!--    'column_alias': 'booking__is_instant'}                 -->
                                             <!-- col92 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
-                                            <!--    'column_alias': 'referred_bookings'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                                            <!--    'column_alias': 'bookings'}                            -->
                                             <!-- col93 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
-                                            <!--    'column_alias': 'median_booking_value'}                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                                            <!--    'column_alias': 'instant_bookings'}                    -->
                                             <!-- col94 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
-                                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                                            <!--    'column_alias': 'booking_value'}                       -->
                                             <!-- col95 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                            <!--    'column_alias': 'max_booking_value'}                   -->
+                                            <!-- col96 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                            <!--    'column_alias': 'min_booking_value'}                   -->
+                                            <!-- col97 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                                            <!--    'column_alias': 'bookers'}                             -->
+                                            <!-- col98 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                                            <!--    'column_alias': 'average_booking_value'}               -->
+                                            <!-- col99 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                                            <!--    'column_alias': 'referred_bookings'}                   -->
+                                            <!-- col100 =                                                  -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                            <!--    'column_alias': 'median_booking_value'}                -->
+                                            <!-- col101 =                                                  -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                                            <!-- col102 =                                                  -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
                                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                            <!-- col96 =                                                         -->
+                                            <!-- col103 =                                                        -->
                                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),        -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),        -->
                                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                            <!-- col97 =                                                       -->
+                                            <!-- col104 =                                                      -->
                                             <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),      -->
                                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                             <!-- where = None -->
@@ -2419,11 +2503,11 @@
                                         <!-- node_id = ss_20 -->
                                         <!-- col0 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_864),  -->
                                         <!--    'column_alias': 'listing'}                             -->
                                         <!-- col1 =                                                    -->
                                         <!--   {'class': 'SqlSelectColumn',                            -->
-                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
+                                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
                                         <!--    'column_alias': 'is_lux_latest'}                       -->
                                         <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
                                         <!-- where = None -->
@@ -2432,263 +2516,291 @@
                                             <!-- node_id = ss_19 -->
                                             <!-- col0 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
                                             <!--    'column_alias': 'ds__day'}                             -->
                                             <!-- col1 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
                                             <!--    'column_alias': 'ds__week'}                            -->
                                             <!-- col2 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
                                             <!--    'column_alias': 'ds__month'}                           -->
                                             <!-- col3 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
                                             <!--    'column_alias': 'ds__quarter'}                         -->
                                             <!-- col4 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
                                             <!--    'column_alias': 'ds__year'}                            -->
                                             <!-- col5 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
                                             <!--    'column_alias': 'ds__extract_year'}                    -->
                                             <!-- col6 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
                                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                             <!-- col7 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
                                             <!--    'column_alias': 'ds__extract_month'}                   -->
                                             <!-- col8 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
                                             <!--    'column_alias': 'ds__extract_week'}                    -->
                                             <!-- col9 =                                                    -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
                                             <!--    'column_alias': 'ds__extract_day'}                     -->
                                             <!-- col10 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
                                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                             <!-- col11 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
                                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                             <!-- col12 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
                                             <!--    'column_alias': 'created_at__day'}                     -->
                                             <!-- col13 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
                                             <!--    'column_alias': 'created_at__week'}                    -->
                                             <!-- col14 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
                                             <!--    'column_alias': 'created_at__month'}                   -->
                                             <!-- col15 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
                                             <!--    'column_alias': 'created_at__quarter'}                 -->
                                             <!-- col16 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
                                             <!--    'column_alias': 'created_at__year'}                    -->
                                             <!-- col17 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
                                             <!--    'column_alias': 'created_at__extract_year'}            -->
                                             <!-- col18 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
                                             <!--    'column_alias': 'created_at__extract_quarter'}         -->
                                             <!-- col19 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
                                             <!--    'column_alias': 'created_at__extract_month'}           -->
                                             <!-- col20 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
                                             <!--    'column_alias': 'created_at__extract_week'}            -->
                                             <!-- col21 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),  -->
                                             <!--    'column_alias': 'created_at__extract_day'}             -->
                                             <!-- col22 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),  -->
                                             <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                                             <!-- col23 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
                                             <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                                             <!-- col24 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
                                             <!--    'column_alias': 'listing__ds__day'}                    -->
                                             <!-- col25 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
                                             <!--    'column_alias': 'listing__ds__week'}                   -->
                                             <!-- col26 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
                                             <!--    'column_alias': 'listing__ds__month'}                  -->
                                             <!-- col27 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
                                             <!--    'column_alias': 'listing__ds__quarter'}                -->
                                             <!-- col28 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
                                             <!--    'column_alias': 'listing__ds__year'}                   -->
                                             <!-- col29 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
                                             <!--    'column_alias': 'listing__ds__extract_year'}           -->
                                             <!-- col30 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
                                             <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                                             <!-- col31 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
                                             <!--    'column_alias': 'listing__ds__extract_month'}          -->
                                             <!-- col32 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
                                             <!--    'column_alias': 'listing__ds__extract_week'}           -->
                                             <!-- col33 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
                                             <!--    'column_alias': 'listing__ds__extract_day'}            -->
                                             <!-- col34 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
                                             <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                                             <!-- col35 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
                                             <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                                             <!-- col36 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
                                             <!--    'column_alias': 'listing__created_at__day'}            -->
                                             <!-- col37 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
                                             <!--    'column_alias': 'listing__created_at__week'}           -->
                                             <!-- col38 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
                                             <!--    'column_alias': 'listing__created_at__month'}          -->
                                             <!-- col39 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
                                             <!--    'column_alias': 'listing__created_at__quarter'}        -->
                                             <!-- col40 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
                                             <!--    'column_alias': 'listing__created_at__year'}           -->
                                             <!-- col41 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
                                             <!--    'column_alias': 'listing__created_at__extract_year'}   -->
                                             <!-- col42 =                                                     -->
                                             <!--   {'class': 'SqlSelectColumn',                              -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),    -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),    -->
                                             <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
                                             <!-- col43 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
                                             <!--    'column_alias': 'listing__created_at__extract_month'}  -->
                                             <!-- col44 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
                                             <!--    'column_alias': 'listing__created_at__extract_week'}   -->
                                             <!-- col45 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_845),  -->
                                             <!--    'column_alias': 'listing__created_at__extract_day'}    -->
                                             <!-- col46 =                                                       -->
                                             <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),      -->
                                             <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
                                             <!-- col47 =                                                       -->
                                             <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),      -->
                                             <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
                                             <!-- col48 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
                                             <!--    'column_alias': 'metric_time__day'}                    -->
                                             <!-- col49 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
                                             <!--    'column_alias': 'metric_time__week'}                   -->
                                             <!-- col50 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
                                             <!--    'column_alias': 'metric_time__month'}                  -->
                                             <!-- col51 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),  -->
                                             <!--    'column_alias': 'metric_time__quarter'}                -->
                                             <!-- col52 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
                                             <!--    'column_alias': 'metric_time__year'}                   -->
                                             <!-- col53 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
-                                            <!--    'column_alias': 'listing'}                             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_853),  -->
+                                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                                             <!-- col54 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
-                                            <!--    'column_alias': 'user'}                                -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
+                                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                             <!-- col55 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
-                                            <!--    'column_alias': 'listing__user'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
+                                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                                             <!-- col56 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
-                                            <!--    'column_alias': 'country_latest'}                      -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
+                                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                                             <!-- col57 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
-                                            <!--    'column_alias': 'is_lux_latest'}                       -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_857),  -->
+                                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                                             <!-- col58 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
-                                            <!--    'column_alias': 'capacity_latest'}                     -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_858),  -->
+                                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                             <!-- col59 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
-                                            <!--    'column_alias': 'listing__country_latest'}             -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_859),  -->
+                                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                             <!-- col60 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
-                                            <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
+                                            <!--    'column_alias': 'listing'}                             -->
                                             <!-- col61 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
-                                            <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
+                                            <!--    'column_alias': 'user'}                                -->
                                             <!-- col62 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
-                                            <!--    'column_alias': 'listings'}                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
+                                            <!--    'column_alias': 'listing__user'}                       -->
                                             <!-- col63 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
-                                            <!--    'column_alias': 'largest_listing'}                     -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                                            <!--    'column_alias': 'country_latest'}                      -->
                                             <!-- col64 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                                            <!--    'column_alias': 'is_lux_latest'}                       -->
+                                            <!-- col65 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
+                                            <!--    'column_alias': 'capacity_latest'}                     -->
+                                            <!-- col66 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                                            <!--    'column_alias': 'listing__country_latest'}             -->
+                                            <!-- col67 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
+                                            <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                                            <!-- col68 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
+                                            <!--    'column_alias': 'listing__capacity_latest'}            -->
+                                            <!-- col69 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
+                                            <!--    'column_alias': 'listings'}                            -->
+                                            <!-- col70 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                                            <!--    'column_alias': 'largest_listing'}                     -->
+                                            <!-- col71 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
                                             <!--    'column_alias': 'smallest_listing'}                    -->
                                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                                             <!-- where = None -->
@@ -2956,11 +3068,11 @@
                 <!-- node_id = ss_30 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_908),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_992),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_909),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_993),  -->
                 <!--    'column_alias': 'booking_value'}                       -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_29) -->
                 <!-- where = None -->
@@ -2969,7 +3081,7 @@
                     <!-- node_id = ss_29 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_907),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_991),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -2978,7 +3090,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_28) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_907),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_991),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -2988,11 +3100,11 @@
                         <!-- node_id = ss_28 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_905),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_989),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_904),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_988),  -->
                         <!--    'column_alias': 'booking_value'}                       -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_27) -->
                         <!-- where = None -->
@@ -3001,395 +3113,423 @@
                             <!-- node_id = ss_27 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_898),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_899),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_900),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_901),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_902),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_903),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_904),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_905),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_906),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_907),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_908),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_909),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_910),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_911),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_912),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_913),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_914),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_915),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_916),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_917),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_918),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_919),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_920),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_921),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_845),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_922),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_923),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_924),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_925),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_926),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_927),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_928),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_929),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_853),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_930),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_931),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_932),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_933),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_857),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_934),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_858),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_935),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_859),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_936),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_937),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_938),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_939),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_940),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_864),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_941),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_865),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_942),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_866),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_943),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_944),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_868),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_945),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_869),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_946),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_870),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_947),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_948),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_949),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_950),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_951),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_875),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_952),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_876),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_953),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_877),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_954),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_878),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_955),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_879),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_956),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_957),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_881),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_958),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_882),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_959),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_960),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_961),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_962),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_963),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_887),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_964),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_888),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_965),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_889),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_966),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_890),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_967),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_891),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_968),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_892),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_969),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_893),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_970),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_894),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_971),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_895),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_972),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_973),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_974),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_898),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_975),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_899),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_976),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_900),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_977),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_901),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_978),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_902),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_979),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_903),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_980),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_981),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_982),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_983),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_984),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_985),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_986),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_987),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_887),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_888),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_889),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_890),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_891),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_892),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_893),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_894),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_895),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml
index 44372c125e..abe224335b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_18 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                   -->
         <!--   {'class': 'SqlSelectColumn',                           -->
@@ -21,11 +21,11 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                          -->
             <!--   {'class': 'SqlSelectColumn',                                  -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),        -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),        -->
             <!--    'column_alias': 'booking_value_with_is_instant_constraint'}  -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
             <!--    'column_alias': 'booking_value'}                       -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
             <!-- join_0 =                                                   -->
@@ -40,11 +40,11 @@
                 <!-- node_id = ss_12 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                          -->
                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),        -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),        -->
                 <!--    'column_alias': 'booking_value_with_is_instant_constraint'}  -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                 <!-- where = None -->
@@ -53,7 +53,7 @@
                     <!-- node_id = ss_11 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -62,7 +62,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -72,11 +72,11 @@
                         <!-- node_id = ss_10 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
                         <!--    'column_alias': 'booking_value'}                       -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                         <!-- where = None -->
@@ -85,15 +85,15 @@
                             <!-- node_id = ss_9 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                             <!--    'column_alias': 'booking_value'}                       -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- where =                                                            -->
@@ -105,15 +105,15 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                                 <!--    'column_alias': 'booking__is_instant'}                 -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                                 <!--    'column_alias': 'booking_value'}                       -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
@@ -122,395 +122,423 @@
                                     <!-- node_id = ss_7 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                                     <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                                     <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                                     <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                                     <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                                     <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                                     <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                                     <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                                     <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                                     <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                                     <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                                     <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                                     <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                                     <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                                     <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                                     <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                                     <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                                     <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                                     <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                                     <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                                     <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                     <!-- col53 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                     <!-- col54 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                     <!-- col55 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                     <!-- col56 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                     <!-- col57 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                     <!-- col58 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                     <!-- col59 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}               -->
                                     <!-- col61 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}              -->
                                     <!-- col62 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}             -->
                                     <!-- col63 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                     <!-- col64 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}              -->
                                     <!-- col65 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                     <!-- col66 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                     <!-- col67 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                     <!-- col68 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                     <!-- col69 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                     <!-- col70 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                     <!-- col71 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col73 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                                     <!--    'column_alias': 'metric_time__week'}                   -->
                                     <!-- col74 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                                     <!--    'column_alias': 'metric_time__month'}                  -->
                                     <!-- col75 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                                     <!--    'column_alias': 'metric_time__quarter'}                -->
                                     <!-- col76 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                                     <!--    'column_alias': 'metric_time__year'}                   -->
                                     <!-- col77 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                                     <!-- col78 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                     <!-- col79 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                    <!--    'column_alias': 'metric_time__extract_month'}          -->
                                     <!-- col80 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                    <!--    'column_alias': 'metric_time__extract_week'}           -->
                                     <!-- col81 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                    <!--    'column_alias': 'metric_time__extract_day'}            -->
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
                                     <!-- col85 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
                                     <!-- col86 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                    <!--    'column_alias': 'host'}                                -->
                                     <!-- col87 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
                                     <!-- col88 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
                                     <!-- col89 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
                                     <!-- col90 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
                                     <!-- col91 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
                                     <!-- col92 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
                                     <!-- col93 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
                                     <!-- col94 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
                                     <!-- col95 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!-- col96 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!-- col97 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col98 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!-- col99 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!-- col100 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!-- col101 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                                    <!-- col102 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                    <!-- col96 =                                                         -->
+                                    <!-- col103 =                                                        -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                    <!-- col97 =                                                       -->
+                                    <!-- col104 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
@@ -912,11 +940,11 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
                 <!--    'column_alias': 'booking_value'}                       -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -925,7 +953,7 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -934,7 +962,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -944,11 +972,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
                         <!--    'column_alias': 'booking_value'}                       -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -957,395 +985,423 @@
                             <!-- node_id = ss_13 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml
index c22e5aaa2c..05c1e14185 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_13 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                        -->
         <!--   {'class': 'SqlSelectColumn',                                                -->
@@ -17,11 +17,11 @@
             <!-- node_id = ss_12 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
             <!--    'column_alias': 'delayed_bookings'}                    -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
             <!-- where = None -->
@@ -30,7 +30,7 @@
                 <!-- node_id = ss_11 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -39,7 +39,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -49,11 +49,11 @@
                     <!-- node_id = ss_10 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                     <!-- where = None -->
@@ -62,15 +62,15 @@
                         <!-- node_id = ss_9 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
                         <!--    'column_alias': 'booking__is_instant'}                 -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                         <!-- where =                                                                -->
@@ -82,15 +82,15 @@
                             <!-- node_id = ss_8 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                             <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                             <!--    'column_alias': 'bookings'}                            -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                             <!-- where = None -->
@@ -99,395 +99,423 @@
                                 <!-- node_id = ss_7 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                                 <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                                 <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                                 <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                                 <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                                 <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                                 <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                                 <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                                 <!--    'column_alias': 'paid_at__day'}                        -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                                 <!--    'column_alias': 'paid_at__week'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                                 <!--    'column_alias': 'paid_at__month'}                      -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                                 <!--    'column_alias': 'paid_at__quarter'}                    -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                                 <!--    'column_alias': 'paid_at__year'}                       -->
                                 <!-- col29 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                                 <!--    'column_alias': 'paid_at__extract_year'}               -->
                                 <!-- col30 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                                 <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                 <!-- col31 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                                 <!--    'column_alias': 'paid_at__extract_month'}              -->
                                 <!-- col32 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                                 <!--    'column_alias': 'paid_at__extract_week'}               -->
                                 <!-- col33 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                                 <!--    'column_alias': 'paid_at__extract_day'}                -->
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                 <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                 <!--    'column_alias': 'booking__ds__day'}                    -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                                 <!--    'column_alias': 'booking__ds__week'}                   -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                                 <!--    'column_alias': 'booking__ds__month'}                  -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                                 <!--    'column_alias': 'booking__ds__quarter'}                -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                                 <!--    'column_alias': 'booking__ds__year'}                   -->
                                 <!-- col41 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                                 <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                 <!-- col42 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                                 <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                 <!-- col43 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                                 <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                 <!-- col44 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                                 <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                 <!-- col45 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                 <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                 <!-- col51 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                 <!-- col52 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                                 <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                 <!-- col53 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                 <!-- col54 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                 <!-- col55 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                 <!-- col56 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                 <!-- col57 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                 <!-- col58 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                 <!-- col59 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                                 <!--    'column_alias': 'booking__paid_at__day'}               -->
                                 <!-- col61 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                                 <!--    'column_alias': 'booking__paid_at__week'}              -->
                                 <!-- col62 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                                 <!--    'column_alias': 'booking__paid_at__month'}             -->
                                 <!-- col63 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                                 <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                 <!-- col64 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                                 <!--    'column_alias': 'booking__paid_at__year'}              -->
                                 <!-- col65 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                 <!-- col66 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                 <!-- col67 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                 <!-- col68 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                 <!-- col69 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                 <!-- col70 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                 <!-- col71 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col73 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                                 <!--    'column_alias': 'metric_time__week'}                   -->
                                 <!-- col74 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                                 <!--    'column_alias': 'metric_time__month'}                  -->
                                 <!-- col75 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                                 <!--    'column_alias': 'metric_time__quarter'}                -->
                                 <!-- col76 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                                 <!--    'column_alias': 'metric_time__year'}                   -->
                                 <!-- col77 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                                <!--    'column_alias': 'listing'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                <!--    'column_alias': 'metric_time__extract_year'}           -->
                                 <!-- col78 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                                <!--    'column_alias': 'guest'}                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                 <!-- col79 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                                <!--    'column_alias': 'host'}                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                <!--    'column_alias': 'metric_time__extract_month'}          -->
                                 <!-- col80 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                <!--    'column_alias': 'metric_time__extract_week'}           -->
                                 <!-- col81 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                <!--    'column_alias': 'metric_time__extract_day'}            -->
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                <!--    'column_alias': 'listing'}                             -->
                                 <!-- col85 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                                <!--    'column_alias': 'bookings'}                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                <!--    'column_alias': 'guest'}                               -->
                                 <!-- col86 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                <!--    'column_alias': 'host'}                                -->
                                 <!-- col87 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
                                 <!-- col88 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
                                 <!-- col89 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
                                 <!-- col90 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                                <!--    'column_alias': 'bookers'}                             -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
                                 <!-- col91 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
                                 <!-- col92 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
                                 <!-- col93 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
                                 <!-- col94 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
                                 <!-- col95 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col96 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col97 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col98 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col99 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col100 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col101 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!-- col102 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                                 <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                <!-- col96 =                                                         -->
+                                <!-- col103 =                                                        -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                                 <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                <!-- col97 =                                                       -->
+                                <!-- col104 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                                 <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml
index 700630d85f..ea838d4c06 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml
@@ -13,11 +13,11 @@
             <!-- node_id = ss_15 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
             <!--    'column_alias': 'listings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- join_0 =                                                   -->
@@ -32,7 +32,7 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -52,7 +52,7 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -61,395 +61,423 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -849,7 +877,7 @@
                 <!-- node_id = ss_14 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
                 <!--    'column_alias': 'listings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                 <!-- where = None -->
@@ -869,7 +897,7 @@
                         <!-- node_id = ss_12 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
                         <!--    'column_alias': 'listings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = None -->
@@ -878,263 +906,291 @@
                             <!-- node_id = ss_11 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                             <!--    'column_alias': 'created_at__day'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                             <!--    'column_alias': 'created_at__week'}                    -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                             <!--    'column_alias': 'created_at__month'}                   -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                             <!--    'column_alias': 'created_at__quarter'}                 -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                             <!--    'column_alias': 'created_at__year'}                    -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                             <!--    'column_alias': 'created_at__extract_year'}            -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                             <!--    'column_alias': 'created_at__extract_quarter'}         -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                             <!--    'column_alias': 'created_at__extract_month'}           -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                             <!--    'column_alias': 'created_at__extract_week'}            -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                             <!--    'column_alias': 'created_at__extract_day'}             -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                             <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                             <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                             <!--    'column_alias': 'listing__ds__day'}                    -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                             <!--    'column_alias': 'listing__ds__week'}                   -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                             <!--    'column_alias': 'listing__ds__month'}                  -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                             <!--    'column_alias': 'listing__ds__quarter'}                -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                             <!--    'column_alias': 'listing__ds__year'}                   -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                             <!--    'column_alias': 'listing__ds__extract_year'}           -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                             <!--    'column_alias': 'listing__ds__extract_quarter'}        -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                             <!--    'column_alias': 'listing__ds__extract_month'}          -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                             <!--    'column_alias': 'listing__ds__extract_week'}           -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                             <!--    'column_alias': 'listing__ds__extract_day'}            -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                             <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                             <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                             <!--    'column_alias': 'listing__created_at__day'}            -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                             <!--    'column_alias': 'listing__created_at__week'}           -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                             <!--    'column_alias': 'listing__created_at__month'}          -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                             <!--    'column_alias': 'listing__created_at__quarter'}        -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                             <!--    'column_alias': 'listing__created_at__year'}           -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                             <!--    'column_alias': 'listing__created_at__extract_year'}   -->
                             <!-- col42 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),    -->
                             <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                             <!--    'column_alias': 'listing__created_at__extract_month'}  -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                             <!--    'column_alias': 'listing__created_at__extract_week'}   -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                             <!--    'column_alias': 'listing__created_at__extract_day'}    -->
                             <!-- col46 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),      -->
                             <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
                             <!-- col47 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),      -->
                             <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col54 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
-                            <!--    'column_alias': 'user'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col55 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
-                            <!--    'column_alias': 'listing__user'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col56 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                            <!--    'column_alias': 'country_latest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col57 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                            <!--    'column_alias': 'is_lux_latest'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col58 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                            <!--    'column_alias': 'capacity_latest'}                     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col59 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                            <!--    'column_alias': 'listing__country_latest'}             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                            <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                            <!--    'column_alias': 'listing__capacity_latest'}            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                            <!--    'column_alias': 'user'}                                -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
-                            <!--    'column_alias': 'listings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
+                            <!--    'column_alias': 'listing__user'}                       -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
-                            <!--    'column_alias': 'largest_listing'}                     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                            <!--    'column_alias': 'country_latest'}                      -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                            <!--    'column_alias': 'is_lux_latest'}                       -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                            <!--    'column_alias': 'capacity_latest'}                     -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                            <!--    'column_alias': 'listing__country_latest'}             -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                            <!--    'column_alias': 'listing__is_lux_latest'}              -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                            <!--    'column_alias': 'listing__capacity_latest'}            -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                            <!--    'column_alias': 'listings'}                            -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                            <!--    'column_alias': 'largest_listing'}                     -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                             <!--    'column_alias': 'smallest_listing'}                    -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
index 0925971c02..0f3e05153d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
@@ -4,15 +4,15 @@
         <!-- node_id = ss_18 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_939),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_988),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_938),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_987),  -->
         <!--    'column_alias': 'listing__user__home_state_latest'}    -->
         <!-- col2 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_940),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_989),  -->
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
         <!-- where = None -->
@@ -21,11 +21,11 @@
             <!-- node_id = ss_17 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_937),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_986),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_936),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_985),  -->
             <!--    'column_alias': 'listing__user__home_state_latest'}    -->
             <!-- col2 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -34,11 +34,11 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_937),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_986),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- group_by1 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_936),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_985),  -->
             <!--    'column_alias': 'listing__user__home_state_latest'}    -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -48,15 +48,15 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_934),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_983),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_933),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_982),  -->
                 <!--    'column_alias': 'listing__user__home_state_latest'}    -->
                 <!-- col2 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_932),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_981),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
                 <!-- where = None -->
@@ -65,27 +65,27 @@
                     <!-- node_id = ss_15 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_927),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_976),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
-                    <!-- col1 =                                                     -->
-                    <!--   {'class': 'SqlSelectColumn',                             -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_930),   -->
-                    <!--    'column_alias': 'listing__window_start__extract_week'}  -->
+                    <!-- col1 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_979),  -->
+                    <!--    'column_alias': 'listing__window_start__day'}          -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_931),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_980),  -->
                     <!--    'column_alias': 'listing__window_end__day'}            -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_928),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_977),  -->
                     <!--    'column_alias': 'listing'}                             -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_929),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_978),  -->
                     <!--    'column_alias': 'listing__user__home_state_latest'}    -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_926),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_975),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                     <!-- join_0 =                                                   -->
@@ -102,15 +102,15 @@
                         <!-- node_id = ss_11 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_865),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_866),  -->
                         <!--    'column_alias': 'listing'}                             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_864),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                         <!-- where = None -->
@@ -119,371 +119,399 @@
                             <!-- node_id = ss_10 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_845),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
-                            <!--    'column_alias': 'user'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_853),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
-                            <!--    'column_alias': 'booking__user'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_857),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_858),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_859),  -->
+                            <!--    'column_alias': 'user'}                                -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
+                            <!--    'column_alias': 'booking__user'}                       -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col95 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10015) -->
                             <!-- where = None -->
@@ -859,19 +887,19 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_918),  -->
-                        <!--    'column_alias': 'window_start__extract_week'}          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_967),  -->
+                        <!--    'column_alias': 'window_start__day'}                   -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_919),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_968),  -->
                         <!--    'column_alias': 'window_end__day'}                     -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_920),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_969),  -->
                         <!--    'column_alias': 'listing'}                             -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_917),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_966),  -->
                         <!--    'column_alias': 'user__home_state_latest'}             -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -880,283 +908,283 @@
                             <!-- node_id = ss_13 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_853),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_902),  -->
                             <!--    'column_alias': 'window_start__day'}                   -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_903),  -->
                             <!--    'column_alias': 'window_start__week'}                  -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_904),  -->
                             <!--    'column_alias': 'window_start__month'}                 -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_905),  -->
                             <!--    'column_alias': 'window_start__quarter'}               -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_857),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_906),  -->
                             <!--    'column_alias': 'window_start__year'}                  -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_858),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_907),  -->
                             <!--    'column_alias': 'window_start__extract_year'}          -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_859),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_908),  -->
                             <!--    'column_alias': 'window_start__extract_quarter'}       -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_909),  -->
                             <!--    'column_alias': 'window_start__extract_month'}         -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_910),  -->
                             <!--    'column_alias': 'window_start__extract_week'}          -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_911),  -->
                             <!--    'column_alias': 'window_start__extract_day'}           -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_912),  -->
                             <!--    'column_alias': 'window_start__extract_dayofweek'}     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_864),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_913),  -->
                             <!--    'column_alias': 'window_start__extract_dayofyear'}     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_865),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_914),  -->
                             <!--    'column_alias': 'window_end__day'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_866),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_915),  -->
                             <!--    'column_alias': 'window_end__week'}                    -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_916),  -->
                             <!--    'column_alias': 'window_end__month'}                   -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_868),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_917),  -->
                             <!--    'column_alias': 'window_end__quarter'}                 -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_869),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_918),  -->
                             <!--    'column_alias': 'window_end__year'}                    -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_870),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_919),  -->
                             <!--    'column_alias': 'window_end__extract_year'}            -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_920),  -->
                             <!--    'column_alias': 'window_end__extract_quarter'}         -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_921),  -->
                             <!--    'column_alias': 'window_end__extract_month'}           -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_922),  -->
                             <!--    'column_alias': 'window_end__extract_week'}            -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_923),  -->
                             <!--    'column_alias': 'window_end__extract_day'}             -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_875),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_924),  -->
                             <!--    'column_alias': 'window_end__extract_dayofweek'}       -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_876),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_925),  -->
                             <!--    'column_alias': 'window_end__extract_dayofyear'}       -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_877),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_926),  -->
                             <!--    'column_alias': 'listing__window_start__day'}          -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_878),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_927),  -->
                             <!--    'column_alias': 'listing__window_start__week'}         -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_879),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_928),  -->
                             <!--    'column_alias': 'listing__window_start__month'}        -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_929),  -->
                             <!--    'column_alias': 'listing__window_start__quarter'}      -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_881),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_930),  -->
                             <!--    'column_alias': 'listing__window_start__year'}         -->
                             <!-- col29 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_882),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_931),   -->
                             <!--    'column_alias': 'listing__window_start__extract_year'}  -->
                             <!-- col30 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_932),      -->
                             <!--    'column_alias': 'listing__window_start__extract_quarter'}  -->
                             <!-- col31 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_933),    -->
                             <!--    'column_alias': 'listing__window_start__extract_month'}  -->
                             <!-- col32 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_934),   -->
                             <!--    'column_alias': 'listing__window_start__extract_week'}  -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_935),  -->
                             <!--    'column_alias': 'listing__window_start__extract_day'}  -->
                             <!-- col34 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_887),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_936),        -->
                             <!--    'column_alias': 'listing__window_start__extract_dayofweek'}  -->
                             <!-- col35 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_888),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_937),        -->
                             <!--    'column_alias': 'listing__window_start__extract_dayofyear'}  -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_889),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_938),  -->
                             <!--    'column_alias': 'listing__window_end__day'}            -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_890),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_939),  -->
                             <!--    'column_alias': 'listing__window_end__week'}           -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_891),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_940),  -->
                             <!--    'column_alias': 'listing__window_end__month'}          -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_892),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_941),  -->
                             <!--    'column_alias': 'listing__window_end__quarter'}        -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_893),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_942),  -->
                             <!--    'column_alias': 'listing__window_end__year'}           -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_894),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_943),  -->
                             <!--    'column_alias': 'listing__window_end__extract_year'}   -->
                             <!-- col42 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_895),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_944),    -->
                             <!--    'column_alias': 'listing__window_end__extract_quarter'}  -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_945),  -->
                             <!--    'column_alias': 'listing__window_end__extract_month'}  -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_946),  -->
                             <!--    'column_alias': 'listing__window_end__extract_week'}   -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_898),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_947),  -->
                             <!--    'column_alias': 'listing__window_end__extract_day'}    -->
                             <!-- col46 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_899),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_948),      -->
                             <!--    'column_alias': 'listing__window_end__extract_dayofweek'}  -->
                             <!-- col47 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_900),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_949),      -->
                             <!--    'column_alias': 'listing__window_end__extract_dayofyear'}  -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_905),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_954),  -->
                             <!--    'column_alias': 'user__ds__day'}                       -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_906),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_955),  -->
                             <!--    'column_alias': 'user__ds__week'}                      -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_907),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_956),  -->
                             <!--    'column_alias': 'user__ds__month'}                     -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_908),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_957),  -->
                             <!--    'column_alias': 'user__ds__quarter'}                   -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_909),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_958),  -->
                             <!--    'column_alias': 'user__ds__year'}                      -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_910),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_959),  -->
                             <!--    'column_alias': 'user__ds__extract_year'}              -->
                             <!-- col54 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_911),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_960),  -->
                             <!--    'column_alias': 'user__ds__extract_quarter'}           -->
                             <!-- col55 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_912),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_961),  -->
                             <!--    'column_alias': 'user__ds__extract_month'}             -->
                             <!-- col56 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_913),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_962),  -->
                             <!--    'column_alias': 'user__ds__extract_week'}              -->
                             <!-- col57 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_914),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_963),  -->
                             <!--    'column_alias': 'user__ds__extract_day'}               -->
                             <!-- col58 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_915),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_964),  -->
                             <!--    'column_alias': 'user__ds__extract_dayofweek'}         -->
                             <!-- col59 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_916),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_965),  -->
                             <!--    'column_alias': 'user__ds__extract_dayofyear'}         -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_901),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_950),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_902),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_951),  -->
                             <!--    'column_alias': 'user'}                                -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_903),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_952),  -->
                             <!--    'column_alias': 'listing__user'}                       -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),  -->
                             <!--    'column_alias': 'country'}                             -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),  -->
                             <!--    'column_alias': 'is_lux'}                              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_898),  -->
                             <!--    'column_alias': 'capacity'}                            -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_899),  -->
                             <!--    'column_alias': 'listing__country'}                    -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_900),  -->
                             <!--    'column_alias': 'listing__is_lux'}                     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_901),  -->
                             <!--    'column_alias': 'listing__capacity'}                   -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_904),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_953),  -->
                             <!--    'column_alias': 'user__home_state_latest'}             -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10017) -->
                             <!-- join_0 =                                                    -->
@@ -1438,111 +1466,111 @@
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_869),  -->
                                 <!--    'column_alias': 'ds__day'}                             -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_870),  -->
                                 <!--    'column_alias': 'ds__week'}                            -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),  -->
                                 <!--    'column_alias': 'ds__month'}                           -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),  -->
                                 <!--    'column_alias': 'ds__quarter'}                         -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),  -->
                                 <!--    'column_alias': 'ds__year'}                            -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),  -->
                                 <!--    'column_alias': 'ds__extract_year'}                    -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_875),  -->
                                 <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_876),  -->
                                 <!--    'column_alias': 'ds__extract_month'}                   -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_877),  -->
                                 <!--    'column_alias': 'ds__extract_week'}                    -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_878),  -->
                                 <!--    'column_alias': 'ds__extract_day'}                     -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_879),  -->
                                 <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),  -->
                                 <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_881),  -->
                                 <!--    'column_alias': 'user__ds__day'}                       -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_882),  -->
                                 <!--    'column_alias': 'user__ds__week'}                      -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),  -->
                                 <!--    'column_alias': 'user__ds__month'}                     -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),  -->
                                 <!--    'column_alias': 'user__ds__quarter'}                   -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),  -->
                                 <!--    'column_alias': 'user__ds__year'}                      -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
                                 <!--    'column_alias': 'user__ds__extract_year'}              -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_887),  -->
                                 <!--    'column_alias': 'user__ds__extract_quarter'}           -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_888),  -->
                                 <!--    'column_alias': 'user__ds__extract_month'}             -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_889),  -->
                                 <!--    'column_alias': 'user__ds__extract_week'}              -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_890),  -->
                                 <!--    'column_alias': 'user__ds__extract_day'}               -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_891),  -->
                                 <!--    'column_alias': 'user__ds__extract_dayofweek'}         -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_892),  -->
                                 <!--    'column_alias': 'user__ds__extract_dayofyear'}         -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_893),  -->
                                 <!--    'column_alias': 'user'}                                -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),  -->
                                 <!--    'column_alias': 'home_state_latest'}                   -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_868),  -->
                                 <!--    'column_alias': 'user__home_state_latest'}             -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10021) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
index e26de6a7d9..d506931ba5 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
@@ -4,15 +4,15 @@
         <!-- node_id = ss_12 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                        -->
         <!--   {'class': 'SqlSelectColumn',                                -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),      -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),      -->
         <!--    'column_alias': 'listing__lux_listing__is_confirmed_lux'}  -->
         <!-- col2 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
         <!--    'column_alias': 'bookings'}                            -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
         <!-- where = None -->
@@ -21,11 +21,11 @@
             <!-- node_id = ss_11 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                        -->
             <!--   {'class': 'SqlSelectColumn',                                -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),      -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),      -->
             <!--    'column_alias': 'listing__lux_listing__is_confirmed_lux'}  -->
             <!-- col2 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -34,11 +34,11 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- group_by1 =                                                   -->
             <!--   {'class': 'SqlSelectColumn',                                -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),      -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),      -->
             <!--    'column_alias': 'listing__lux_listing__is_confirmed_lux'}  -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -48,15 +48,15 @@
                 <!-- node_id = ss_10 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                        -->
                 <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),      -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),      -->
                 <!--    'column_alias': 'listing__lux_listing__is_confirmed_lux'}  -->
                 <!-- col2 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                 <!-- where = None -->
@@ -65,27 +65,27 @@
                     <!-- node_id = ss_9 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
-                    <!-- col1 =                                                                       -->
-                    <!--   {'class': 'SqlSelectColumn',                                               -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),                     -->
-                    <!--    'column_alias': 'listing__lux_listing__window_start__extract_dayofweek'}  -->
-                    <!-- col2 =                                                                 -->
-                    <!--   {'class': 'SqlSelectColumn',                                         -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),               -->
-                    <!--    'column_alias': 'listing__lux_listing__window_end__extract_month'}  -->
+                    <!-- col1 =                                                         -->
+                    <!--   {'class': 'SqlSelectColumn',                                 -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),       -->
+                    <!--    'column_alias': 'listing__lux_listing__window_start__day'}  -->
+                    <!-- col2 =                                                       -->
+                    <!--   {'class': 'SqlSelectColumn',                               -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),     -->
+                    <!--    'column_alias': 'listing__lux_listing__window_end__day'}  -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
                     <!--    'column_alias': 'listing'}                             -->
                     <!-- col4 =                                                        -->
                     <!--   {'class': 'SqlSelectColumn',                                -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),      -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),      -->
                     <!--    'column_alias': 'listing__lux_listing__is_confirmed_lux'}  -->
                     <!-- col5 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_5) -->
                     <!-- join_0 =                                                  -->
@@ -102,15 +102,15 @@
                         <!-- node_id = ss_5 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_375),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_376),  -->
                         <!--    'column_alias': 'listing'}                             -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_4) -->
                         <!-- where = None -->
@@ -119,371 +119,399 @@
                             <!-- node_id = ss_4 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_287),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_288),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_289),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_297),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_301),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_302),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_303),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_307),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_308),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_309),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_310),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_311),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_312),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_313),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_314),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_315),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_319),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_320),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_321),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_322),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_323),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_324),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_325),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_326),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_327),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_331),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_332),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_333),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_334),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_335),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_336),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_337),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_338),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_355),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_343),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_357),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_344),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_358),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_345),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_346),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_347),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_348),  -->
-                            <!--    'column_alias': 'user'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_362),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_349),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_363),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_350),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
-                            <!--    'column_alias': 'booking__user'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_367),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_369),  -->
+                            <!--    'column_alias': 'user'}                                -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_372),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_373),  -->
+                            <!--    'column_alias': 'booking__user'}                       -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col95 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),  -->
                             <!--    'column_alias': 'average_booking_value'}               -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10015) -->
                             <!-- where = None -->
@@ -860,21 +888,21 @@
                         <!--      'lux_listing__window_end__day',    -->
                         <!--      'listing']                         -->
                         <!-- node_id = ss_8 -->
-                        <!-- col0 =                                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                                      -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),            -->
-                        <!--    'column_alias': 'lux_listing__window_start__extract_dayofweek'}  -->
-                        <!-- col1 =                                                        -->
-                        <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),      -->
-                        <!--    'column_alias': 'lux_listing__window_end__extract_month'}  -->
+                        <!-- col0 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                        <!--    'column_alias': 'lux_listing__window_start__day'}      -->
+                        <!-- col1 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                        <!--    'column_alias': 'lux_listing__window_end__day'}        -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
                         <!--    'column_alias': 'listing'}                             -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
                         <!--    'column_alias': 'lux_listing__is_confirmed_lux'}       -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -883,115 +911,115 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_413),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
                             <!--    'column_alias': 'lux_listing__window_start__day'}      -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
                             <!--    'column_alias': 'lux_listing__window_start__week'}     -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
                             <!--    'column_alias': 'lux_listing__window_start__month'}    -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_416),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
                             <!--    'column_alias': 'lux_listing__window_start__quarter'}  -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_417),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
                             <!--    'column_alias': 'lux_listing__window_start__year'}     -->
                             <!-- col5 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                 -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_418),       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),       -->
                             <!--    'column_alias': 'lux_listing__window_start__extract_year'}  -->
                             <!-- col6 =                                                            -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_419),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),          -->
                             <!--    'column_alias': 'lux_listing__window_start__extract_quarter'}  -->
                             <!-- col7 =                                                          -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_420),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),        -->
                             <!--    'column_alias': 'lux_listing__window_start__extract_month'}  -->
                             <!-- col8 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                 -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_421),       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),       -->
                             <!--    'column_alias': 'lux_listing__window_start__extract_week'}  -->
                             <!-- col9 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_422),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),      -->
                             <!--    'column_alias': 'lux_listing__window_start__extract_day'}  -->
                             <!-- col10 =                                                             -->
                             <!--   {'class': 'SqlSelectColumn',                                      -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_423),            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),            -->
                             <!--    'column_alias': 'lux_listing__window_start__extract_dayofweek'}  -->
                             <!-- col11 =                                                             -->
                             <!--   {'class': 'SqlSelectColumn',                                      -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_424),            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),            -->
                             <!--    'column_alias': 'lux_listing__window_start__extract_dayofyear'}  -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_425),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
                             <!--    'column_alias': 'lux_listing__window_end__day'}        -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_426),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
                             <!--    'column_alias': 'lux_listing__window_end__week'}       -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_427),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
                             <!--    'column_alias': 'lux_listing__window_end__month'}      -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_428),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
                             <!--    'column_alias': 'lux_listing__window_end__quarter'}    -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_429),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
                             <!--    'column_alias': 'lux_listing__window_end__year'}       -->
                             <!-- col17 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_430),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),     -->
                             <!--    'column_alias': 'lux_listing__window_end__extract_year'}  -->
                             <!-- col18 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_431),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),        -->
                             <!--    'column_alias': 'lux_listing__window_end__extract_quarter'}  -->
                             <!-- col19 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_432),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),      -->
                             <!--    'column_alias': 'lux_listing__window_end__extract_month'}  -->
                             <!-- col20 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_433),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),     -->
                             <!--    'column_alias': 'lux_listing__window_end__extract_week'}  -->
                             <!-- col21 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),    -->
                             <!--    'column_alias': 'lux_listing__window_end__extract_day'}  -->
                             <!-- col22 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),          -->
                             <!--    'column_alias': 'lux_listing__window_end__extract_dayofweek'}  -->
                             <!-- col23 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),          -->
                             <!--    'column_alias': 'lux_listing__window_end__extract_dayofyear'}  -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_430),  -->
                             <!--    'column_alias': 'listing'}                             -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_410),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_431),  -->
                             <!--    'column_alias': 'lux_listing'}                         -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_432),  -->
                             <!--    'column_alias': 'listing__lux_listing'}                -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_412),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_433),  -->
                             <!--    'column_alias': 'lux_listing__is_confirmed_lux'}       -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10018) -->
                             <!-- join_0 =                                                    -->
@@ -1082,207 +1110,207 @@
                                 <!-- node_id = ss_6 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_358),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_379),  -->
                                 <!--    'column_alias': 'window_start__day'}                   -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_359),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),  -->
                                 <!--    'column_alias': 'window_start__week'}                  -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_360),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),  -->
                                 <!--    'column_alias': 'window_start__month'}                 -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_361),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
                                 <!--    'column_alias': 'window_start__quarter'}               -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_362),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
                                 <!--    'column_alias': 'window_start__year'}                  -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_363),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
                                 <!--    'column_alias': 'window_start__extract_year'}          -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
                                 <!--    'column_alias': 'window_start__extract_quarter'}       -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
                                 <!--    'column_alias': 'window_start__extract_month'}         -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),  -->
                                 <!--    'column_alias': 'window_start__extract_week'}          -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_367),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),  -->
                                 <!--    'column_alias': 'window_start__extract_day'}           -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_368),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),  -->
                                 <!--    'column_alias': 'window_start__extract_dayofweek'}     -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_369),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),  -->
                                 <!--    'column_alias': 'window_start__extract_dayofyear'}     -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_370),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),  -->
                                 <!--    'column_alias': 'window_end__day'}                     -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_371),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),  -->
                                 <!--    'column_alias': 'window_end__week'}                    -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_372),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),  -->
                                 <!--    'column_alias': 'window_end__month'}                   -->
                                 <!-- col15 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_373),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
                                 <!--    'column_alias': 'window_end__quarter'}                 -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_374),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
                                 <!--    'column_alias': 'window_end__year'}                    -->
                                 <!-- col17 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_375),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
                                 <!--    'column_alias': 'window_end__extract_year'}            -->
                                 <!-- col18 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_376),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
                                 <!--    'column_alias': 'window_end__extract_quarter'}         -->
                                 <!-- col19 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_377),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
                                 <!--    'column_alias': 'window_end__extract_month'}           -->
                                 <!-- col20 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_378),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),  -->
                                 <!--    'column_alias': 'window_end__extract_week'}            -->
                                 <!-- col21 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_379),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),  -->
                                 <!--    'column_alias': 'window_end__extract_day'}             -->
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_380),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),  -->
                                 <!--    'column_alias': 'window_end__extract_dayofweek'}       -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_381),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),  -->
                                 <!--    'column_alias': 'window_end__extract_dayofyear'}       -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_382),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),  -->
                                 <!--    'column_alias': 'lux_listing__window_start__day'}      -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_383),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),  -->
                                 <!--    'column_alias': 'lux_listing__window_start__week'}     -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_384),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),  -->
                                 <!--    'column_alias': 'lux_listing__window_start__month'}    -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_385),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
                                 <!--    'column_alias': 'lux_listing__window_start__quarter'}  -->
                                 <!-- col28 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_386),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_407),  -->
                                 <!--    'column_alias': 'lux_listing__window_start__year'}     -->
                                 <!-- col29 =                                                        -->
                                 <!--   {'class': 'SqlSelectColumn',                                 -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_387),       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_408),       -->
                                 <!--    'column_alias': 'lux_listing__window_start__extract_year'}  -->
                                 <!-- col30 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_388),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_409),          -->
                                 <!--    'column_alias': 'lux_listing__window_start__extract_quarter'}  -->
                                 <!-- col31 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_410),        -->
                                 <!--    'column_alias': 'lux_listing__window_start__extract_month'}  -->
                                 <!-- col32 =                                                        -->
                                 <!--   {'class': 'SqlSelectColumn',                                 -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),       -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_411),       -->
                                 <!--    'column_alias': 'lux_listing__window_start__extract_week'}  -->
                                 <!-- col33 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_412),      -->
                                 <!--    'column_alias': 'lux_listing__window_start__extract_day'}  -->
                                 <!-- col34 =                                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                                      -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_392),            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_413),            -->
                                 <!--    'column_alias': 'lux_listing__window_start__extract_dayofweek'}  -->
                                 <!-- col35 =                                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                                      -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_393),            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),            -->
                                 <!--    'column_alias': 'lux_listing__window_start__extract_dayofyear'}  -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_394),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
                                 <!--    'column_alias': 'lux_listing__window_end__day'}        -->
                                 <!-- col37 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_395),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_416),  -->
                                 <!--    'column_alias': 'lux_listing__window_end__week'}       -->
                                 <!-- col38 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_396),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_417),  -->
                                 <!--    'column_alias': 'lux_listing__window_end__month'}      -->
                                 <!-- col39 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_397),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_418),  -->
                                 <!--    'column_alias': 'lux_listing__window_end__quarter'}    -->
                                 <!-- col40 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_398),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_419),  -->
                                 <!--    'column_alias': 'lux_listing__window_end__year'}       -->
                                 <!-- col41 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_399),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_420),     -->
                                 <!--    'column_alias': 'lux_listing__window_end__extract_year'}  -->
                                 <!-- col42 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_400),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_421),        -->
                                 <!--    'column_alias': 'lux_listing__window_end__extract_quarter'}  -->
                                 <!-- col43 =                                                       -->
                                 <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),      -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_422),      -->
                                 <!--    'column_alias': 'lux_listing__window_end__extract_month'}  -->
                                 <!-- col44 =                                                      -->
                                 <!--   {'class': 'SqlSelectColumn',                               -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),     -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_423),     -->
                                 <!--    'column_alias': 'lux_listing__window_end__extract_week'}  -->
                                 <!-- col45 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_424),    -->
                                 <!--    'column_alias': 'lux_listing__window_end__extract_day'}  -->
                                 <!-- col46 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_404),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_425),          -->
                                 <!--    'column_alias': 'lux_listing__window_end__extract_dayofweek'}  -->
                                 <!-- col47 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_405),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_426),          -->
                                 <!--    'column_alias': 'lux_listing__window_end__extract_dayofyear'}  -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_406),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_427),  -->
                                 <!--    'column_alias': 'lux_listing'}                         -->
                                 <!-- col49 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_356),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_377),  -->
                                 <!--    'column_alias': 'is_confirmed_lux'}                    -->
                                 <!-- col50 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_357),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_378),  -->
                                 <!--    'column_alias': 'lux_listing__is_confirmed_lux'}       -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10019) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
index 9f9193531e..8646094e2a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_11 -->
         <!-- col0 =                                                        -->
         <!--   {'class': 'SqlSelectColumn',                                -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),      -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_299),      -->
         <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_286),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_300),  -->
         <!--    'column_alias': 'txn_count'}                           -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_10 -->
             <!-- col0 =                                                        -->
             <!--   {'class': 'SqlSelectColumn',                                -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),      -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),      -->
             <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
             <!-- group_by0 =                                                   -->
             <!--   {'class': 'SqlSelectColumn',                                -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),      -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_298),      -->
             <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_9 -->
                 <!-- col0 =                                                        -->
                 <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),      -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_296),      -->
                 <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_295),  -->
                 <!--    'column_alias': 'txn_count'}                           -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                 <!-- where = None -->
@@ -49,23 +49,23 @@
                     <!-- node_id = ss_8 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_291),  -->
                     <!--    'column_alias': 'ds_partitioned__day'}                 -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
                     <!--    'column_alias': 'account_id__ds_partitioned__day'}     -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
                     <!--    'column_alias': 'account_id'}                          -->
                     <!-- col3 =                                                        -->
                     <!--   {'class': 'SqlSelectColumn',                                -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),      -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),      -->
                     <!--    'column_alias': 'account_id__customer_id__customer_name'}  -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_290),  -->
                     <!--    'column_alias': 'txn_count'}                           -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_4) -->
                     <!-- join_0 =                                                  -->
@@ -82,15 +82,15 @@
                         <!-- node_id = ss_4 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_191),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_205),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_192),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_206),  -->
                         <!--    'column_alias': 'account_id'}                          -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_190),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_204),  -->
                         <!--    'column_alias': 'txn_count'}                           -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_3) -->
                         <!-- where = None -->
@@ -99,231 +99,259 @@
                             <!-- node_id = ss_3 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_136),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_143),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_137),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_144),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_138),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_145),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_139),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_146),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_140),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_147),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_141),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_148),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_142),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_149),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_143),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_150),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_144),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_151),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_145),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_152),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_146),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_153),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_147),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_154),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_148),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_155),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_149),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_156),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_150),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_157),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_151),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_158),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_152),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_159),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_153),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_160),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_154),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_161),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_155),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_162),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_156),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_163),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_157),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_164),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_158),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_165),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_159),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_166),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_160),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_167),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__day'}     -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_161),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_168),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__week'}    -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_162),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_169),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__month'}   -->
                             <!-- col27 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_163),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_170),   -->
                             <!--    'column_alias': 'account_id__ds_partitioned__quarter'}  -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_164),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_171),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__year'}    -->
                             <!-- col29 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_165),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_172),        -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_year'}  -->
                             <!-- col30 =                                                            -->
                             <!--   {'class': 'SqlSelectColumn',                                     -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_166),           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_173),           -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_quarter'}  -->
                             <!-- col31 =                                                          -->
                             <!--   {'class': 'SqlSelectColumn',                                   -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_167),         -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_174),         -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_month'}  -->
                             <!-- col32 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_168),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_175),        -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_week'}  -->
                             <!-- col33 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                 -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_169),       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_176),       -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_day'}  -->
                             <!-- col34 =                                                              -->
                             <!--   {'class': 'SqlSelectColumn',                                       -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_170),             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_177),             -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col35 =                                                              -->
                             <!--   {'class': 'SqlSelectColumn',                                       -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_171),             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_178),             -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_172),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_179),  -->
                             <!--    'column_alias': 'account_id__ds__day'}                 -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_173),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_180),  -->
                             <!--    'column_alias': 'account_id__ds__week'}                -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_174),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_181),  -->
                             <!--    'column_alias': 'account_id__ds__month'}               -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_175),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_182),  -->
                             <!--    'column_alias': 'account_id__ds__quarter'}             -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_176),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_183),  -->
                             <!--    'column_alias': 'account_id__ds__year'}                -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_177),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_184),  -->
                             <!--    'column_alias': 'account_id__ds__extract_year'}        -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_178),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_185),  -->
                             <!--    'column_alias': 'account_id__ds__extract_quarter'}     -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_179),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_186),  -->
                             <!--    'column_alias': 'account_id__ds__extract_month'}       -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_180),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_187),  -->
                             <!--    'column_alias': 'account_id__ds__extract_week'}        -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_181),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_188),  -->
                             <!--    'column_alias': 'account_id__ds__extract_day'}         -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_182),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_189),  -->
                             <!--    'column_alias': 'account_id__ds__extract_dayofweek'}   -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_183),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_190),  -->
                             <!--    'column_alias': 'account_id__ds__extract_dayofyear'}   -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_184),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_191),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_185),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_192),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_186),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_193),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_187),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_194),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_188),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_195),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_189),  -->
-                            <!--    'column_alias': 'account_id'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_196),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col54 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_134),  -->
-                            <!--    'column_alias': 'account_month'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_197),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col55 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_135),  -->
-                            <!--    'column_alias': 'account_id__account_month'}           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_198),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col56 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_133),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_199),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
+                            <!-- col57 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_200),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
+                            <!-- col58 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_201),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!-- col59 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_202),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_203),  -->
+                            <!--    'column_alias': 'account_id'}                          -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_141),  -->
+                            <!--    'column_alias': 'account_month'}                       -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_142),  -->
+                            <!--    'column_alias': 'account_id__account_month'}           -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_140),  -->
                             <!--    'column_alias': 'txn_count'}                           -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10010) -->
                             <!-- where = None -->
@@ -555,15 +583,15 @@
                         <!-- node_id = ss_7 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
                         <!--    'column_alias': 'account_id'}                          -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
                         <!--    'column_alias': 'customer_id__customer_name'}          -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_6) -->
                         <!-- where = None -->
@@ -572,175 +600,175 @@
                             <!-- node_id = ss_6 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_228),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_229),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_230),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_231),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_232),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_233),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_234),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_235),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_236),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_237),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_238),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_239),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__day'}     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__week'}    -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_242),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__month'}   -->
                             <!-- col15 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_243),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),   -->
                             <!--    'column_alias': 'account_id__ds_partitioned__quarter'}  -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_244),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
                             <!--    'column_alias': 'account_id__ds_partitioned__year'}    -->
                             <!-- col17 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_245),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),        -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_year'}  -->
                             <!-- col18 =                                                            -->
                             <!--   {'class': 'SqlSelectColumn',                                     -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_246),           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),           -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_quarter'}  -->
                             <!-- col19 =                                                          -->
                             <!--   {'class': 'SqlSelectColumn',                                   -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),         -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),         -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_month'}  -->
                             <!-- col20 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),        -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_week'}  -->
                             <!-- col21 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                 -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),       -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_day'}  -->
                             <!-- col22 =                                                              -->
                             <!--   {'class': 'SqlSelectColumn',                                       -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_250),             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),             -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col23 =                                                              -->
                             <!--   {'class': 'SqlSelectColumn',                                       -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_251),             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),             -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_257),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__day'}    -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__week'}   -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__month'}  -->
                             <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_274),    -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__quarter'}  -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_275),  -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__year'}   -->
                             <!-- col29 =                                                          -->
                             <!--   {'class': 'SqlSelectColumn',                                   -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_262),         -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_276),         -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__extract_year'}  -->
                             <!-- col30 =                                                             -->
                             <!--   {'class': 'SqlSelectColumn',                                      -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_277),            -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__extract_quarter'}  -->
                             <!-- col31 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_278),          -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__extract_month'}  -->
                             <!-- col32 =                                                          -->
                             <!--   {'class': 'SqlSelectColumn',                                   -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),         -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_279),         -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__extract_week'}  -->
                             <!-- col33 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),        -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__extract_day'}  -->
                             <!-- col34 =                                                               -->
                             <!--   {'class': 'SqlSelectColumn',                                        -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),              -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col35 =                                                               -->
                             <!--   {'class': 'SqlSelectColumn',                                        -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),              -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
                             <!--    'column_alias': 'account_id'}                          -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_267),  -->
                             <!--    'column_alias': 'customer_id'}                         -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_268),  -->
                             <!--    'column_alias': 'account_id__customer_id'}             -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_226),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_240),  -->
                             <!--    'column_alias': 'extra_dim'}                           -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_227),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_241),  -->
                             <!--    'column_alias': 'account_id__extra_dim'}               -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_255),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_269),  -->
                             <!--    'column_alias': 'customer_id__customer_name'}          -->
                             <!-- col42 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_256),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),   -->
                             <!--    'column_alias': 'customer_id__customer_atomic_weight'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10011) -->
                             <!-- join_0 =                                                  -->
@@ -912,119 +940,119 @@
                                 <!-- node_id = ss_5 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_197),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_211),  -->
                                 <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_198),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_212),  -->
                                 <!--    'column_alias': 'ds_partitioned__week'}                -->
                                 <!-- col2 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_199),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_213),  -->
                                 <!--    'column_alias': 'ds_partitioned__month'}               -->
                                 <!-- col3 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_200),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_214),  -->
                                 <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                 <!-- col4 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_201),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_215),  -->
                                 <!--    'column_alias': 'ds_partitioned__year'}                -->
                                 <!-- col5 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_202),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_216),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                 <!-- col6 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_203),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_217),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                 <!-- col7 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_204),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_218),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                 <!-- col8 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_205),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_219),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                 <!-- col9 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_206),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_220),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_207),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_221),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_208),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_222),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_209),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_223),  -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__day'}    -->
                                 <!-- col13 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_210),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_224),  -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__week'}   -->
                                 <!-- col14 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_211),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_225),  -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__month'}  -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_212),    -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_226),    -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__quarter'}  -->
                                 <!-- col16 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_213),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_227),  -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__year'}   -->
                                 <!-- col17 =                                                          -->
                                 <!--   {'class': 'SqlSelectColumn',                                   -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_214),         -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_228),         -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__extract_year'}  -->
                                 <!-- col18 =                                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                                      -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_215),            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_229),            -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__extract_quarter'}  -->
                                 <!-- col19 =                                                           -->
                                 <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_216),          -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_230),          -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__extract_month'}  -->
                                 <!-- col20 =                                                          -->
                                 <!--   {'class': 'SqlSelectColumn',                                   -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_217),         -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_231),         -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__extract_week'}  -->
                                 <!-- col21 =                                                         -->
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_218),        -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_232),        -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__extract_day'}  -->
                                 <!-- col22 =                                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                                        -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_219),              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_233),              -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofweek'}  -->
                                 <!-- col23 =                                                               -->
                                 <!--   {'class': 'SqlSelectColumn',                                        -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_220),              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_234),              -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofyear'}  -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_221),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_235),  -->
                                 <!--    'column_alias': 'customer_id'}                         -->
                                 <!-- col25 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_193),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_207),  -->
                                 <!--    'column_alias': 'customer_name'}                       -->
                                 <!-- col26 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_194),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_208),  -->
                                 <!--    'column_alias': 'customer_atomic_weight'}              -->
                                 <!-- col27 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_195),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_209),  -->
                                 <!--    'column_alias': 'customer_id__customer_name'}          -->
                                 <!-- col28 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_196),   -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_210),   -->
                                 <!--    'column_alias': 'customer_id__customer_atomic_weight'}  -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10013) -->
                                 <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml
index cbd37b5a97..91382c7f6c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml
@@ -21,10 +21,10 @@
         <SqlSelectStatementNode>
             <!-- description = Compute Metrics via Expressions -->
             <!-- node_id = ss_15 -->
-            <!-- col0 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_961),  -->
-            <!--    'column_alias': 'bookings'}                            -->
+            <!-- col0 =                                                     -->
+            <!--   {'class': 'SqlSelectColumn',                             -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1052),  -->
+            <!--    'column_alias': 'bookings'}                             -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -41,10 +41,10 @@
                     <!--   Pass Only Elements:  -->
                     <!--     ['bookings']       -->
                     <!-- node_id = ss_13 -->
-                    <!-- col0 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_959),  -->
-                    <!--    'column_alias': 'bookings'}                            -->
+                    <!-- col0 =                                                     -->
+                    <!--   {'class': 'SqlSelectColumn',                             -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1050),  -->
+                    <!--    'column_alias': 'bookings'}                             -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -53,395 +53,423 @@
                         <!-- node_id = ss_12 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_876),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_960),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_877),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_961),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_878),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_962),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_879),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_963),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_964),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_881),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_965),  -->
                         <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_882),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_966),  -->
                         <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_967),  -->
                         <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_968),  -->
                         <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_969),  -->
                         <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_970),  -->
                         <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_887),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_971),  -->
                         <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_888),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_972),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_889),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_973),  -->
                         <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_890),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_974),  -->
                         <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_891),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_975),  -->
                         <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_892),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_976),  -->
                         <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_893),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_977),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_894),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_978),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_895),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_979),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_980),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_981),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_898),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_982),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_899),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_983),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_900),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_984),  -->
                         <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_901),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_985),  -->
                         <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_902),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_986),  -->
                         <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_903),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_987),  -->
                         <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_904),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_988),  -->
                         <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_905),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_989),  -->
                         <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_906),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_990),  -->
                         <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_907),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_991),  -->
                         <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_908),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_992),  -->
                         <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_909),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_993),  -->
                         <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_910),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_994),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_911),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_995),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_912),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_996),  -->
                         <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_913),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_997),  -->
                         <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_914),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_998),  -->
                         <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_915),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_999),  -->
                         <!--    'column_alias': 'booking__ds__quarter'}                -->
-                        <!-- col40 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_916),  -->
-                        <!--    'column_alias': 'booking__ds__year'}                   -->
-                        <!-- col41 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_917),  -->
-                        <!--    'column_alias': 'booking__ds__extract_year'}           -->
-                        <!-- col42 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_918),  -->
-                        <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
-                        <!-- col43 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_919),  -->
-                        <!--    'column_alias': 'booking__ds__extract_month'}          -->
-                        <!-- col44 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_920),  -->
-                        <!--    'column_alias': 'booking__ds__extract_week'}           -->
-                        <!-- col45 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_921),  -->
-                        <!--    'column_alias': 'booking__ds__extract_day'}            -->
-                        <!-- col46 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_922),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
-                        <!-- col47 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_923),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
-                        <!-- col48 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_924),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
-                        <!-- col49 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_925),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
-                        <!-- col50 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_926),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
-                        <!-- col51 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_927),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
-                        <!-- col52 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_928),  -->
-                        <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                        <!-- col40 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1000),  -->
+                        <!--    'column_alias': 'booking__ds__year'}                    -->
+                        <!-- col41 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1001),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}            -->
+                        <!-- col42 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1002),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}         -->
+                        <!-- col43 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1003),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}           -->
+                        <!-- col44 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1004),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}            -->
+                        <!-- col45 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1005),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}             -->
+                        <!-- col46 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1006),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}       -->
+                        <!-- col47 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1007),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}       -->
+                        <!-- col48 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1008),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}         -->
+                        <!-- col49 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1009),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}        -->
+                        <!-- col50 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1010),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}       -->
+                        <!-- col51 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1011),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}     -->
+                        <!-- col52 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1012),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}        -->
                         <!-- col53 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_929),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1013),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                         <!-- col54 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_930),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1014),       -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                         <!-- col55 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_931),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1015),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                         <!-- col56 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_932),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1016),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                         <!-- col57 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_933),    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1017),   -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                         <!-- col58 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_934),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1018),         -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                         <!-- col59 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_935),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1019),         -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
-                        <!-- col60 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_936),  -->
-                        <!--    'column_alias': 'booking__paid_at__day'}               -->
-                        <!-- col61 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_937),  -->
-                        <!--    'column_alias': 'booking__paid_at__week'}              -->
-                        <!-- col62 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_938),  -->
-                        <!--    'column_alias': 'booking__paid_at__month'}             -->
-                        <!-- col63 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_939),  -->
-                        <!--    'column_alias': 'booking__paid_at__quarter'}           -->
-                        <!-- col64 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_940),  -->
-                        <!--    'column_alias': 'booking__paid_at__year'}              -->
-                        <!-- col65 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_941),  -->
-                        <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
-                        <!-- col66 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_942),  -->
-                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
-                        <!-- col67 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_943),  -->
-                        <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
-                        <!-- col68 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_944),  -->
-                        <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
-                        <!-- col69 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_945),  -->
-                        <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                        <!-- col60 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1020),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}                -->
+                        <!-- col61 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1021),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}               -->
+                        <!-- col62 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1022),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}              -->
+                        <!-- col63 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1023),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}            -->
+                        <!-- col64 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1024),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}               -->
+                        <!-- col65 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1025),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}       -->
+                        <!-- col66 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1026),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}    -->
+                        <!-- col67 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1027),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}      -->
+                        <!-- col68 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1028),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}       -->
+                        <!-- col69 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1029),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}        -->
                         <!-- col70 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_946),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1030),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                         <!-- col71 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_947),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1031),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
-                        <!-- col72 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_948),  -->
-                        <!--    'column_alias': 'metric_time__day'}                    -->
-                        <!-- col73 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_949),  -->
-                        <!--    'column_alias': 'metric_time__week'}                   -->
-                        <!-- col74 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_950),  -->
-                        <!--    'column_alias': 'metric_time__month'}                  -->
-                        <!-- col75 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_951),  -->
-                        <!--    'column_alias': 'metric_time__quarter'}                -->
-                        <!-- col76 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_952),  -->
-                        <!--    'column_alias': 'metric_time__year'}                   -->
-                        <!-- col77 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_953),  -->
-                        <!--    'column_alias': 'listing'}                             -->
-                        <!-- col78 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_954),  -->
-                        <!--    'column_alias': 'guest'}                               -->
-                        <!-- col79 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_955),  -->
-                        <!--    'column_alias': 'host'}                                -->
-                        <!-- col80 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_956),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
-                        <!-- col81 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_957),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
-                        <!-- col82 =                                                   -->
+                        <!-- col72 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1032),  -->
+                        <!--    'column_alias': 'metric_time__day'}                     -->
+                        <!-- col73 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1033),  -->
+                        <!--    'column_alias': 'metric_time__week'}                    -->
+                        <!-- col74 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1034),  -->
+                        <!--    'column_alias': 'metric_time__month'}                   -->
+                        <!-- col75 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1035),  -->
+                        <!--    'column_alias': 'metric_time__quarter'}                 -->
+                        <!-- col76 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1036),  -->
+                        <!--    'column_alias': 'metric_time__year'}                    -->
+                        <!-- col77 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1037),  -->
+                        <!--    'column_alias': 'metric_time__extract_year'}            -->
+                        <!-- col78 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1038),  -->
+                        <!--    'column_alias': 'metric_time__extract_quarter'}         -->
+                        <!-- col79 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1039),  -->
+                        <!--    'column_alias': 'metric_time__extract_month'}           -->
+                        <!-- col80 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1040),  -->
+                        <!--    'column_alias': 'metric_time__extract_week'}            -->
+                        <!-- col81 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1041),  -->
+                        <!--    'column_alias': 'metric_time__extract_day'}             -->
+                        <!-- col82 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1042),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofweek'}       -->
+                        <!-- col83 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1043),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofyear'}       -->
+                        <!-- col84 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1044),  -->
+                        <!--    'column_alias': 'listing'}                              -->
+                        <!-- col85 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1045),  -->
+                        <!--    'column_alias': 'guest'}                                -->
+                        <!-- col86 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1046),  -->
+                        <!--    'column_alias': 'host'}                                 -->
+                        <!-- col87 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1047),  -->
+                        <!--    'column_alias': 'booking__listing'}                     -->
+                        <!-- col88 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1048),  -->
+                        <!--    'column_alias': 'booking__guest'}                       -->
+                        <!-- col89 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1049),  -->
+                        <!--    'column_alias': 'booking__host'}                        -->
+                        <!-- col90 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_958),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
-                        <!-- col83 =                                                   -->
-                        <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),  -->
                         <!--    'column_alias': 'is_instant'}                          -->
-                        <!-- col84 =                                                   -->
+                        <!-- col91 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_875),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_959),  -->
                         <!--    'column_alias': 'booking__is_instant'}                 -->
-                        <!-- col85 =                                                   -->
+                        <!-- col92 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_945),  -->
                         <!--    'column_alias': 'bookings'}                            -->
-                        <!-- col86 =                                                   -->
+                        <!-- col93 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_946),  -->
                         <!--    'column_alias': 'instant_bookings'}                    -->
-                        <!-- col87 =                                                   -->
+                        <!-- col94 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_947),  -->
                         <!--    'column_alias': 'booking_value'}                       -->
-                        <!-- col88 =                                                   -->
+                        <!-- col95 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_864),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_948),  -->
                         <!--    'column_alias': 'max_booking_value'}                   -->
-                        <!-- col89 =                                                   -->
+                        <!-- col96 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_865),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_949),  -->
                         <!--    'column_alias': 'min_booking_value'}                   -->
-                        <!-- col90 =                                                   -->
+                        <!-- col97 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_866),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_950),  -->
                         <!--    'column_alias': 'bookers'}                             -->
-                        <!-- col91 =                                                   -->
+                        <!-- col98 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_951),  -->
                         <!--    'column_alias': 'average_booking_value'}               -->
-                        <!-- col92 =                                                   -->
+                        <!-- col99 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_868),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_952),  -->
                         <!--    'column_alias': 'referred_bookings'}                   -->
-                        <!-- col93 =                                                   -->
+                        <!-- col100 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_869),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_953),  -->
                         <!--    'column_alias': 'median_booking_value'}                -->
-                        <!-- col94 =                                                   -->
+                        <!-- col101 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_870),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_954),  -->
                         <!--    'column_alias': 'booking_value_p99'}                   -->
-                        <!-- col95 =                                                   -->
+                        <!-- col102 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_955),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                        <!-- col96 =                                                         -->
+                        <!-- col103 =                                                        -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_956),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col97 =                                                       -->
+                        <!-- col104 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_957),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                         <!-- where = SqlBetweenExpression(node_id=betw_2) -->
@@ -450,395 +478,423 @@
                             <!-- node_id = ss_11 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_857),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_858),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_859),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_864),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_865),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_866),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_868),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_869),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_870),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_875),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_876),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_877),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_878),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_879),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_881),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_882),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_887),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_888),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_889),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_890),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_891),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_892),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_893),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_894),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_895),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_898),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_899),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_900),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_901),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_902),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_903),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_904),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_905),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_906),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_907),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_908),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_909),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_910),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_911),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_912),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_913),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_914),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_915),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_916),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_917),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_918),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_919),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_920),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_921),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_845),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_922),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_923),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_924),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_925),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_926),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_927),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_928),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_929),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_853),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_930),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_931),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_932),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_933),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_857),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_934),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_858),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_935),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_859),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_936),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_937),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_938),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_939),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_940),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_941),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_942),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_943),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_853),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_845),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -1239,7 +1295,7 @@
             <!-- node_id = ss_20 -->
             <!-- col0 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                             -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1095),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1200),  -->
             <!--    'column_alias': 'listings'}                             -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
             <!-- where = None -->
@@ -1259,7 +1315,7 @@
                     <!-- node_id = ss_18 -->
                     <!-- col0 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                             -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1093),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1198),  -->
                     <!--    'column_alias': 'listings'}                             -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                     <!-- where = None -->
@@ -1269,529 +1325,585 @@
                         <!-- node_id = ss_17 -->
                         <!-- col0 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1037),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1135),  -->
                         <!--    'column_alias': 'ds__day'}                              -->
                         <!-- col1 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1038),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1136),  -->
                         <!--    'column_alias': 'ds__week'}                             -->
                         <!-- col2 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1039),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1137),  -->
                         <!--    'column_alias': 'ds__month'}                            -->
                         <!-- col3 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1040),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1138),  -->
                         <!--    'column_alias': 'ds__quarter'}                          -->
                         <!-- col4 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1041),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1139),  -->
                         <!--    'column_alias': 'ds__year'}                             -->
                         <!-- col5 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1042),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1140),  -->
                         <!--    'column_alias': 'ds__extract_year'}                     -->
                         <!-- col6 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1043),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1141),  -->
                         <!--    'column_alias': 'ds__extract_quarter'}                  -->
                         <!-- col7 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1044),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1142),  -->
                         <!--    'column_alias': 'ds__extract_month'}                    -->
                         <!-- col8 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1045),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1143),  -->
                         <!--    'column_alias': 'ds__extract_week'}                     -->
                         <!-- col9 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1046),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1144),  -->
                         <!--    'column_alias': 'ds__extract_day'}                      -->
                         <!-- col10 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1047),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1145),  -->
                         <!--    'column_alias': 'ds__extract_dayofweek'}                -->
                         <!-- col11 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1048),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1146),  -->
                         <!--    'column_alias': 'ds__extract_dayofyear'}                -->
                         <!-- col12 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1049),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1147),  -->
                         <!--    'column_alias': 'created_at__day'}                      -->
                         <!-- col13 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1050),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1148),  -->
                         <!--    'column_alias': 'created_at__week'}                     -->
                         <!-- col14 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1051),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1149),  -->
                         <!--    'column_alias': 'created_at__month'}                    -->
                         <!-- col15 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1052),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1150),  -->
                         <!--    'column_alias': 'created_at__quarter'}                  -->
                         <!-- col16 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1053),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1151),  -->
                         <!--    'column_alias': 'created_at__year'}                     -->
                         <!-- col17 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1054),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1152),  -->
                         <!--    'column_alias': 'created_at__extract_year'}             -->
                         <!-- col18 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1055),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1153),  -->
                         <!--    'column_alias': 'created_at__extract_quarter'}          -->
                         <!-- col19 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1056),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1154),  -->
                         <!--    'column_alias': 'created_at__extract_month'}            -->
                         <!-- col20 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1057),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1155),  -->
                         <!--    'column_alias': 'created_at__extract_week'}             -->
                         <!-- col21 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1058),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1156),  -->
                         <!--    'column_alias': 'created_at__extract_day'}              -->
                         <!-- col22 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1059),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1157),  -->
                         <!--    'column_alias': 'created_at__extract_dayofweek'}        -->
                         <!-- col23 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1060),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1158),  -->
                         <!--    'column_alias': 'created_at__extract_dayofyear'}        -->
                         <!-- col24 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1061),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1159),  -->
                         <!--    'column_alias': 'listing__ds__day'}                     -->
                         <!-- col25 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1062),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1160),  -->
                         <!--    'column_alias': 'listing__ds__week'}                    -->
                         <!-- col26 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1063),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1161),  -->
                         <!--    'column_alias': 'listing__ds__month'}                   -->
                         <!-- col27 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1064),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1162),  -->
                         <!--    'column_alias': 'listing__ds__quarter'}                 -->
                         <!-- col28 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1065),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1163),  -->
                         <!--    'column_alias': 'listing__ds__year'}                    -->
                         <!-- col29 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1066),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1164),  -->
                         <!--    'column_alias': 'listing__ds__extract_year'}            -->
                         <!-- col30 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1067),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1165),  -->
                         <!--    'column_alias': 'listing__ds__extract_quarter'}         -->
                         <!-- col31 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1068),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1166),  -->
                         <!--    'column_alias': 'listing__ds__extract_month'}           -->
                         <!-- col32 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1069),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1167),  -->
                         <!--    'column_alias': 'listing__ds__extract_week'}            -->
                         <!-- col33 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1070),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1168),  -->
                         <!--    'column_alias': 'listing__ds__extract_day'}             -->
                         <!-- col34 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1071),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1169),  -->
                         <!--    'column_alias': 'listing__ds__extract_dayofweek'}       -->
                         <!-- col35 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1072),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1170),  -->
                         <!--    'column_alias': 'listing__ds__extract_dayofyear'}       -->
                         <!-- col36 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1073),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1171),  -->
                         <!--    'column_alias': 'listing__created_at__day'}             -->
                         <!-- col37 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1074),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1172),  -->
                         <!--    'column_alias': 'listing__created_at__week'}            -->
                         <!-- col38 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1075),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1173),  -->
                         <!--    'column_alias': 'listing__created_at__month'}           -->
                         <!-- col39 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1076),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1174),  -->
                         <!--    'column_alias': 'listing__created_at__quarter'}         -->
                         <!-- col40 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1077),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1175),  -->
                         <!--    'column_alias': 'listing__created_at__year'}            -->
                         <!-- col41 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1078),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1176),  -->
                         <!--    'column_alias': 'listing__created_at__extract_year'}    -->
                         <!-- col42 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1079),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1177),   -->
                         <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
                         <!-- col43 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1080),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1178),  -->
                         <!--    'column_alias': 'listing__created_at__extract_month'}   -->
                         <!-- col44 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1081),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1179),  -->
                         <!--    'column_alias': 'listing__created_at__extract_week'}    -->
                         <!-- col45 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1082),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1180),  -->
                         <!--    'column_alias': 'listing__created_at__extract_day'}     -->
                         <!-- col46 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1083),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1181),     -->
                         <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
                         <!-- col47 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1084),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1182),     -->
                         <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
                         <!-- col48 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1085),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1183),  -->
                         <!--    'column_alias': 'metric_time__day'}                     -->
                         <!-- col49 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1086),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1184),  -->
                         <!--    'column_alias': 'metric_time__week'}                    -->
                         <!-- col50 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1087),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1185),  -->
                         <!--    'column_alias': 'metric_time__month'}                   -->
                         <!-- col51 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1088),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1186),  -->
                         <!--    'column_alias': 'metric_time__quarter'}                 -->
                         <!-- col52 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1089),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1187),  -->
                         <!--    'column_alias': 'metric_time__year'}                    -->
                         <!-- col53 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1090),  -->
-                        <!--    'column_alias': 'listing'}                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1188),  -->
+                        <!--    'column_alias': 'metric_time__extract_year'}            -->
                         <!-- col54 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1091),  -->
-                        <!--    'column_alias': 'user'}                                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1189),  -->
+                        <!--    'column_alias': 'metric_time__extract_quarter'}         -->
                         <!-- col55 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1092),  -->
-                        <!--    'column_alias': 'listing__user'}                        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1190),  -->
+                        <!--    'column_alias': 'metric_time__extract_month'}           -->
                         <!-- col56 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1031),  -->
-                        <!--    'column_alias': 'country_latest'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1191),  -->
+                        <!--    'column_alias': 'metric_time__extract_week'}            -->
                         <!-- col57 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1032),  -->
-                        <!--    'column_alias': 'is_lux_latest'}                        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1192),  -->
+                        <!--    'column_alias': 'metric_time__extract_day'}             -->
                         <!-- col58 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1033),  -->
-                        <!--    'column_alias': 'capacity_latest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1193),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofweek'}       -->
                         <!-- col59 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1034),  -->
-                        <!--    'column_alias': 'listing__country_latest'}              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1194),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofyear'}       -->
                         <!-- col60 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1035),  -->
-                        <!--    'column_alias': 'listing__is_lux_latest'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1195),  -->
+                        <!--    'column_alias': 'listing'}                              -->
                         <!-- col61 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1036),  -->
-                        <!--    'column_alias': 'listing__capacity_latest'}             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1196),  -->
+                        <!--    'column_alias': 'user'}                                 -->
                         <!-- col62 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1028),  -->
-                        <!--    'column_alias': 'listings'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1197),  -->
+                        <!--    'column_alias': 'listing__user'}                        -->
                         <!-- col63 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1029),  -->
-                        <!--    'column_alias': 'largest_listing'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1129),  -->
+                        <!--    'column_alias': 'country_latest'}                       -->
                         <!-- col64 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1030),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1130),  -->
+                        <!--    'column_alias': 'is_lux_latest'}                        -->
+                        <!-- col65 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1131),  -->
+                        <!--    'column_alias': 'capacity_latest'}                      -->
+                        <!-- col66 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1132),  -->
+                        <!--    'column_alias': 'listing__country_latest'}              -->
+                        <!-- col67 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1133),  -->
+                        <!--    'column_alias': 'listing__is_lux_latest'}               -->
+                        <!-- col68 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1134),  -->
+                        <!--    'column_alias': 'listing__capacity_latest'}             -->
+                        <!-- col69 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1126),  -->
+                        <!--    'column_alias': 'listings'}                             -->
+                        <!-- col70 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1127),  -->
+                        <!--    'column_alias': 'largest_listing'}                      -->
+                        <!-- col71 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1128),  -->
                         <!--    'column_alias': 'smallest_listing'}                     -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
                         <!-- where = SqlBetweenExpression(node_id=betw_3) -->
                         <SqlSelectStatementNode>
                             <!-- description = Metric Time Dimension 'ds' -->
                             <!-- node_id = ss_16 -->
-                            <!-- col0 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_971),  -->
-                            <!--    'column_alias': 'ds__day'}                             -->
-                            <!-- col1 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_972),  -->
-                            <!--    'column_alias': 'ds__week'}                            -->
-                            <!-- col2 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_973),  -->
-                            <!--    'column_alias': 'ds__month'}                           -->
-                            <!-- col3 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_974),  -->
-                            <!--    'column_alias': 'ds__quarter'}                         -->
-                            <!-- col4 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_975),  -->
-                            <!--    'column_alias': 'ds__year'}                            -->
-                            <!-- col5 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_976),  -->
-                            <!--    'column_alias': 'ds__extract_year'}                    -->
-                            <!-- col6 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_977),  -->
-                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
-                            <!-- col7 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_978),  -->
-                            <!--    'column_alias': 'ds__extract_month'}                   -->
-                            <!-- col8 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_979),  -->
-                            <!--    'column_alias': 'ds__extract_week'}                    -->
-                            <!-- col9 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_980),  -->
-                            <!--    'column_alias': 'ds__extract_day'}                     -->
-                            <!-- col10 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_981),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
-                            <!-- col11 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_982),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
-                            <!-- col12 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_983),  -->
-                            <!--    'column_alias': 'created_at__day'}                     -->
-                            <!-- col13 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_984),  -->
-                            <!--    'column_alias': 'created_at__week'}                    -->
-                            <!-- col14 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_985),  -->
-                            <!--    'column_alias': 'created_at__month'}                   -->
-                            <!-- col15 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_986),  -->
-                            <!--    'column_alias': 'created_at__quarter'}                 -->
-                            <!-- col16 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_987),  -->
-                            <!--    'column_alias': 'created_at__year'}                    -->
-                            <!-- col17 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_988),  -->
-                            <!--    'column_alias': 'created_at__extract_year'}            -->
-                            <!-- col18 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_989),  -->
-                            <!--    'column_alias': 'created_at__extract_quarter'}         -->
-                            <!-- col19 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_990),  -->
-                            <!--    'column_alias': 'created_at__extract_month'}           -->
-                            <!-- col20 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_991),  -->
-                            <!--    'column_alias': 'created_at__extract_week'}            -->
-                            <!-- col21 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_992),  -->
-                            <!--    'column_alias': 'created_at__extract_day'}             -->
-                            <!-- col22 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_993),  -->
-                            <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
-                            <!-- col23 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_994),  -->
-                            <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
-                            <!-- col24 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_995),  -->
-                            <!--    'column_alias': 'listing__ds__day'}                    -->
-                            <!-- col25 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_996),  -->
-                            <!--    'column_alias': 'listing__ds__week'}                   -->
-                            <!-- col26 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_997),  -->
-                            <!--    'column_alias': 'listing__ds__month'}                  -->
-                            <!-- col27 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_998),  -->
-                            <!--    'column_alias': 'listing__ds__quarter'}                -->
-                            <!-- col28 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_999),  -->
-                            <!--    'column_alias': 'listing__ds__year'}                   -->
+                            <!-- col0 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1062),  -->
+                            <!--    'column_alias': 'ds__day'}                              -->
+                            <!-- col1 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1063),  -->
+                            <!--    'column_alias': 'ds__week'}                             -->
+                            <!-- col2 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1064),  -->
+                            <!--    'column_alias': 'ds__month'}                            -->
+                            <!-- col3 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1065),  -->
+                            <!--    'column_alias': 'ds__quarter'}                          -->
+                            <!-- col4 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1066),  -->
+                            <!--    'column_alias': 'ds__year'}                             -->
+                            <!-- col5 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1067),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                     -->
+                            <!-- col6 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1068),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                  -->
+                            <!-- col7 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1069),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                    -->
+                            <!-- col8 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1070),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                     -->
+                            <!-- col9 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1071),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                      -->
+                            <!-- col10 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1072),  -->
+                            <!--    'column_alias': 'ds__extract_dayofweek'}                -->
+                            <!-- col11 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1073),  -->
+                            <!--    'column_alias': 'ds__extract_dayofyear'}                -->
+                            <!-- col12 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1074),  -->
+                            <!--    'column_alias': 'created_at__day'}                      -->
+                            <!-- col13 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1075),  -->
+                            <!--    'column_alias': 'created_at__week'}                     -->
+                            <!-- col14 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1076),  -->
+                            <!--    'column_alias': 'created_at__month'}                    -->
+                            <!-- col15 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1077),  -->
+                            <!--    'column_alias': 'created_at__quarter'}                  -->
+                            <!-- col16 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1078),  -->
+                            <!--    'column_alias': 'created_at__year'}                     -->
+                            <!-- col17 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1079),  -->
+                            <!--    'column_alias': 'created_at__extract_year'}             -->
+                            <!-- col18 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1080),  -->
+                            <!--    'column_alias': 'created_at__extract_quarter'}          -->
+                            <!-- col19 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1081),  -->
+                            <!--    'column_alias': 'created_at__extract_month'}            -->
+                            <!-- col20 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1082),  -->
+                            <!--    'column_alias': 'created_at__extract_week'}             -->
+                            <!-- col21 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1083),  -->
+                            <!--    'column_alias': 'created_at__extract_day'}              -->
+                            <!-- col22 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1084),  -->
+                            <!--    'column_alias': 'created_at__extract_dayofweek'}        -->
+                            <!-- col23 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1085),  -->
+                            <!--    'column_alias': 'created_at__extract_dayofyear'}        -->
+                            <!-- col24 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1086),  -->
+                            <!--    'column_alias': 'listing__ds__day'}                     -->
+                            <!-- col25 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1087),  -->
+                            <!--    'column_alias': 'listing__ds__week'}                    -->
+                            <!-- col26 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1088),  -->
+                            <!--    'column_alias': 'listing__ds__month'}                   -->
+                            <!-- col27 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1089),  -->
+                            <!--    'column_alias': 'listing__ds__quarter'}                 -->
+                            <!-- col28 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1090),  -->
+                            <!--    'column_alias': 'listing__ds__year'}                    -->
                             <!-- col29 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1000),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1091),  -->
                             <!--    'column_alias': 'listing__ds__extract_year'}            -->
                             <!-- col30 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1001),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1092),  -->
                             <!--    'column_alias': 'listing__ds__extract_quarter'}         -->
                             <!-- col31 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1002),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1093),  -->
                             <!--    'column_alias': 'listing__ds__extract_month'}           -->
                             <!-- col32 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1003),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1094),  -->
                             <!--    'column_alias': 'listing__ds__extract_week'}            -->
                             <!-- col33 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1004),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1095),  -->
                             <!--    'column_alias': 'listing__ds__extract_day'}             -->
                             <!-- col34 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1005),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1096),  -->
                             <!--    'column_alias': 'listing__ds__extract_dayofweek'}       -->
                             <!-- col35 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1006),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1097),  -->
                             <!--    'column_alias': 'listing__ds__extract_dayofyear'}       -->
                             <!-- col36 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1007),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1098),  -->
                             <!--    'column_alias': 'listing__created_at__day'}             -->
                             <!-- col37 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1008),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1099),  -->
                             <!--    'column_alias': 'listing__created_at__week'}            -->
                             <!-- col38 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1009),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1100),  -->
                             <!--    'column_alias': 'listing__created_at__month'}           -->
                             <!-- col39 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1010),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1101),  -->
                             <!--    'column_alias': 'listing__created_at__quarter'}         -->
                             <!-- col40 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1011),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1102),  -->
                             <!--    'column_alias': 'listing__created_at__year'}            -->
                             <!-- col41 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1012),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1103),  -->
                             <!--    'column_alias': 'listing__created_at__extract_year'}    -->
                             <!-- col42 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1013),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1104),   -->
                             <!--    'column_alias': 'listing__created_at__extract_quarter'}  -->
                             <!-- col43 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1014),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1105),  -->
                             <!--    'column_alias': 'listing__created_at__extract_month'}   -->
                             <!-- col44 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1015),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1106),  -->
                             <!--    'column_alias': 'listing__created_at__extract_week'}    -->
                             <!-- col45 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1016),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1107),  -->
                             <!--    'column_alias': 'listing__created_at__extract_day'}     -->
                             <!-- col46 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1017),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1108),     -->
                             <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
                             <!-- col47 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1018),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1109),     -->
                             <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
                             <!-- col48 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1019),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1110),  -->
                             <!--    'column_alias': 'metric_time__day'}                     -->
                             <!-- col49 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1020),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1111),  -->
                             <!--    'column_alias': 'metric_time__week'}                    -->
                             <!-- col50 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1021),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1112),  -->
                             <!--    'column_alias': 'metric_time__month'}                   -->
                             <!-- col51 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1022),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1113),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                 -->
                             <!-- col52 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1023),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1114),  -->
                             <!--    'column_alias': 'metric_time__year'}                    -->
                             <!-- col53 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1024),  -->
-                            <!--    'column_alias': 'listing'}                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1115),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}            -->
                             <!-- col54 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1025),  -->
-                            <!--    'column_alias': 'user'}                                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1116),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}         -->
                             <!-- col55 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1026),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1117),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}           -->
+                            <!-- col56 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1118),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}            -->
+                            <!-- col57 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1119),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}             -->
+                            <!-- col58 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1120),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}       -->
+                            <!-- col59 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1121),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}       -->
+                            <!-- col60 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1122),  -->
+                            <!--    'column_alias': 'listing'}                              -->
+                            <!-- col61 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1123),  -->
+                            <!--    'column_alias': 'user'}                                 -->
+                            <!-- col62 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1124),  -->
                             <!--    'column_alias': 'listing__user'}                        -->
-                            <!-- col56 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_965),  -->
-                            <!--    'column_alias': 'country_latest'}                      -->
-                            <!-- col57 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_966),  -->
-                            <!--    'column_alias': 'is_lux_latest'}                       -->
-                            <!-- col58 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_967),  -->
-                            <!--    'column_alias': 'capacity_latest'}                     -->
-                            <!-- col59 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_968),  -->
-                            <!--    'column_alias': 'listing__country_latest'}             -->
-                            <!-- col60 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_969),  -->
-                            <!--    'column_alias': 'listing__is_lux_latest'}              -->
-                            <!-- col61 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_970),  -->
-                            <!--    'column_alias': 'listing__capacity_latest'}            -->
-                            <!-- col62 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_962),  -->
-                            <!--    'column_alias': 'listings'}                            -->
-                            <!-- col63 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_963),  -->
-                            <!--    'column_alias': 'largest_listing'}                     -->
-                            <!-- col64 =                                                   -->
-                            <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_964),  -->
-                            <!--    'column_alias': 'smallest_listing'}                    -->
+                            <!-- col63 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1056),  -->
+                            <!--    'column_alias': 'country_latest'}                       -->
+                            <!-- col64 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1057),  -->
+                            <!--    'column_alias': 'is_lux_latest'}                        -->
+                            <!-- col65 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1058),  -->
+                            <!--    'column_alias': 'capacity_latest'}                      -->
+                            <!-- col66 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1059),  -->
+                            <!--    'column_alias': 'listing__country_latest'}              -->
+                            <!-- col67 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1060),  -->
+                            <!--    'column_alias': 'listing__is_lux_latest'}               -->
+                            <!-- col68 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1061),  -->
+                            <!--    'column_alias': 'listing__capacity_latest'}             -->
+                            <!-- col69 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1053),  -->
+                            <!--    'column_alias': 'listings'}                             -->
+                            <!-- col70 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1054),  -->
+                            <!--    'column_alias': 'largest_listing'}                      -->
+                            <!-- col71 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1055),  -->
+                            <!--    'column_alias': 'smallest_listing'}                     -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10004) -->
                             <!-- where = None -->
                             <SqlSelectStatementNode>
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml
index ebf9d2d655..dbf66e4cac 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml
@@ -4,7 +4,7 @@
         <!-- node_id = ss_26 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_944),  -->
         <!--    'column_alias': 'metric_time__day'}                    -->
         <!-- col1 =                                                                                             -->
         <!--   {'class': 'SqlSelectColumn',                                                                     -->
@@ -21,15 +21,15 @@
             <!--    'column_alias': 'metric_time__day'}                                            -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_938),  -->
             <!--    'column_alias': 'non_referred'}                        -->
             <!-- col2 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_939),  -->
             <!--    'column_alias': 'instant'}                             -->
             <!-- col3 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_940),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_16) -->
             <!-- join_0 =                                                   -->
@@ -50,7 +50,7 @@
                 <!-- node_id = ss_16 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                                              -->
                 <!--   {'class': 'SqlSelectColumn',                                                                      -->
@@ -67,11 +67,11 @@
                     <!--    'column_alias': 'metric_time__day'}                                            -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
                     <!--    'column_alias': 'ref_bookings'}                        -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                     <!-- join_0 =                                                   -->
@@ -86,11 +86,11 @@
                         <!-- node_id = ss_10 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
                         <!--    'column_alias': 'ref_bookings'}                        -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
                         <!-- where = None -->
@@ -99,7 +99,7 @@
                             <!-- node_id = ss_9 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -108,7 +108,7 @@
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                             <!-- group_by0 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- where = None -->
                             <SqlSelectStatementNode>
@@ -118,11 +118,11 @@
                                 <!-- node_id = ss_8 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                                 <!--    'column_alias': 'referred_bookings'}                   -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                                 <!-- where = None -->
@@ -131,395 +131,423 @@
                                     <!-- node_id = ss_7 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                                     <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                                     <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                                     <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                                     <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                                     <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                                     <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                                     <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                                     <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                                     <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                                     <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                                     <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                                     <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                                     <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                                     <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                                     <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                                     <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                                     <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                                     <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                                     <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                                     <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                     <!-- col53 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                     <!-- col54 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                     <!-- col55 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                     <!-- col56 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                     <!-- col57 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                     <!-- col58 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                     <!-- col59 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}               -->
                                     <!-- col61 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}              -->
                                     <!-- col62 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}             -->
                                     <!-- col63 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                     <!-- col64 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}              -->
                                     <!-- col65 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                     <!-- col66 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                     <!-- col67 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                     <!-- col68 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                     <!-- col69 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                     <!-- col70 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                     <!-- col71 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col73 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                                     <!--    'column_alias': 'metric_time__week'}                   -->
                                     <!-- col74 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                                     <!--    'column_alias': 'metric_time__month'}                  -->
                                     <!-- col75 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                                     <!--    'column_alias': 'metric_time__quarter'}                -->
                                     <!-- col76 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                                     <!--    'column_alias': 'metric_time__year'}                   -->
                                     <!-- col77 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                                     <!-- col78 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                     <!-- col79 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                    <!--    'column_alias': 'metric_time__extract_month'}          -->
                                     <!-- col80 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                    <!--    'column_alias': 'metric_time__extract_week'}           -->
                                     <!-- col81 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                    <!--    'column_alias': 'metric_time__extract_day'}            -->
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
                                     <!-- col85 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
                                     <!-- col86 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                    <!--    'column_alias': 'host'}                                -->
                                     <!-- col87 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
                                     <!-- col88 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
                                     <!-- col89 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
                                     <!-- col90 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
                                     <!-- col91 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
                                     <!-- col92 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
                                     <!-- col93 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
                                     <!-- col94 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
                                     <!-- col95 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!-- col96 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!-- col97 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col98 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!-- col99 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!-- col100 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!-- col101 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                                    <!-- col102 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                    <!-- col96 =                                                         -->
+                                    <!-- col103 =                                                        -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                    <!-- col97 =                                                       -->
+                                    <!-- col104 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
@@ -919,11 +947,11 @@
                         <!-- node_id = ss_14 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
                         <!-- where = None -->
@@ -932,7 +960,7 @@
                             <!-- node_id = ss_13 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col1 =                                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -941,7 +969,7 @@
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                             <!-- group_by0 =                                               -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- where = None -->
                             <SqlSelectStatementNode>
@@ -951,11 +979,11 @@
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
                                 <!--    'column_alias': 'metric_time__day'}                    -->
                                 <!-- col1 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
                                 <!--    'column_alias': 'bookings'}                            -->
                                 <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                                 <!-- where = None -->
@@ -964,395 +992,423 @@
                                     <!-- node_id = ss_11 -->
                                     <!-- col0 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                                     <!--    'column_alias': 'ds__day'}                             -->
                                     <!-- col1 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                                     <!--    'column_alias': 'ds__week'}                            -->
                                     <!-- col2 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                                     <!--    'column_alias': 'ds__month'}                           -->
                                     <!-- col3 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                                     <!--    'column_alias': 'ds__quarter'}                         -->
                                     <!-- col4 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                                     <!--    'column_alias': 'ds__year'}                            -->
                                     <!-- col5 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                                     <!--    'column_alias': 'ds__extract_year'}                    -->
                                     <!-- col6 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                                     <!--    'column_alias': 'ds__extract_quarter'}                 -->
                                     <!-- col7 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                                     <!--    'column_alias': 'ds__extract_month'}                   -->
                                     <!-- col8 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                                     <!--    'column_alias': 'ds__extract_week'}                    -->
                                     <!-- col9 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                                     <!--    'column_alias': 'ds__extract_day'}                     -->
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                                     <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                                     <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                                     <!--    'column_alias': 'ds_partitioned__day'}                 -->
                                     <!-- col13 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                                     <!--    'column_alias': 'ds_partitioned__week'}                -->
                                     <!-- col14 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                                     <!--    'column_alias': 'ds_partitioned__month'}               -->
                                     <!-- col15 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                                     <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                                     <!-- col16 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                                     <!--    'column_alias': 'ds_partitioned__year'}                -->
                                     <!-- col17 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                                     <!-- col18 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                                     <!-- col19 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                                     <!-- col20 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                                     <!-- col21 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                                     <!--    'column_alias': 'paid_at__day'}                        -->
                                     <!-- col25 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                                     <!--    'column_alias': 'paid_at__week'}                       -->
                                     <!-- col26 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                                     <!--    'column_alias': 'paid_at__month'}                      -->
                                     <!-- col27 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                                     <!--    'column_alias': 'paid_at__quarter'}                    -->
                                     <!-- col28 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                                     <!--    'column_alias': 'paid_at__year'}                       -->
                                     <!-- col29 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                                     <!--    'column_alias': 'paid_at__extract_year'}               -->
                                     <!-- col30 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                                     <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                                     <!-- col31 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                                     <!--    'column_alias': 'paid_at__extract_month'}              -->
                                     <!-- col32 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                                     <!--    'column_alias': 'paid_at__extract_week'}               -->
                                     <!-- col33 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                                     <!--    'column_alias': 'paid_at__extract_day'}                -->
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                                     <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                                     <!--    'column_alias': 'booking__ds__day'}                    -->
                                     <!-- col37 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                                     <!--    'column_alias': 'booking__ds__week'}                   -->
                                     <!-- col38 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                                     <!--    'column_alias': 'booking__ds__month'}                  -->
                                     <!-- col39 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                                     <!--    'column_alias': 'booking__ds__quarter'}                -->
                                     <!-- col40 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                                     <!--    'column_alias': 'booking__ds__year'}                   -->
                                     <!-- col41 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
                                     <!--    'column_alias': 'booking__ds__extract_year'}           -->
                                     <!-- col42 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
                                     <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                                     <!-- col43 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
                                     <!--    'column_alias': 'booking__ds__extract_month'}          -->
                                     <!-- col44 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
                                     <!--    'column_alias': 'booking__ds__extract_week'}           -->
                                     <!-- col45 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}            -->
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
                                     <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                                     <!-- col49 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                                     <!-- col50 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                                     <!-- col51 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                                     <!-- col52 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
                                     <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                                     <!-- col53 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                                     <!-- col54 =                                                         -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),        -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                                     <!-- col55 =                                                       -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),      -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                                     <!-- col56 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                               -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),     -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),     -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                                     <!-- col57 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                                     <!-- col58 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                                     <!-- col59 =                                                           -->
                                     <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                                     <!--    'column_alias': 'booking__paid_at__day'}               -->
                                     <!-- col61 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                                     <!--    'column_alias': 'booking__paid_at__week'}              -->
                                     <!-- col62 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                                     <!--    'column_alias': 'booking__paid_at__month'}             -->
                                     <!-- col63 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                                     <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                                     <!-- col64 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                                     <!--    'column_alias': 'booking__paid_at__year'}              -->
                                     <!-- col65 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                                     <!-- col66 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                                     <!-- col67 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                                     <!-- col68 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                                     <!-- col69 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                                     <!-- col70 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                                     <!-- col71 =                                                    -->
                                     <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
                                     <!--    'column_alias': 'metric_time__day'}                    -->
                                     <!-- col73 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
                                     <!--    'column_alias': 'metric_time__week'}                   -->
                                     <!-- col74 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
                                     <!--    'column_alias': 'metric_time__month'}                  -->
                                     <!-- col75 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
                                     <!--    'column_alias': 'metric_time__quarter'}                -->
                                     <!-- col76 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
                                     <!--    'column_alias': 'metric_time__year'}                   -->
                                     <!-- col77 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
-                                    <!--    'column_alias': 'listing'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                    <!--    'column_alias': 'metric_time__extract_year'}           -->
                                     <!-- col78 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                                    <!--    'column_alias': 'guest'}                               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                                     <!-- col79 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                                    <!--    'column_alias': 'host'}                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                                    <!--    'column_alias': 'metric_time__extract_month'}          -->
                                     <!-- col80 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
-                                    <!--    'column_alias': 'booking__listing'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                                    <!--    'column_alias': 'metric_time__extract_week'}           -->
                                     <!-- col81 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
-                                    <!--    'column_alias': 'booking__guest'}                      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                                    <!--    'column_alias': 'metric_time__extract_day'}            -->
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
-                                    <!--    'column_alias': 'booking__host'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
-                                    <!--    'column_alias': 'is_instant'}                          -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
-                                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                    <!--    'column_alias': 'listing'}                             -->
                                     <!-- col85 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
-                                    <!--    'column_alias': 'bookings'}                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                    <!--    'column_alias': 'guest'}                               -->
                                     <!-- col86 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                                    <!--    'column_alias': 'instant_bookings'}                    -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                    <!--    'column_alias': 'host'}                                -->
                                     <!-- col87 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                                    <!--    'column_alias': 'booking_value'}                       -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                    <!--    'column_alias': 'booking__listing'}                    -->
                                     <!-- col88 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
-                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                    <!--    'column_alias': 'booking__guest'}                      -->
                                     <!-- col89 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
-                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                    <!--    'column_alias': 'booking__host'}                       -->
                                     <!-- col90 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
-                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                                    <!--    'column_alias': 'is_instant'}                          -->
                                     <!-- col91 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                 -->
                                     <!-- col92 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                    <!--    'column_alias': 'bookings'}                            -->
                                     <!-- col93 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
-                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                    -->
                                     <!-- col94 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
-                                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                    <!--    'column_alias': 'booking_value'}                       -->
                                     <!-- col95 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                    <!--    'column_alias': 'max_booking_value'}                   -->
+                                    <!-- col96 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                    <!--    'column_alias': 'min_booking_value'}                   -->
+                                    <!-- col97 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                    <!--    'column_alias': 'bookers'}                             -->
+                                    <!-- col98 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                    <!--    'column_alias': 'average_booking_value'}               -->
+                                    <!-- col99 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                    <!--    'column_alias': 'referred_bookings'}                   -->
+                                    <!-- col100 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                    <!--    'column_alias': 'median_booking_value'}                -->
+                                    <!-- col101 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                                    <!-- col102 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                                     <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                                    <!-- col96 =                                                         -->
+                                    <!-- col103 =                                                        -->
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),        -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),        -->
                                     <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                                    <!-- col97 =                                                       -->
+                                    <!-- col104 =                                                      -->
                                     <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),      -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),      -->
                                     <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                                     <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                                     <!-- where = None -->
@@ -1754,11 +1810,11 @@
                 <!-- node_id = ss_20 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),  -->
                 <!--    'column_alias': 'instant'}                             -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_19) -->
                 <!-- where = None -->
@@ -1767,7 +1823,7 @@
                     <!-- node_id = ss_19 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -1776,7 +1832,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_18) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -1786,11 +1842,11 @@
                         <!-- node_id = ss_18 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
                         <!--    'column_alias': 'instant_bookings'}                    -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
                         <!-- where = None -->
@@ -1799,395 +1855,423 @@
                             <!-- node_id = ss_17 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_700),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_701),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
@@ -2587,11 +2671,11 @@
                 <!-- node_id = ss_24 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_932),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_933),  -->
                 <!--    'column_alias': 'bookings'}                            -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_23) -->
                 <!-- where = None -->
@@ -2600,7 +2684,7 @@
                     <!-- node_id = ss_23 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_931),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                                       -->
                     <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -2609,7 +2693,7 @@
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_22) -->
                     <!-- group_by0 =                                               -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_931),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- where = None -->
                     <SqlSelectStatementNode>
@@ -2619,11 +2703,11 @@
                         <!-- node_id = ss_22 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_929),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_928),  -->
                         <!--    'column_alias': 'bookings'}                            -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_21) -->
                         <!-- where = None -->
@@ -2632,395 +2716,423 @@
                             <!-- node_id = ss_21 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_845),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_851),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_852),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_853),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_857),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_858),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_859),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
                             <!--    'column_alias': 'paid_at__day'}                        -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_863),  -->
                             <!--    'column_alias': 'paid_at__week'}                       -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_864),  -->
                             <!--    'column_alias': 'paid_at__month'}                      -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_865),  -->
                             <!--    'column_alias': 'paid_at__quarter'}                    -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_866),  -->
                             <!--    'column_alias': 'paid_at__year'}                       -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_867),  -->
                             <!--    'column_alias': 'paid_at__extract_year'}               -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_868),  -->
                             <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_869),  -->
                             <!--    'column_alias': 'paid_at__extract_month'}              -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_870),  -->
                             <!--    'column_alias': 'paid_at__extract_week'}               -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),  -->
                             <!--    'column_alias': 'paid_at__extract_day'}                -->
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),  -->
                             <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),  -->
                             <!--    'column_alias': 'booking__ds__day'}                    -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_875),  -->
                             <!--    'column_alias': 'booking__ds__week'}                   -->
                             <!-- col38 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_876),  -->
                             <!--    'column_alias': 'booking__ds__month'}                  -->
                             <!-- col39 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_877),  -->
                             <!--    'column_alias': 'booking__ds__quarter'}                -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_878),  -->
                             <!--    'column_alias': 'booking__ds__year'}                   -->
                             <!-- col41 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_879),  -->
                             <!--    'column_alias': 'booking__ds__extract_year'}           -->
                             <!-- col42 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),  -->
                             <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                             <!-- col43 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_881),  -->
                             <!--    'column_alias': 'booking__ds__extract_month'}          -->
                             <!-- col44 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_882),  -->
                             <!--    'column_alias': 'booking__ds__extract_week'}           -->
                             <!-- col45 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_813),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}            -->
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_814),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),  -->
                             <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_887),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_888),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_889),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_890),  -->
                             <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                             <!-- col53 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_821),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_891),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                             <!-- col54 =                                                         -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_892),        -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                             <!-- col55 =                                                       -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_893),      -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                             <!-- col56 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_894),     -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                             <!-- col57 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_895),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                             <!-- col58 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col59 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_898),  -->
                             <!--    'column_alias': 'booking__paid_at__day'}               -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_899),  -->
                             <!--    'column_alias': 'booking__paid_at__week'}              -->
                             <!-- col62 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_900),  -->
                             <!--    'column_alias': 'booking__paid_at__month'}             -->
                             <!-- col63 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_901),  -->
                             <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                             <!-- col64 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_902),  -->
                             <!--    'column_alias': 'booking__paid_at__year'}              -->
                             <!-- col65 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_903),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                             <!-- col66 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_904),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                             <!-- col67 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_905),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                             <!-- col68 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_906),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                             <!-- col69 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_907),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                             <!-- col70 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_908),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                             <!-- col71 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_839),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_909),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_840),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_910),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_911),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col74 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_912),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col75 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_913),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col76 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_914),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col77 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_845),  -->
-                            <!--    'column_alias': 'listing'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_915),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col78 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),  -->
-                            <!--    'column_alias': 'guest'}                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_916),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col79 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),  -->
-                            <!--    'column_alias': 'host'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_917),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col80 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
-                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_918),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col81 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
-                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_919),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
-                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_920),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
-                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_921),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
-                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_922),  -->
+                            <!--    'column_alias': 'listing'}                             -->
                             <!-- col85 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
-                            <!--    'column_alias': 'bookings'}                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_923),  -->
+                            <!--    'column_alias': 'guest'}                               -->
                             <!-- col86 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
-                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_924),  -->
+                            <!--    'column_alias': 'host'}                                -->
                             <!-- col87 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
-                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_925),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
                             <!-- col88 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
-                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_926),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
                             <!-- col89 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
-                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_927),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
                             <!-- col90 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
-                            <!--    'column_alias': 'bookers'}                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
                             <!-- col91 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
-                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
                             <!-- col92 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
-                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
                             <!-- col93 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
-                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
                             <!-- col94 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
-                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
                             <!-- col95 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_827),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_828),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_833),  -->
                             <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                            <!-- col96 =                                                         -->
+                            <!-- col103 =                                                        -->
                             <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),        -->
                             <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                            <!-- col97 =                                                       -->
+                            <!-- col104 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),      -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),      -->
                             <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                             <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml
index 175032c65b..8b5700c40e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml
@@ -4,11 +4,11 @@
         <!-- node_id = ss_13 -->
         <!-- col0 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
         <!--    'column_alias': 'user__home_state'}                    -->
         <!-- col1 =                                                    -->
         <!--   {'class': 'SqlSelectColumn',                            -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
         <!--    'column_alias': 'identity_verifications'}              -->
         <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
         <!-- where = None -->
@@ -17,7 +17,7 @@
             <!-- node_id = ss_12 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
             <!--    'column_alias': 'user__home_state'}                    -->
             <!-- col1 =                                                                       -->
             <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -26,7 +26,7 @@
             <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
             <!-- group_by0 =                                               -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
             <!--    'column_alias': 'user__home_state'}                    -->
             <!-- where = None -->
             <SqlSelectStatementNode>
@@ -36,11 +36,11 @@
                 <!-- node_id = ss_11 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                 <!--    'column_alias': 'user__home_state'}                    -->
                 <!-- col1 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                 <!--    'column_alias': 'identity_verifications'}              -->
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
                 <!-- where = None -->
@@ -49,23 +49,23 @@
                     <!-- node_id = ss_10 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                     <!--    'column_alias': 'ds_partitioned__day'}                 -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                     <!--    'column_alias': 'user__ds_partitioned__day'}           -->
                     <!-- col2 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                     <!--    'column_alias': 'user'}                                -->
                     <!-- col3 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                     <!--    'column_alias': 'user__home_state'}                    -->
                     <!-- col4 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                     <!--    'column_alias': 'identity_verifications'}              -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                     <!-- join_0 =                                                  -->
@@ -82,15 +82,15 @@
                         <!-- node_id = ss_8 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
                         <!--    'column_alias': 'user'}                                -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                         <!--    'column_alias': 'identity_verifications'}              -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                         <!-- where = None -->
@@ -99,239 +99,267 @@
                             <!-- node_id = ss_7 -->
                             <!-- col0 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
                             <!--    'column_alias': 'ds__day'}                             -->
                             <!-- col1 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
                             <!--    'column_alias': 'ds__week'}                            -->
                             <!-- col2 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
                             <!--    'column_alias': 'ds__month'}                           -->
                             <!-- col3 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
                             <!--    'column_alias': 'ds__quarter'}                         -->
                             <!-- col4 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
                             <!--    'column_alias': 'ds__year'}                            -->
                             <!-- col5 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
                             <!--    'column_alias': 'ds__extract_year'}                    -->
                             <!-- col6 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
                             <!--    'column_alias': 'ds__extract_quarter'}                 -->
                             <!-- col7 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                             <!--    'column_alias': 'ds__extract_month'}                   -->
                             <!-- col8 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
                             <!--    'column_alias': 'ds__extract_week'}                    -->
                             <!-- col9 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
                             <!--    'column_alias': 'ds__extract_day'}                     -->
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
                             <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
                             <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                             <!--    'column_alias': 'ds_partitioned__day'}                 -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                             <!--    'column_alias': 'ds_partitioned__week'}                -->
                             <!-- col14 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                             <!--    'column_alias': 'ds_partitioned__month'}               -->
                             <!-- col15 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                             <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                             <!-- col16 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                             <!--    'column_alias': 'ds_partitioned__year'}                -->
                             <!-- col17 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                             <!-- col18 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                             <!-- col19 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                             <!-- col20 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                             <!-- col21 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                             <!--    'column_alias': 'verification__ds__day'}               -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                             <!--    'column_alias': 'verification__ds__week'}              -->
                             <!-- col26 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                             <!--    'column_alias': 'verification__ds__month'}             -->
                             <!-- col27 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                             <!--    'column_alias': 'verification__ds__quarter'}           -->
                             <!-- col28 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                             <!--    'column_alias': 'verification__ds__year'}              -->
                             <!-- col29 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                             <!--    'column_alias': 'verification__ds__extract_year'}      -->
                             <!-- col30 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                             <!--    'column_alias': 'verification__ds__extract_quarter'}   -->
                             <!-- col31 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                             <!--    'column_alias': 'verification__ds__extract_month'}     -->
                             <!-- col32 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                             <!--    'column_alias': 'verification__ds__extract_week'}      -->
                             <!-- col33 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                             <!--    'column_alias': 'verification__ds__extract_day'}       -->
                             <!-- col34 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
                             <!--    'column_alias': 'verification__ds__extract_dayofweek'}  -->
                             <!-- col35 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),   -->
                             <!--    'column_alias': 'verification__ds__extract_dayofyear'}  -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                             <!--    'column_alias': 'verification__ds_partitioned__day'}   -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                             <!--    'column_alias': 'verification__ds_partitioned__week'}  -->
                             <!-- col38 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),   -->
                             <!--    'column_alias': 'verification__ds_partitioned__month'}  -->
                             <!-- col39 =                                                      -->
                             <!--   {'class': 'SqlSelectColumn',                               -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),     -->
                             <!--    'column_alias': 'verification__ds_partitioned__quarter'}  -->
                             <!-- col40 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                             <!--    'column_alias': 'verification__ds_partitioned__year'}  -->
                             <!-- col41 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),          -->
                             <!--    'column_alias': 'verification__ds_partitioned__extract_year'}  -->
                             <!-- col42 =                                                              -->
                             <!--   {'class': 'SqlSelectColumn',                                       -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),             -->
                             <!--    'column_alias': 'verification__ds_partitioned__extract_quarter'}  -->
                             <!-- col43 =                                                            -->
                             <!--   {'class': 'SqlSelectColumn',                                     -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),           -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),           -->
                             <!--    'column_alias': 'verification__ds_partitioned__extract_month'}  -->
                             <!-- col44 =                                                           -->
                             <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),          -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),          -->
                             <!--    'column_alias': 'verification__ds_partitioned__extract_week'}  -->
                             <!-- col45 =                                                          -->
                             <!--   {'class': 'SqlSelectColumn',                                   -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),         -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),         -->
                             <!--    'column_alias': 'verification__ds_partitioned__extract_day'}  -->
                             <!-- col46 =                                                                -->
                             <!--   {'class': 'SqlSelectColumn',                                         -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),               -->
                             <!--    'column_alias': 'verification__ds_partitioned__extract_dayofweek'}  -->
                             <!-- col47 =                                                                -->
                             <!--   {'class': 'SqlSelectColumn',                                         -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),               -->
                             <!--    'column_alias': 'verification__ds_partitioned__extract_dayofyear'}  -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                             <!--    'column_alias': 'metric_time__day'}                    -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                             <!--    'column_alias': 'metric_time__week'}                   -->
                             <!-- col50 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                             <!--    'column_alias': 'metric_time__month'}                  -->
                             <!-- col51 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                             <!--    'column_alias': 'metric_time__quarter'}                -->
                             <!-- col52 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                             <!--    'column_alias': 'metric_time__year'}                   -->
                             <!-- col53 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
-                            <!--    'column_alias': 'verification'}                        -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
                             <!-- col54 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
-                            <!--    'column_alias': 'user'}                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                             <!-- col55 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
-                            <!--    'column_alias': 'verification__user'}                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
                             <!-- col56 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                            <!--    'column_alias': 'verification_type'}                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
                             <!-- col57 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                            <!--    'column_alias': 'verification__verification_type'}     -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
                             <!-- col58 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!-- col59 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                            <!--    'column_alias': 'verification'}                        -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                            <!--    'column_alias': 'user'}                                -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                            <!--    'column_alias': 'verification__user'}                  -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'verification_type'}                   -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'verification__verification_type'}     -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
                             <!--    'column_alias': 'identity_verifications'}              -->
                             <!-- from_source = SqlSelectStatementNode(node_id=ss_10003) -->
                             <!-- where = None -->
@@ -571,15 +599,15 @@
                         <!-- node_id = ss_9 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
                         <!--    'column_alias': 'user'}                                -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
                         <!--    'column_alias': 'home_state'}                          -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10007) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 343e8eb274..6eb1db1ad8 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -77,6 +77,13 @@ SELECT
   , subq_0.paid_at__month AS metric_time__month
   , subq_0.paid_at__quarter AS metric_time__quarter
   , subq_0.paid_at__year AS metric_time__year
+  , subq_0.paid_at__extract_year AS metric_time__extract_year
+  , subq_0.paid_at__extract_quarter AS metric_time__extract_quarter
+  , subq_0.paid_at__extract_month AS metric_time__extract_month
+  , subq_0.paid_at__extract_week AS metric_time__extract_week
+  , subq_0.paid_at__extract_day AS metric_time__extract_day
+  , subq_0.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 6e9ffdb258..25222a0a63 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -78,6 +78,13 @@ SELECT
   , DATE_TRUNC(paid_at, month) AS metric_time__month
   , DATE_TRUNC(paid_at, quarter) AS metric_time__quarter
   , DATE_TRUNC(paid_at, year) AS metric_time__year
+  , EXTRACT(YEAR FROM paid_at) AS metric_time__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS metric_time__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS metric_time__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS metric_time__extract_week
+  , EXTRACT(DAY FROM paid_at) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 1d6c177790..07a5a8e779 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -77,6 +77,13 @@ SELECT
   , subq_0.ds__month AS metric_time__month
   , subq_0.ds__quarter AS metric_time__quarter
   , subq_0.ds__year AS metric_time__year
+  , subq_0.ds__extract_year AS metric_time__extract_year
+  , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+  , subq_0.ds__extract_month AS metric_time__extract_month
+  , subq_0.ds__extract_week AS metric_time__extract_week
+  , subq_0.ds__extract_day AS metric_time__extract_day
+  , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index ac5f560577..49d41bb5d7 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -78,6 +78,13 @@ SELECT
   , DATE_TRUNC(ds, month) AS metric_time__month
   , DATE_TRUNC(ds, quarter) AS metric_time__quarter
   , DATE_TRUNC(ds, year) AS metric_time__year
+  , EXTRACT(YEAR FROM ds) AS metric_time__extract_year
+  , EXTRACT(QUARTER FROM ds) AS metric_time__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS metric_time__extract_month
+  , EXTRACT(WEEK FROM ds) AS metric_time__extract_week
+  , EXTRACT(DAY FROM ds) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
index 95a2765eec..7b4716534b 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -99,6 +99,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -321,6 +328,13 @@ FULL OUTER JOIN (
           , subq_5.paid_at__month AS metric_time__month
           , subq_5.paid_at__quarter AS metric_time__quarter
           , subq_5.paid_at__year AS metric_time__year
+          , subq_5.paid_at__extract_year AS metric_time__extract_year
+          , subq_5.paid_at__extract_quarter AS metric_time__extract_quarter
+          , subq_5.paid_at__extract_month AS metric_time__extract_month
+          , subq_5.paid_at__extract_week AS metric_time__extract_week
+          , subq_5.paid_at__extract_day AS metric_time__extract_day
+          , subq_5.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 7546e82b35..5bbf8cbab3 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -77,6 +77,13 @@ SELECT
   , subq_0.paid_at__month AS metric_time__month
   , subq_0.paid_at__quarter AS metric_time__quarter
   , subq_0.paid_at__year AS metric_time__year
+  , subq_0.paid_at__extract_year AS metric_time__extract_year
+  , subq_0.paid_at__extract_quarter AS metric_time__extract_quarter
+  , subq_0.paid_at__extract_month AS metric_time__extract_month
+  , subq_0.paid_at__extract_week AS metric_time__extract_week
+  , subq_0.paid_at__extract_day AS metric_time__extract_day
+  , subq_0.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index dd88a042dc..746c7caf59 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -78,6 +78,13 @@ SELECT
   , DATE_TRUNC('month', paid_at) AS metric_time__month
   , DATE_TRUNC('quarter', paid_at) AS metric_time__quarter
   , DATE_TRUNC('year', paid_at) AS metric_time__year
+  , EXTRACT(YEAR FROM paid_at) AS metric_time__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS metric_time__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS metric_time__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS metric_time__extract_week
+  , EXTRACT(DAY FROM paid_at) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dayofweek
+  , EXTRACT(DOY FROM paid_at) AS metric_time__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index e3908e0d03..bb677b5714 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -77,6 +77,13 @@ SELECT
   , subq_0.ds__month AS metric_time__month
   , subq_0.ds__quarter AS metric_time__quarter
   , subq_0.ds__year AS metric_time__year
+  , subq_0.ds__extract_year AS metric_time__extract_year
+  , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+  , subq_0.ds__extract_month AS metric_time__extract_month
+  , subq_0.ds__extract_week AS metric_time__extract_week
+  , subq_0.ds__extract_day AS metric_time__extract_day
+  , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index e739399f60..d67732107d 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -78,6 +78,13 @@ SELECT
   , DATE_TRUNC('month', ds) AS metric_time__month
   , DATE_TRUNC('quarter', ds) AS metric_time__quarter
   , DATE_TRUNC('year', ds) AS metric_time__year
+  , EXTRACT(YEAR FROM ds) AS metric_time__extract_year
+  , EXTRACT(QUARTER FROM ds) AS metric_time__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS metric_time__extract_month
+  , EXTRACT(WEEK FROM ds) AS metric_time__extract_week
+  , EXTRACT(DAY FROM ds) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
+  , EXTRACT(DOY FROM ds) AS metric_time__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
index 08e9c6f6fa..a7e28bf336 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -99,6 +99,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -321,6 +328,13 @@ FULL OUTER JOIN (
           , subq_5.paid_at__month AS metric_time__month
           , subq_5.paid_at__quarter AS metric_time__quarter
           , subq_5.paid_at__year AS metric_time__year
+          , subq_5.paid_at__extract_year AS metric_time__extract_year
+          , subq_5.paid_at__extract_quarter AS metric_time__extract_quarter
+          , subq_5.paid_at__extract_month AS metric_time__extract_month
+          , subq_5.paid_at__extract_week AS metric_time__extract_week
+          , subq_5.paid_at__extract_day AS metric_time__extract_day
+          , subq_5.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 4f359630e6..b9c1d34bad 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -77,6 +77,13 @@ SELECT
   , subq_0.paid_at__month AS metric_time__month
   , subq_0.paid_at__quarter AS metric_time__quarter
   , subq_0.paid_at__year AS metric_time__year
+  , subq_0.paid_at__extract_year AS metric_time__extract_year
+  , subq_0.paid_at__extract_quarter AS metric_time__extract_quarter
+  , subq_0.paid_at__extract_month AS metric_time__extract_month
+  , subq_0.paid_at__extract_week AS metric_time__extract_week
+  , subq_0.paid_at__extract_day AS metric_time__extract_day
+  , subq_0.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index ed2c8def7c..9326cd820a 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -78,6 +78,13 @@ SELECT
   , DATE_TRUNC('month', paid_at) AS metric_time__month
   , DATE_TRUNC('quarter', paid_at) AS metric_time__quarter
   , DATE_TRUNC('year', paid_at) AS metric_time__year
+  , EXTRACT(YEAR FROM paid_at) AS metric_time__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS metric_time__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS metric_time__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS metric_time__extract_week
+  , EXTRACT(DAY FROM paid_at) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 3acc2d08e5..a2a9795f0c 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -77,6 +77,13 @@ SELECT
   , subq_0.ds__month AS metric_time__month
   , subq_0.ds__quarter AS metric_time__quarter
   , subq_0.ds__year AS metric_time__year
+  , subq_0.ds__extract_year AS metric_time__extract_year
+  , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+  , subq_0.ds__extract_month AS metric_time__extract_month
+  , subq_0.ds__extract_week AS metric_time__extract_week
+  , subq_0.ds__extract_day AS metric_time__extract_day
+  , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 541c754a5a..30a42573dd 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -78,6 +78,13 @@ SELECT
   , DATE_TRUNC('month', ds) AS metric_time__month
   , DATE_TRUNC('quarter', ds) AS metric_time__quarter
   , DATE_TRUNC('year', ds) AS metric_time__year
+  , EXTRACT(YEAR FROM ds) AS metric_time__extract_year
+  , EXTRACT(QUARTER FROM ds) AS metric_time__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS metric_time__extract_month
+  , EXTRACT(WEEK FROM ds) AS metric_time__extract_week
+  , EXTRACT(DAY FROM ds) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
index 9a64eefccb..4b399298d5 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -99,6 +99,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -321,6 +328,13 @@ FULL OUTER JOIN (
           , subq_5.paid_at__month AS metric_time__month
           , subq_5.paid_at__quarter AS metric_time__quarter
           , subq_5.paid_at__year AS metric_time__year
+          , subq_5.paid_at__extract_year AS metric_time__extract_year
+          , subq_5.paid_at__extract_quarter AS metric_time__extract_quarter
+          , subq_5.paid_at__extract_month AS metric_time__extract_month
+          , subq_5.paid_at__extract_week AS metric_time__extract_week
+          , subq_5.paid_at__extract_day AS metric_time__extract_day
+          , subq_5.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 4f359630e6..b9c1d34bad 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -77,6 +77,13 @@ SELECT
   , subq_0.paid_at__month AS metric_time__month
   , subq_0.paid_at__quarter AS metric_time__quarter
   , subq_0.paid_at__year AS metric_time__year
+  , subq_0.paid_at__extract_year AS metric_time__extract_year
+  , subq_0.paid_at__extract_quarter AS metric_time__extract_quarter
+  , subq_0.paid_at__extract_month AS metric_time__extract_month
+  , subq_0.paid_at__extract_week AS metric_time__extract_week
+  , subq_0.paid_at__extract_day AS metric_time__extract_day
+  , subq_0.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index ed2c8def7c..9326cd820a 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -78,6 +78,13 @@ SELECT
   , DATE_TRUNC('month', paid_at) AS metric_time__month
   , DATE_TRUNC('quarter', paid_at) AS metric_time__quarter
   , DATE_TRUNC('year', paid_at) AS metric_time__year
+  , EXTRACT(YEAR FROM paid_at) AS metric_time__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS metric_time__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS metric_time__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS metric_time__extract_week
+  , EXTRACT(DAY FROM paid_at) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 3acc2d08e5..a2a9795f0c 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -77,6 +77,13 @@ SELECT
   , subq_0.ds__month AS metric_time__month
   , subq_0.ds__quarter AS metric_time__quarter
   , subq_0.ds__year AS metric_time__year
+  , subq_0.ds__extract_year AS metric_time__extract_year
+  , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+  , subq_0.ds__extract_month AS metric_time__extract_month
+  , subq_0.ds__extract_week AS metric_time__extract_week
+  , subq_0.ds__extract_day AS metric_time__extract_day
+  , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 541c754a5a..30a42573dd 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -78,6 +78,13 @@ SELECT
   , DATE_TRUNC('month', ds) AS metric_time__month
   , DATE_TRUNC('quarter', ds) AS metric_time__quarter
   , DATE_TRUNC('year', ds) AS metric_time__year
+  , EXTRACT(YEAR FROM ds) AS metric_time__extract_year
+  , EXTRACT(QUARTER FROM ds) AS metric_time__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS metric_time__extract_month
+  , EXTRACT(WEEK FROM ds) AS metric_time__extract_week
+  , EXTRACT(DAY FROM ds) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
index 9a64eefccb..4b399298d5 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -99,6 +99,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -321,6 +328,13 @@ FULL OUTER JOIN (
           , subq_5.paid_at__month AS metric_time__month
           , subq_5.paid_at__quarter AS metric_time__quarter
           , subq_5.paid_at__year AS metric_time__year
+          , subq_5.paid_at__extract_year AS metric_time__extract_year
+          , subq_5.paid_at__extract_quarter AS metric_time__extract_quarter
+          , subq_5.paid_at__extract_month AS metric_time__extract_month
+          , subq_5.paid_at__extract_week AS metric_time__extract_week
+          , subq_5.paid_at__extract_day AS metric_time__extract_day
+          , subq_5.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 4f359630e6..b9c1d34bad 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -77,6 +77,13 @@ SELECT
   , subq_0.paid_at__month AS metric_time__month
   , subq_0.paid_at__quarter AS metric_time__quarter
   , subq_0.paid_at__year AS metric_time__year
+  , subq_0.paid_at__extract_year AS metric_time__extract_year
+  , subq_0.paid_at__extract_quarter AS metric_time__extract_quarter
+  , subq_0.paid_at__extract_month AS metric_time__extract_month
+  , subq_0.paid_at__extract_week AS metric_time__extract_week
+  , subq_0.paid_at__extract_day AS metric_time__extract_day
+  , subq_0.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index ed2c8def7c..9326cd820a 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -78,6 +78,13 @@ SELECT
   , DATE_TRUNC('month', paid_at) AS metric_time__month
   , DATE_TRUNC('quarter', paid_at) AS metric_time__quarter
   , DATE_TRUNC('year', paid_at) AS metric_time__year
+  , EXTRACT(YEAR FROM paid_at) AS metric_time__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS metric_time__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS metric_time__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS metric_time__extract_week
+  , EXTRACT(DAY FROM paid_at) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 3acc2d08e5..a2a9795f0c 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -77,6 +77,13 @@ SELECT
   , subq_0.ds__month AS metric_time__month
   , subq_0.ds__quarter AS metric_time__quarter
   , subq_0.ds__year AS metric_time__year
+  , subq_0.ds__extract_year AS metric_time__extract_year
+  , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+  , subq_0.ds__extract_month AS metric_time__extract_month
+  , subq_0.ds__extract_week AS metric_time__extract_week
+  , subq_0.ds__extract_day AS metric_time__extract_day
+  , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 541c754a5a..30a42573dd 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -78,6 +78,13 @@ SELECT
   , DATE_TRUNC('month', ds) AS metric_time__month
   , DATE_TRUNC('quarter', ds) AS metric_time__quarter
   , DATE_TRUNC('year', ds) AS metric_time__year
+  , EXTRACT(YEAR FROM ds) AS metric_time__extract_year
+  , EXTRACT(QUARTER FROM ds) AS metric_time__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS metric_time__extract_month
+  , EXTRACT(WEEK FROM ds) AS metric_time__extract_week
+  , EXTRACT(DAY FROM ds) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
index 9a64eefccb..4b399298d5 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -99,6 +99,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -321,6 +328,13 @@ FULL OUTER JOIN (
           , subq_5.paid_at__month AS metric_time__month
           , subq_5.paid_at__quarter AS metric_time__quarter
           , subq_5.paid_at__year AS metric_time__year
+          , subq_5.paid_at__extract_year AS metric_time__extract_year
+          , subq_5.paid_at__extract_quarter AS metric_time__extract_quarter
+          , subq_5.paid_at__extract_month AS metric_time__extract_month
+          , subq_5.paid_at__extract_week AS metric_time__extract_week
+          , subq_5.paid_at__extract_day AS metric_time__extract_day
+          , subq_5.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 4f359630e6..b9c1d34bad 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -77,6 +77,13 @@ SELECT
   , subq_0.paid_at__month AS metric_time__month
   , subq_0.paid_at__quarter AS metric_time__quarter
   , subq_0.paid_at__year AS metric_time__year
+  , subq_0.paid_at__extract_year AS metric_time__extract_year
+  , subq_0.paid_at__extract_quarter AS metric_time__extract_quarter
+  , subq_0.paid_at__extract_month AS metric_time__extract_month
+  , subq_0.paid_at__extract_week AS metric_time__extract_week
+  , subq_0.paid_at__extract_day AS metric_time__extract_day
+  , subq_0.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
+  , subq_0.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index ed2c8def7c..9326cd820a 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -78,6 +78,13 @@ SELECT
   , DATE_TRUNC('month', paid_at) AS metric_time__month
   , DATE_TRUNC('quarter', paid_at) AS metric_time__quarter
   , DATE_TRUNC('year', paid_at) AS metric_time__year
+  , EXTRACT(YEAR FROM paid_at) AS metric_time__extract_year
+  , EXTRACT(QUARTER FROM paid_at) AS metric_time__extract_quarter
+  , EXTRACT(MONTH FROM paid_at) AS metric_time__extract_month
+  , EXTRACT(WEEK FROM paid_at) AS metric_time__extract_week
+  , EXTRACT(DAY FROM paid_at) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 3acc2d08e5..a2a9795f0c 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -77,6 +77,13 @@ SELECT
   , subq_0.ds__month AS metric_time__month
   , subq_0.ds__quarter AS metric_time__quarter
   , subq_0.ds__year AS metric_time__year
+  , subq_0.ds__extract_year AS metric_time__extract_year
+  , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+  , subq_0.ds__extract_month AS metric_time__extract_month
+  , subq_0.ds__extract_week AS metric_time__extract_week
+  , subq_0.ds__extract_day AS metric_time__extract_day
+  , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+  , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 541c754a5a..30a42573dd 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -78,6 +78,13 @@ SELECT
   , DATE_TRUNC('month', ds) AS metric_time__month
   , DATE_TRUNC('quarter', ds) AS metric_time__quarter
   , DATE_TRUNC('year', ds) AS metric_time__year
+  , EXTRACT(YEAR FROM ds) AS metric_time__extract_year
+  , EXTRACT(QUARTER FROM ds) AS metric_time__extract_quarter
+  , EXTRACT(MONTH FROM ds) AS metric_time__extract_month
+  , EXTRACT(WEEK FROM ds) AS metric_time__extract_week
+  , EXTRACT(DAY FROM ds) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
+  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_dayofyear
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
index 9a64eefccb..4b399298d5 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -99,6 +99,13 @@ FROM (
           , subq_0.ds__month AS metric_time__month
           , subq_0.ds__quarter AS metric_time__quarter
           , subq_0.ds__year AS metric_time__year
+          , subq_0.ds__extract_year AS metric_time__extract_year
+          , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+          , subq_0.ds__extract_month AS metric_time__extract_month
+          , subq_0.ds__extract_week AS metric_time__extract_week
+          , subq_0.ds__extract_day AS metric_time__extract_day
+          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -321,6 +328,13 @@ FULL OUTER JOIN (
           , subq_5.paid_at__month AS metric_time__month
           , subq_5.paid_at__quarter AS metric_time__quarter
           , subq_5.paid_at__year AS metric_time__year
+          , subq_5.paid_at__extract_year AS metric_time__extract_year
+          , subq_5.paid_at__extract_quarter AS metric_time__extract_quarter
+          , subq_5.paid_at__extract_month AS metric_time__extract_month
+          , subq_5.paid_at__extract_week AS metric_time__extract_week
+          , subq_5.paid_at__extract_day AS metric_time__extract_day
+          , subq_5.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
+          , subq_5.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
index c9e54613ef..b7325320f3 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
@@ -313,36 +313,64 @@
         <!-- col77 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_80),  -->
-        <!--    'column_alias': 'listing'}                            -->
+        <!--    'column_alias': 'metric_time__extract_year'}          -->
         <!-- col78 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_81),  -->
-        <!--    'column_alias': 'guest'}                              -->
+        <!--    'column_alias': 'metric_time__extract_quarter'}       -->
         <!-- col79 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_82),  -->
-        <!--    'column_alias': 'host'}                               -->
+        <!--    'column_alias': 'metric_time__extract_month'}         -->
         <!-- col80 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_83),  -->
-        <!--    'column_alias': 'booking__listing'}                   -->
+        <!--    'column_alias': 'metric_time__extract_week'}          -->
         <!-- col81 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_84),  -->
-        <!--    'column_alias': 'booking__guest'}                     -->
+        <!--    'column_alias': 'metric_time__extract_day'}           -->
         <!-- col82 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),  -->
+        <!--    'column_alias': 'metric_time__extract_dayofweek'}     -->
+        <!-- col83 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),  -->
+        <!--    'column_alias': 'metric_time__extract_dayofyear'}     -->
+        <!-- col84 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_87),  -->
+        <!--    'column_alias': 'listing'}                            -->
+        <!-- col85 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_88),  -->
+        <!--    'column_alias': 'guest'}                              -->
+        <!-- col86 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_89),  -->
+        <!--    'column_alias': 'host'}                               -->
+        <!-- col87 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_90),  -->
+        <!--    'column_alias': 'booking__listing'}                   -->
+        <!-- col88 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_91),  -->
+        <!--    'column_alias': 'booking__guest'}                     -->
+        <!-- col89 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_92),  -->
         <!--    'column_alias': 'booking__host'}                      -->
-        <!-- col83 =                                                 -->
+        <!-- col90 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1),  -->
         <!--    'column_alias': 'is_instant'}                        -->
-        <!-- col84 =                                                 -->
+        <!-- col91 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_2),  -->
         <!--    'column_alias': 'booking__is_instant'}               -->
-        <!-- col85 =                                                 -->
+        <!-- col92 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_0),  -->
         <!--    'column_alias': 'booking_payments'}                  -->
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
index e540f55e93..bedd5ead3d 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
@@ -313,84 +313,112 @@
         <!-- col77 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_92),  -->
-        <!--    'column_alias': 'listing'}                            -->
+        <!--    'column_alias': 'metric_time__extract_year'}          -->
         <!-- col78 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_93),  -->
-        <!--    'column_alias': 'guest'}                              -->
+        <!--    'column_alias': 'metric_time__extract_quarter'}       -->
         <!-- col79 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_94),  -->
-        <!--    'column_alias': 'host'}                               -->
+        <!--    'column_alias': 'metric_time__extract_month'}         -->
         <!-- col80 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_95),  -->
-        <!--    'column_alias': 'booking__listing'}                   -->
+        <!--    'column_alias': 'metric_time__extract_week'}          -->
         <!-- col81 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_96),  -->
-        <!--    'column_alias': 'booking__guest'}                     -->
+        <!--    'column_alias': 'metric_time__extract_day'}           -->
         <!-- col82 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
-        <!--    'column_alias': 'booking__host'}                      -->
+        <!--    'column_alias': 'metric_time__extract_dayofweek'}     -->
         <!-- col83 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
+        <!--    'column_alias': 'metric_time__extract_dayofyear'}     -->
+        <!-- col84 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
+        <!--    'column_alias': 'listing'}                            -->
+        <!-- col85 =                                                   -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_100),  -->
+        <!--    'column_alias': 'guest'}                               -->
+        <!-- col86 =                                                   -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_101),  -->
+        <!--    'column_alias': 'host'}                                -->
+        <!-- col87 =                                                   -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_102),  -->
+        <!--    'column_alias': 'booking__listing'}                    -->
+        <!-- col88 =                                                   -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_103),  -->
+        <!--    'column_alias': 'booking__guest'}                      -->
+        <!-- col89 =                                                   -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_104),  -->
+        <!--    'column_alias': 'booking__host'}                       -->
+        <!-- col90 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_13),  -->
         <!--    'column_alias': 'is_instant'}                         -->
-        <!-- col84 =                                                  -->
+        <!-- col91 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_14),  -->
         <!--    'column_alias': 'booking__is_instant'}                -->
-        <!-- col85 =                                                 -->
+        <!-- col92 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_0),  -->
         <!--    'column_alias': 'bookings'}                          -->
-        <!-- col86 =                                                 -->
+        <!-- col93 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1),  -->
         <!--    'column_alias': 'instant_bookings'}                  -->
-        <!-- col87 =                                                 -->
+        <!-- col94 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_2),  -->
         <!--    'column_alias': 'booking_value'}                     -->
-        <!-- col88 =                                                 -->
+        <!-- col95 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_3),  -->
         <!--    'column_alias': 'max_booking_value'}                 -->
-        <!-- col89 =                                                 -->
+        <!-- col96 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_4),  -->
         <!--    'column_alias': 'min_booking_value'}                 -->
-        <!-- col90 =                                                 -->
+        <!-- col97 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_5),  -->
         <!--    'column_alias': 'bookers'}                           -->
-        <!-- col91 =                                                 -->
+        <!-- col98 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_6),  -->
         <!--    'column_alias': 'average_booking_value'}             -->
-        <!-- col92 =                                                 -->
+        <!-- col99 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_7),  -->
         <!--    'column_alias': 'referred_bookings'}                 -->
-        <!-- col93 =                                                 -->
+        <!-- col100 =                                                -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_8),  -->
         <!--    'column_alias': 'median_booking_value'}              -->
-        <!-- col94 =                                                 -->
+        <!-- col101 =                                                -->
         <!--   {'class': 'SqlSelectColumn',                          -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_9),  -->
         <!--    'column_alias': 'booking_value_p99'}                 -->
-        <!-- col95 =                                                  -->
+        <!-- col102 =                                                 -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10),  -->
         <!--    'column_alias': 'discrete_booking_value_p99'}         -->
-        <!-- col96 =                                                         -->
+        <!-- col103 =                                                        -->
         <!--   {'class': 'SqlSelectColumn',                                  -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_11),         -->
         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-        <!-- col97 =                                                       -->
+        <!-- col104 =                                                      -->
         <!--   {'class': 'SqlSelectColumn',                                -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_12),       -->
         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
index 14997b6627..be05efe8ce 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
@@ -31,11 +31,11 @@
             <!-- node_id = ss_10 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
             <!--    'column_alias': 'bookings'}                            -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
             <!-- where = None -->
@@ -44,7 +44,7 @@
                 <!-- node_id = ss_9 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -53,7 +53,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -63,11 +63,11 @@
                     <!-- node_id = ss_8 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
                     <!--    'column_alias': 'bookings'}                            -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
                     <!-- where = None -->
@@ -76,395 +76,423 @@
                         <!-- node_id = ss_7 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_449),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_450),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_451),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_452),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_453),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_454),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
                         <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
                         <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
                         <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
                         <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_458),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
                         <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_459),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
                         <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_460),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
                         <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_461),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_462),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
                         <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_463),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
                         <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_464),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
                         <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_465),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
                         <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_466),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_467),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_468),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_469),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_470),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_471),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_472),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_473),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
                         <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_474),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
                         <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_475),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
                         <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_476),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
                         <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_477),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
                         <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_478),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
                         <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_479),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
                         <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_480),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
                         <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_481),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
                         <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_482),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
                         <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
                         <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
                         <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
                         <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                         <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
                         <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
                         <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
                         <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
                         <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
                         <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
                         <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                         <!-- col50 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                         <!-- col51 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                         <!-- col52 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                         <!-- col53 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                         <!-- col54 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                         <!-- col55 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                         <!-- col56 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                         <!-- col57 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                         <!-- col58 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                         <!-- col59 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                         <!-- col60 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
                         <!--    'column_alias': 'booking__paid_at__day'}               -->
                         <!-- col61 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
                         <!--    'column_alias': 'booking__paid_at__week'}              -->
                         <!-- col62 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
                         <!--    'column_alias': 'booking__paid_at__month'}             -->
                         <!-- col63 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
                         <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                         <!-- col64 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
                         <!--    'column_alias': 'booking__paid_at__year'}              -->
                         <!-- col65 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                         <!-- col66 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                         <!-- col67 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                         <!-- col68 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                         <!-- col69 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                         <!-- col70 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                         <!-- col71 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                         <!-- col72 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col73 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
                         <!--    'column_alias': 'metric_time__week'}                   -->
                         <!-- col74 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
                         <!--    'column_alias': 'metric_time__month'}                  -->
                         <!-- col75 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
                         <!--    'column_alias': 'metric_time__quarter'}                -->
                         <!-- col76 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
                         <!--    'column_alias': 'metric_time__year'}                   -->
                         <!-- col77 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                        <!--    'column_alias': 'listing'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                        <!--    'column_alias': 'metric_time__extract_year'}           -->
                         <!-- col78 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                        <!--    'column_alias': 'guest'}                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                        <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                         <!-- col79 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
-                        <!--    'column_alias': 'host'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                        <!--    'column_alias': 'metric_time__extract_month'}          -->
                         <!-- col80 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                        <!--    'column_alias': 'metric_time__extract_week'}           -->
                         <!-- col81 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                        <!--    'column_alias': 'metric_time__extract_day'}            -->
                         <!-- col82 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                         <!-- col83 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_447),  -->
-                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                         <!-- col84 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_448),  -->
-                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                        <!--    'column_alias': 'listing'}                             -->
                         <!-- col85 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_434),  -->
-                        <!--    'column_alias': 'bookings'}                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                        <!--    'column_alias': 'guest'}                               -->
                         <!-- col86 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_435),  -->
-                        <!--    'column_alias': 'instant_bookings'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                        <!--    'column_alias': 'host'}                                -->
                         <!-- col87 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_436),  -->
-                        <!--    'column_alias': 'booking_value'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
                         <!-- col88 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_437),  -->
-                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
                         <!-- col89 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_438),  -->
-                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
                         <!-- col90 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_439),  -->
-                        <!--    'column_alias': 'bookers'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                        <!--    'column_alias': 'is_instant'}                          -->
                         <!-- col91 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_440),  -->
-                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                 -->
                         <!-- col92 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_441),  -->
-                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                        <!--    'column_alias': 'bookings'}                            -->
                         <!-- col93 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_442),  -->
-                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                        <!--    'column_alias': 'instant_bookings'}                    -->
                         <!-- col94 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),  -->
-                        <!--    'column_alias': 'booking_value_p99'}                   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                        <!--    'column_alias': 'booking_value'}                       -->
                         <!-- col95 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                        <!--    'column_alias': 'max_booking_value'}                   -->
+                        <!-- col96 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                        <!--    'column_alias': 'min_booking_value'}                   -->
+                        <!-- col97 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                        <!--    'column_alias': 'bookers'}                             -->
+                        <!-- col98 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                        <!--    'column_alias': 'average_booking_value'}               -->
+                        <!-- col99 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                        <!--    'column_alias': 'referred_bookings'}                   -->
+                        <!-- col100 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                        <!--    'column_alias': 'median_booking_value'}                -->
+                        <!-- col101 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                        <!--    'column_alias': 'booking_value_p99'}                   -->
+                        <!-- col102 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
                         <!--    'column_alias': 'discrete_booking_value_p99'}          -->
-                        <!-- col96 =                                                         -->
+                        <!-- col103 =                                                        -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
                         <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
-                        <!-- col97 =                                                       -->
+                        <!-- col104 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
                         <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
@@ -864,11 +892,11 @@
             <!-- node_id = ss_14 -->
             <!-- col0 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
             <!--    'column_alias': 'metric_time__day'}                    -->
             <!-- col1 =                                                    -->
             <!--   {'class': 'SqlSelectColumn',                            -->
-            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
             <!--    'column_alias': 'booking_payments'}                    -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
             <!-- where = None -->
@@ -877,7 +905,7 @@
                 <!-- node_id = ss_13 -->
                 <!-- col0 =                                                    -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- col1 =                                                                       -->
                 <!--   {'class': 'SqlSelectColumn',                                               -->
@@ -886,7 +914,7 @@
                 <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
                 <!-- group_by0 =                                               -->
                 <!--   {'class': 'SqlSelectColumn',                            -->
-                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
                 <!--    'column_alias': 'metric_time__day'}                    -->
                 <!-- where = None -->
                 <SqlSelectStatementNode>
@@ -896,11 +924,11 @@
                     <!-- node_id = ss_12 -->
                     <!-- col0 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
                     <!--    'column_alias': 'metric_time__day'}                    -->
                     <!-- col1 =                                                    -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
                     <!--    'column_alias': 'booking_payments'}                    -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_11) -->
                     <!-- where = None -->
@@ -909,347 +937,375 @@
                         <!-- node_id = ss_11 -->
                         <!-- col0 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
                         <!--    'column_alias': 'ds__day'}                             -->
                         <!-- col1 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
                         <!--    'column_alias': 'ds__week'}                            -->
                         <!-- col2 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
                         <!--    'column_alias': 'ds__month'}                           -->
                         <!-- col3 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
                         <!--    'column_alias': 'ds__quarter'}                         -->
                         <!-- col4 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
                         <!--    'column_alias': 'ds__year'}                            -->
                         <!-- col5 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
                         <!--    'column_alias': 'ds__extract_year'}                    -->
                         <!-- col6 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
                         <!--    'column_alias': 'ds__extract_quarter'}                 -->
                         <!-- col7 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
                         <!--    'column_alias': 'ds__extract_month'}                   -->
                         <!-- col8 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
                         <!--    'column_alias': 'ds__extract_week'}                    -->
                         <!-- col9 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
                         <!--    'column_alias': 'ds__extract_day'}                     -->
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
                         <!--    'column_alias': 'ds__extract_dayofweek'}               -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
                         <!--    'column_alias': 'ds__extract_dayofyear'}               -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
                         <!--    'column_alias': 'ds_partitioned__day'}                 -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
                         <!--    'column_alias': 'ds_partitioned__week'}                -->
                         <!-- col14 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
                         <!--    'column_alias': 'ds_partitioned__month'}               -->
                         <!-- col15 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
                         <!--    'column_alias': 'ds_partitioned__quarter'}             -->
                         <!-- col16 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
                         <!--    'column_alias': 'ds_partitioned__year'}                -->
                         <!-- col17 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
                         <!-- col18 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
                         <!-- col19 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
                         <!-- col20 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
                         <!-- col21 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
                         <!--    'column_alias': 'paid_at__day'}                        -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
                         <!--    'column_alias': 'paid_at__week'}                       -->
                         <!-- col26 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
                         <!--    'column_alias': 'paid_at__month'}                      -->
                         <!-- col27 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
                         <!--    'column_alias': 'paid_at__quarter'}                    -->
                         <!-- col28 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
                         <!--    'column_alias': 'paid_at__year'}                       -->
                         <!-- col29 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
                         <!--    'column_alias': 'paid_at__extract_year'}               -->
                         <!-- col30 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
                         <!--    'column_alias': 'paid_at__extract_quarter'}            -->
                         <!-- col31 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
                         <!--    'column_alias': 'paid_at__extract_month'}              -->
                         <!-- col32 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
                         <!--    'column_alias': 'paid_at__extract_week'}               -->
                         <!-- col33 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
                         <!--    'column_alias': 'paid_at__extract_day'}                -->
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
                         <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
                         <!--    'column_alias': 'booking__ds__day'}                    -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
                         <!--    'column_alias': 'booking__ds__week'}                   -->
                         <!-- col38 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
                         <!--    'column_alias': 'booking__ds__month'}                  -->
                         <!-- col39 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
                         <!--    'column_alias': 'booking__ds__quarter'}                -->
                         <!-- col40 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
                         <!--    'column_alias': 'booking__ds__year'}                   -->
                         <!-- col41 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
                         <!--    'column_alias': 'booking__ds__extract_year'}           -->
                         <!-- col42 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
                         <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
                         <!-- col43 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
                         <!--    'column_alias': 'booking__ds__extract_month'}          -->
                         <!-- col44 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
                         <!--    'column_alias': 'booking__ds__extract_week'}           -->
                         <!-- col45 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
                         <!--    'column_alias': 'booking__ds__extract_day'}            -->
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                         <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
                         <!-- col50 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
                         <!-- col51 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
                         <!-- col52 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
                         <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
                         <!-- col53 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
                         <!-- col54 =                                                         -->
                         <!--   {'class': 'SqlSelectColumn',                                  -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),        -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),        -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
                         <!-- col55 =                                                       -->
                         <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),      -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
                         <!-- col56 =                                                      -->
                         <!--   {'class': 'SqlSelectColumn',                               -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),     -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
                         <!-- col57 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
                         <!-- col58 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
                         <!-- col59 =                                                           -->
                         <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
                         <!-- col60 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
                         <!--    'column_alias': 'booking__paid_at__day'}               -->
                         <!-- col61 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
                         <!--    'column_alias': 'booking__paid_at__week'}              -->
                         <!-- col62 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
                         <!--    'column_alias': 'booking__paid_at__month'}             -->
                         <!-- col63 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
                         <!--    'column_alias': 'booking__paid_at__quarter'}           -->
                         <!-- col64 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
                         <!--    'column_alias': 'booking__paid_at__year'}              -->
                         <!-- col65 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
                         <!-- col66 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
                         <!-- col67 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
                         <!-- col68 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
                         <!-- col69 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
                         <!-- col70 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
                         <!-- col71 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),   -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
                         <!-- col72 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
                         <!--    'column_alias': 'metric_time__day'}                    -->
                         <!-- col73 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
                         <!--    'column_alias': 'metric_time__week'}                   -->
                         <!-- col74 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
                         <!--    'column_alias': 'metric_time__month'}                  -->
                         <!-- col75 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
                         <!--    'column_alias': 'metric_time__quarter'}                -->
                         <!-- col76 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
                         <!--    'column_alias': 'metric_time__year'}                   -->
                         <!-- col77 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
-                        <!--    'column_alias': 'listing'}                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                        <!--    'column_alias': 'metric_time__extract_year'}           -->
                         <!-- col78 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
-                        <!--    'column_alias': 'guest'}                               -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                        <!--    'column_alias': 'metric_time__extract_quarter'}        -->
                         <!-- col79 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
-                        <!--    'column_alias': 'host'}                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                        <!--    'column_alias': 'metric_time__extract_month'}          -->
                         <!-- col80 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
-                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                        <!--    'column_alias': 'metric_time__extract_week'}           -->
                         <!-- col81 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
-                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                        <!--    'column_alias': 'metric_time__extract_day'}            -->
                         <!-- col82 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
-                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
                         <!-- col83 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
-                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
                         <!-- col84 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
-                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                        <!--    'column_alias': 'listing'}                             -->
                         <!-- col85 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                        <!--    'column_alias': 'guest'}                               -->
+                        <!-- col86 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                        <!--    'column_alias': 'host'}                                -->
+                        <!-- col87 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                        <!--    'column_alias': 'booking__listing'}                    -->
+                        <!-- col88 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                        <!--    'column_alias': 'booking__guest'}                      -->
+                        <!-- col89 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                        <!--    'column_alias': 'booking__host'}                       -->
+                        <!-- col90 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                        <!--    'column_alias': 'is_instant'}                          -->
+                        <!-- col91 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                 -->
+                        <!-- col92 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
                         <!--    'column_alias': 'booking_payments'}                    -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
                         <!-- where = None -->
diff --git a/metricflow/test/snapshots/test_node_data_set.py/list/test_joined_node_data_set__result0.txt b/metricflow/test/snapshots/test_node_data_set.py/list/test_joined_node_data_set__result0.txt
index 08f466a809..11a7d2fd95 100644
--- a/metricflow/test/snapshots/test_node_data_set.py/list/test_joined_node_data_set__result0.txt
+++ b/metricflow/test/snapshots/test_node_data_set.py/list/test_joined_node_data_set__result0.txt
@@ -1,10 +1,24 @@
 ['company__ds__day',
+ 'company__ds__day',
+ 'company__ds__day',
+ 'company__ds__day',
+ 'company__ds__day',
+ 'company__ds__day',
+ 'company__ds__day',
+ 'company__ds__day',
  'company__ds__month',
  'company__ds__quarter',
  'company__ds__week',
  'company__ds__year',
  'company__user',
  'ds__day',
+ 'ds__day',
+ 'ds__day',
+ 'ds__day',
+ 'ds__day',
+ 'ds__day',
+ 'ds__day',
+ 'ds__day',
  'ds__month',
  'ds__quarter',
  'ds__week',
@@ -12,6 +26,13 @@
  'txn_revenue',
  'user',
  'user__ds__day',
+ 'user__ds__day',
+ 'user__ds__day',
+ 'user__ds__day',
+ 'user__ds__day',
+ 'user__ds__day',
+ 'user__ds__day',
+ 'user__ds__day',
  'user__ds__month',
  'user__ds__quarter',
  'user__ds__week',
diff --git a/metricflow/time/time_granularity.py b/metricflow/time/time_granularity.py
index c96909d375..a08beb2431 100644
--- a/metricflow/time/time_granularity.py
+++ b/metricflow/time/time_granularity.py
@@ -36,7 +36,7 @@ def is_period_start(time_granularity: TimeGranularity, date: Union[pd.Timestamp,
     if time_granularity is TimeGranularity.DAY:
         return True
     elif time_granularity is TimeGranularity.WEEK:
-        return ISODAYOFWEEK.from_pandas_timestamp(pd_date).is_week_start
+        return ISOWeekDay.from_pandas_timestamp(pd_date).is_week_start
     elif time_granularity is TimeGranularity.MONTH:
         return pd_date.is_month_start
     elif time_granularity is TimeGranularity.QUARTER:
@@ -53,7 +53,7 @@ def is_period_end(time_granularity: TimeGranularity, date: Union[pd.Timestamp, d
     if time_granularity is TimeGranularity.DAY:
         return True
     elif time_granularity is TimeGranularity.WEEK:
-        return ISODAYOFWEEK.from_pandas_timestamp(pd_date).is_week_end
+        return ISOWeekDay.from_pandas_timestamp(pd_date).is_week_end
     elif time_granularity is TimeGranularity.MONTH:
         return pd_date.is_month_end
     elif time_granularity is TimeGranularity.QUARTER:
@@ -70,7 +70,7 @@ def period_begin_offset(  # noqa: D
     if time_granularity is TimeGranularity.DAY:
         raise ValueError(f"Can't get period start offset for TimeGranularity.{time_granularity.name}.")
     elif time_granularity is TimeGranularity.WEEK:
-        return pd.offsets.Week(dayofweek=ISODAYOFWEEK.MONDAY.pandas_value)
+        return pd.offsets.Week(weekday=ISOWeekDay.MONDAY.pandas_value)
     elif time_granularity is TimeGranularity.MONTH:
         return pd.offsets.MonthBegin()
     elif time_granularity is TimeGranularity.QUARTER:
@@ -87,7 +87,7 @@ def period_end_offset(  # noqa: D
     if time_granularity is TimeGranularity.DAY:
         raise ValueError(f"Can't get period end offset for TimeGranularity.{time_granularity.name}.")
     elif time_granularity == TimeGranularity.WEEK:
-        return pd.offsets.Week(dayofweek=ISODAYOFWEEK.SUNDAY.pandas_value)
+        return pd.offsets.Week(weekday=ISOWeekDay.SUNDAY.pandas_value)
     elif time_granularity is TimeGranularity.MONTH:
         return pd.offsets.MonthEnd()
     elif time_granularity is TimeGranularity.QUARTER:
@@ -132,7 +132,7 @@ def match_start_or_end_of_period(
         )
 
 
-class ISODAYOFWEEK(ExtendedEnum):
+class ISOWeekDay(ExtendedEnum):
     """Day of week values per ISO standard."""
 
     MONDAY = 1
@@ -144,23 +144,23 @@ class ISODAYOFWEEK(ExtendedEnum):
     SUNDAY = 7
 
     @staticmethod
-    def from_pandas_timestamp(timestamp: pd.Timestamp) -> ISODAYOFWEEK:
-        """Factory for streamlining conversion from a Pandas Timestamp to an ISODAYOFWEEK."""
-        return ISODAYOFWEEK(timestamp.isodayofweek())
+    def from_pandas_timestamp(timestamp: pd.Timestamp) -> ISOWeekDay:
+        """Factory for streamlining conversion from a Pandas Timestamp to an ISOWeekDay."""
+        return ISOWeekDay(timestamp.isoweekday())
 
     @property
     def is_week_start(self) -> bool:
         """Return comparison of instance value against ISO standard start of week (Monday)."""
-        return self is ISODAYOFWEEK.MONDAY
+        return self is ISOWeekDay.MONDAY
 
     @property
     def is_week_end(self) -> bool:
         """Return comparison of instance value against ISO standard end of week (Sunday)."""
-        return self is ISODAYOFWEEK.SUNDAY
+        return self is ISOWeekDay.SUNDAY
 
     @property
     def pandas_value(self) -> int:
-        """Returns the pandas int value representation of the ISODAYOFWEEK."""
+        """Returns the pandas int value representation of the ISOWeekDay."""
         return self.value - 1
 
 

From 07af19a86f1d65b713f76434192b93c8071b54a4 Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Mon, 11 Sep 2023 13:48:29 -0700
Subject: [PATCH 03/15] Regenerate snapshots

---
 .../BigQuery/test_join_to_scd_dimension__plan0.sql |  6 +++---
 ...test_join_to_scd_dimension__plan0_optimized.sql |  2 +-
 ...test_multi_hop_through_scd_dimension__plan0.sql |  6 +++---
 ..._hop_through_scd_dimension__plan0_optimized.sql |  4 ++--
 .../test_multi_hop_to_scd_dimension__plan0.sql     | 14 +++++++-------
 ...multi_hop_to_scd_dimension__plan0_optimized.sql | 10 +++++-----
 .../test_join_to_scd_dimension__plan0.sql          |  8 ++++----
 ...test_join_to_scd_dimension__plan0_optimized.sql |  4 ++--
 ...test_multi_hop_through_scd_dimension__plan0.sql | 14 +++++++-------
 ..._hop_through_scd_dimension__plan0_optimized.sql | 10 +++++-----
 .../test_multi_hop_to_scd_dimension__plan0.sql     | 14 +++++++-------
 ...multi_hop_to_scd_dimension__plan0_optimized.sql | 10 +++++-----
 .../Postgres/test_join_to_scd_dimension__plan0.sql | 14 +++++++-------
 ...test_join_to_scd_dimension__plan0_optimized.sql |  6 +++---
 ...test_multi_hop_through_scd_dimension__plan0.sql |  6 +++---
 ..._hop_through_scd_dimension__plan0_optimized.sql |  4 ++--
 .../test_multi_hop_to_scd_dimension__plan0.sql     | 14 +++++++-------
 ...multi_hop_to_scd_dimension__plan0_optimized.sql | 10 +++++-----
 .../Redshift/test_join_to_scd_dimension__plan0.sql | 14 +++++++-------
 ...test_join_to_scd_dimension__plan0_optimized.sql |  6 +++---
 ...test_multi_hop_through_scd_dimension__plan0.sql | 14 +++++++-------
 ..._hop_through_scd_dimension__plan0_optimized.sql | 10 +++++-----
 .../test_multi_hop_to_scd_dimension__plan0.sql     |  6 +++---
 ...multi_hop_to_scd_dimension__plan0_optimized.sql |  4 ++--
 .../test_join_to_scd_dimension__plan0.sql          | 14 +++++++-------
 ...test_join_to_scd_dimension__plan0_optimized.sql |  6 +++---
 ...test_multi_hop_through_scd_dimension__plan0.sql | 14 +++++++-------
 ..._hop_through_scd_dimension__plan0_optimized.sql | 10 +++++-----
 .../test_multi_hop_to_scd_dimension__plan0.sql     | 14 +++++++-------
 ...multi_hop_to_scd_dimension__plan0_optimized.sql | 10 +++++-----
 30 files changed, 139 insertions(+), 139 deletions(-)

diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
index bc49c849ed..00a9252e55 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
@@ -30,7 +30,7 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
+            , subq_4.window_start__day AS listing__window_start__day
             , subq_4.window_end__day AS listing__window_end__day
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
@@ -243,7 +243,7 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__extract_dayofyear
+              subq_3.window_start__day
               , subq_3.window_end__day
               , subq_3.listing
               , subq_3.capacity
@@ -315,7 +315,7 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__extract_dayofyear
+                subq_2.metric_time__day >= subq_4.window_start__day
               ) AND (
                 (
                   subq_2.metric_time__day < subq_4.window_end__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
index d9f3cf01a4..86a2010b35 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,7 +32,7 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from)
+        subq_12.metric_time__day >= listings_src_10017.active_from
       ) AND (
         (
           subq_12.metric_time__day < listings_src_10017.active_to
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
index 024c911d5b..9a8ead4f06 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,7 +20,7 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
+        , subq_7.window_start__day AS listing__window_start__day
         , subq_7.window_end__day AS listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
@@ -233,7 +233,7 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__extract_dayofyear
+          subq_6.window_start__day
           , subq_6.window_end__day
           , subq_6.listing
           , subq_6.user__home_state_latest
@@ -471,7 +471,7 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__extract_dayofyear
+            subq_2.metric_time__day >= subq_7.window_start__day
           ) AND (
             (
               subq_2.metric_time__day < subq_7.window_end__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index 6fee75f492..e8abbb3f87 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,7 +23,7 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+    listings_src_10017.active_from AS window_start__day
     , listings_src_10017.active_to AS window_end__day
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
@@ -38,7 +38,7 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__extract_dayofyear
+      subq_13.metric_time__day >= subq_18.window_start__day
     ) AND (
       (
         subq_13.metric_time__day < subq_18.window_end__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
index 2f8078af36..2f2cded306 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.lux_listing__window_start__extract_day AS listing__lux_listing__window_start__extract_day
-        , subq_7.lux_listing__window_end__extract_month AS listing__lux_listing__window_end__extract_month
+        , subq_7.lux_listing__window_start__day AS listing__lux_listing__window_start__day
+        , subq_7.lux_listing__window_end__day AS listing__lux_listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
         , subq_2.bookings AS bookings
@@ -236,8 +236,8 @@ FROM (
         --    'lux_listing__window_end__day',
         --    'listing']
         SELECT
-          subq_6.lux_listing__window_start__extract_day
-          , subq_6.lux_listing__window_end__extract_month
+          subq_6.lux_listing__window_start__day
+          , subq_6.lux_listing__window_end__day
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
         FROM (
@@ -450,12 +450,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_day
+            subq_2.metric_time__day >= subq_7.lux_listing__window_start__day
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_month
+              subq_2.metric_time__day < subq_7.lux_listing__window_end__day
             ) OR (
-              subq_7.lux_listing__window_end__extract_month IS NULL
+              subq_7.lux_listing__window_end__day IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index 2ab605916c..415ccb8d00 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -26,8 +26,8 @@ LEFT OUTER JOIN (
   --    'lux_listing__window_end__day',
   --    'listing']
   SELECT
-    EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
-    , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+    lux_listings_src_10019.valid_from AS lux_listing__window_start__day
+    , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
   FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_10018
@@ -41,12 +41,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_day
+      subq_13.metric_time__day >= subq_18.lux_listing__window_start__day
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_month
+        subq_13.metric_time__day < subq_18.lux_listing__window_end__day
       ) OR (
-        subq_18.lux_listing__window_end__extract_month IS NULL
+        subq_18.lux_listing__window_end__day IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
index 613d0fde8e..0d0160478b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
@@ -31,7 +31,7 @@ FROM (
           SELECT
             subq_2.metric_time__day AS metric_time__day
             , subq_4.window_start__day AS listing__window_start__day
-            , subq_4.window_end__extract_week AS listing__window_end__extract_week
+            , subq_4.window_end__day AS listing__window_end__day
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -244,7 +244,7 @@ FROM (
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
               subq_3.window_start__day
-              , subq_3.window_end__extract_week
+              , subq_3.window_end__day
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -318,9 +318,9 @@ FROM (
                 subq_2.metric_time__day >= subq_4.window_start__day
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__extract_week
+                  subq_2.metric_time__day < subq_4.window_end__day
                 ) OR (
-                  subq_4.window_end__extract_week IS NULL
+                  subq_4.window_end__day IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
index f0af95c23f..86a2010b35 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0_optimized.sql
@@ -35,9 +35,9 @@ FROM (
         subq_12.metric_time__day >= listings_src_10017.active_from
       ) AND (
         (
-          subq_12.metric_time__day < EXTRACT(WEEK FROM listings_src_10017.active_to)
+          subq_12.metric_time__day < listings_src_10017.active_to
         ) OR (
-          EXTRACT(WEEK FROM listings_src_10017.active_to) IS NULL
+          listings_src_10017.active_to IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
index ff186bc953..8430dbca74 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__extract_week AS listing__window_start__extract_week
-        , subq_7.window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
+        , subq_7.window_start__day AS listing__window_start__day
+        , subq_7.window_end__day AS listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
         , subq_2.bookings AS bookings
@@ -233,8 +233,8 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__extract_week
-          , subq_6.window_end__extract_dayofyear
+          subq_6.window_start__day
+          , subq_6.window_end__day
           , subq_6.listing
           , subq_6.user__home_state_latest
         FROM (
@@ -471,12 +471,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__extract_week
+            subq_2.metric_time__day >= subq_7.window_start__day
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.window_end__extract_dayofyear
+              subq_2.metric_time__day < subq_7.window_end__day
             ) OR (
-              subq_7.window_end__extract_dayofyear IS NULL
+              subq_7.window_end__day IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index 060e8301a1..feb5ed0fdc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,8 +23,8 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
-    , EXTRACT(DOY FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
+    listings_src_10017.active_from AS window_start__day
+    , listings_src_10017.active_to AS window_end__day
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
   FROM ***************************.dim_listings listings_src_10017
@@ -38,12 +38,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__extract_week
+      subq_13.metric_time__day >= subq_18.window_start__day
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.window_end__extract_dayofyear
+        subq_13.metric_time__day < subq_18.window_end__day
       ) OR (
-        subq_18.window_end__extract_dayofyear IS NULL
+        subq_18.window_end__day IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
index 7d569f8111..8d8a7b2fed 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.lux_listing__window_start__extract_dayofweek AS listing__lux_listing__window_start__extract_dayofweek
-        , subq_7.lux_listing__window_end__extract_month AS listing__lux_listing__window_end__extract_month
+        , subq_7.lux_listing__window_start__day AS listing__lux_listing__window_start__day
+        , subq_7.lux_listing__window_end__day AS listing__lux_listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
         , subq_2.bookings AS bookings
@@ -236,8 +236,8 @@ FROM (
         --    'lux_listing__window_end__day',
         --    'listing']
         SELECT
-          subq_6.lux_listing__window_start__extract_dayofweek
-          , subq_6.lux_listing__window_end__extract_month
+          subq_6.lux_listing__window_start__day
+          , subq_6.lux_listing__window_end__day
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
         FROM (
@@ -450,12 +450,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_dayofweek
+            subq_2.metric_time__day >= subq_7.lux_listing__window_start__day
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_month
+              subq_2.metric_time__day < subq_7.lux_listing__window_end__day
             ) OR (
-              subq_7.lux_listing__window_end__extract_month IS NULL
+              subq_7.lux_listing__window_end__day IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index aca1260a66..f1b419a284 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -26,8 +26,8 @@ LEFT OUTER JOIN (
   --    'lux_listing__window_end__day',
   --    'listing']
   SELECT
-    EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
-    , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+    lux_listings_src_10019.valid_from AS lux_listing__window_start__day
+    , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
   FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_10018
@@ -41,12 +41,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_dayofweek
+      subq_13.metric_time__day >= subq_18.lux_listing__window_start__day
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_month
+        subq_13.metric_time__day < subq_18.lux_listing__window_end__day
       ) OR (
-        subq_18.lux_listing__window_end__extract_month IS NULL
+        subq_18.lux_listing__window_end__day IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
index 08dd31437a..5712e1d25c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
@@ -30,8 +30,8 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
-            , subq_4.window_end__extract_quarter AS listing__window_end__extract_quarter
+            , subq_4.window_start__day AS listing__window_start__day
+            , subq_4.window_end__day AS listing__window_end__day
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -243,8 +243,8 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__extract_dayofyear
-              , subq_3.window_end__extract_quarter
+              subq_3.window_start__day
+              , subq_3.window_end__day
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -315,12 +315,12 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__extract_dayofyear
+                subq_2.metric_time__day >= subq_4.window_start__day
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__extract_quarter
+                  subq_2.metric_time__day < subq_4.window_end__day
                 ) OR (
-                  subq_4.window_end__extract_quarter IS NULL
+                  subq_4.window_end__day IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
index 297e00735f..86a2010b35 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,12 +32,12 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from)
+        subq_12.metric_time__day >= listings_src_10017.active_from
       ) AND (
         (
-          subq_12.metric_time__day < EXTRACT(QUARTER FROM listings_src_10017.active_to)
+          subq_12.metric_time__day < listings_src_10017.active_to
         ) OR (
-          EXTRACT(QUARTER FROM listings_src_10017.active_to) IS NULL
+          listings_src_10017.active_to IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
index 0bcca6489b..db50a9f2c8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,7 +20,7 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__extract_day AS listing__window_start__extract_day
+        , subq_7.window_start__day AS listing__window_start__day
         , subq_7.window_end__day AS listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
@@ -233,7 +233,7 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__extract_day
+          subq_6.window_start__day
           , subq_6.window_end__day
           , subq_6.listing
           , subq_6.user__home_state_latest
@@ -471,7 +471,7 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__extract_day
+            subq_2.metric_time__day >= subq_7.window_start__day
           ) AND (
             (
               subq_2.metric_time__day < subq_7.window_end__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index fdc48352dd..feb5ed0fdc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,7 +23,7 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
+    listings_src_10017.active_from AS window_start__day
     , listings_src_10017.active_to AS window_end__day
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
@@ -38,7 +38,7 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__extract_day
+      subq_13.metric_time__day >= subq_18.window_start__day
     ) AND (
       (
         subq_13.metric_time__day < subq_18.window_end__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
index bc41ed72fa..adaf16cf58 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.lux_listing__window_start__extract_dayofweek AS listing__lux_listing__window_start__extract_dayofweek
-        , subq_7.lux_listing__window_end__extract_month AS listing__lux_listing__window_end__extract_month
+        , subq_7.lux_listing__window_start__day AS listing__lux_listing__window_start__day
+        , subq_7.lux_listing__window_end__day AS listing__lux_listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
         , subq_2.bookings AS bookings
@@ -236,8 +236,8 @@ FROM (
         --    'lux_listing__window_end__day',
         --    'listing']
         SELECT
-          subq_6.lux_listing__window_start__extract_dayofweek
-          , subq_6.lux_listing__window_end__extract_month
+          subq_6.lux_listing__window_start__day
+          , subq_6.lux_listing__window_end__day
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
         FROM (
@@ -450,12 +450,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_dayofweek
+            subq_2.metric_time__day >= subq_7.lux_listing__window_start__day
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_month
+              subq_2.metric_time__day < subq_7.lux_listing__window_end__day
             ) OR (
-              subq_7.lux_listing__window_end__extract_month IS NULL
+              subq_7.lux_listing__window_end__day IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index aca1260a66..f1b419a284 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -26,8 +26,8 @@ LEFT OUTER JOIN (
   --    'lux_listing__window_end__day',
   --    'listing']
   SELECT
-    EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
-    , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+    lux_listings_src_10019.valid_from AS lux_listing__window_start__day
+    , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
   FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_10018
@@ -41,12 +41,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_dayofweek
+      subq_13.metric_time__day >= subq_18.lux_listing__window_start__day
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_month
+        subq_13.metric_time__day < subq_18.lux_listing__window_end__day
       ) OR (
-        subq_18.lux_listing__window_end__extract_month IS NULL
+        subq_18.lux_listing__window_end__day IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
index ff0c914625..5712e1d25c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
@@ -30,8 +30,8 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__extract_year AS listing__window_start__extract_year
-            , subq_4.window_end__extract_year AS listing__window_end__extract_year
+            , subq_4.window_start__day AS listing__window_start__day
+            , subq_4.window_end__day AS listing__window_end__day
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -243,8 +243,8 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__extract_year
-              , subq_3.window_end__extract_year
+              subq_3.window_start__day
+              , subq_3.window_end__day
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -315,12 +315,12 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__extract_year
+                subq_2.metric_time__day >= subq_4.window_start__day
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__extract_year
+                  subq_2.metric_time__day < subq_4.window_end__day
                 ) OR (
-                  subq_4.window_end__extract_year IS NULL
+                  subq_4.window_end__day IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
index c37cd61528..86a2010b35 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,12 +32,12 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= EXTRACT(YEAR FROM listings_src_10017.active_from)
+        subq_12.metric_time__day >= listings_src_10017.active_from
       ) AND (
         (
-          subq_12.metric_time__day < EXTRACT(YEAR FROM listings_src_10017.active_to)
+          subq_12.metric_time__day < listings_src_10017.active_to
         ) OR (
-          EXTRACT(YEAR FROM listings_src_10017.active_to) IS NULL
+          listings_src_10017.active_to IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
index 6644918147..db50a9f2c8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__extract_year AS listing__window_start__extract_year
-        , subq_7.window_end__extract_year AS listing__window_end__extract_year
+        , subq_7.window_start__day AS listing__window_start__day
+        , subq_7.window_end__day AS listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
         , subq_2.bookings AS bookings
@@ -233,8 +233,8 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__extract_year
-          , subq_6.window_end__extract_year
+          subq_6.window_start__day
+          , subq_6.window_end__day
           , subq_6.listing
           , subq_6.user__home_state_latest
         FROM (
@@ -471,12 +471,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__extract_year
+            subq_2.metric_time__day >= subq_7.window_start__day
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.window_end__extract_year
+              subq_2.metric_time__day < subq_7.window_end__day
             ) OR (
-              subq_7.window_end__extract_year IS NULL
+              subq_7.window_end__day IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index 8fcb6ec7af..feb5ed0fdc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,8 +23,8 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
-    , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
+    listings_src_10017.active_from AS window_start__day
+    , listings_src_10017.active_to AS window_end__day
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
   FROM ***************************.dim_listings listings_src_10017
@@ -38,12 +38,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__extract_year
+      subq_13.metric_time__day >= subq_18.window_start__day
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.window_end__extract_year
+        subq_13.metric_time__day < subq_18.window_end__day
       ) OR (
-        subq_18.window_end__extract_year IS NULL
+        subq_18.window_end__day IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
index 9397ea8d7a..adaf16cf58 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
@@ -20,7 +20,7 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.lux_listing__window_start__extract_dayofweek AS listing__lux_listing__window_start__extract_dayofweek
+        , subq_7.lux_listing__window_start__day AS listing__lux_listing__window_start__day
         , subq_7.lux_listing__window_end__day AS listing__lux_listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
@@ -236,7 +236,7 @@ FROM (
         --    'lux_listing__window_end__day',
         --    'listing']
         SELECT
-          subq_6.lux_listing__window_start__extract_dayofweek
+          subq_6.lux_listing__window_start__day
           , subq_6.lux_listing__window_end__day
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
@@ -450,7 +450,7 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_dayofweek
+            subq_2.metric_time__day >= subq_7.lux_listing__window_start__day
           ) AND (
             (
               subq_2.metric_time__day < subq_7.lux_listing__window_end__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index 926cc6d3ad..f1b419a284 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -26,7 +26,7 @@ LEFT OUTER JOIN (
   --    'lux_listing__window_end__day',
   --    'listing']
   SELECT
-    EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
+    lux_listings_src_10019.valid_from AS lux_listing__window_start__day
     , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
@@ -41,7 +41,7 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_dayofweek
+      subq_13.metric_time__day >= subq_18.lux_listing__window_start__day
     ) AND (
       (
         subq_13.metric_time__day < subq_18.lux_listing__window_end__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
index dbe82316e7..5712e1d25c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
@@ -30,8 +30,8 @@ FROM (
           -- Join Standard Outputs
           SELECT
             subq_2.metric_time__day AS metric_time__day
-            , subq_4.window_start__extract_month AS listing__window_start__extract_month
-            , subq_4.window_end__extract_month AS listing__window_end__extract_month
+            , subq_4.window_start__day AS listing__window_start__day
+            , subq_4.window_end__day AS listing__window_end__day
             , subq_2.listing AS listing
             , subq_4.capacity AS listing__capacity
             , subq_2.bookings AS bookings
@@ -243,8 +243,8 @@ FROM (
             -- Pass Only Elements:
             --   ['capacity', 'window_start__day', 'window_end__day', 'listing']
             SELECT
-              subq_3.window_start__extract_month
-              , subq_3.window_end__extract_month
+              subq_3.window_start__day
+              , subq_3.window_end__day
               , subq_3.listing
               , subq_3.capacity
             FROM (
@@ -315,12 +315,12 @@ FROM (
               subq_2.listing = subq_4.listing
             ) AND (
               (
-                subq_2.metric_time__day >= subq_4.window_start__extract_month
+                subq_2.metric_time__day >= subq_4.window_start__day
               ) AND (
                 (
-                  subq_2.metric_time__day < subq_4.window_end__extract_month
+                  subq_2.metric_time__day < subq_4.window_end__day
                 ) OR (
-                  subq_4.window_end__extract_month IS NULL
+                  subq_4.window_end__day IS NULL
                 )
               )
             )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
index 24f243f464..86a2010b35 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0_optimized.sql
@@ -32,12 +32,12 @@ FROM (
       subq_12.listing = listings_src_10017.listing_id
     ) AND (
       (
-        subq_12.metric_time__day >= EXTRACT(MONTH FROM listings_src_10017.active_from)
+        subq_12.metric_time__day >= listings_src_10017.active_from
       ) AND (
         (
-          subq_12.metric_time__day < EXTRACT(MONTH FROM listings_src_10017.active_to)
+          subq_12.metric_time__day < listings_src_10017.active_to
         ) OR (
-          EXTRACT(MONTH FROM listings_src_10017.active_to) IS NULL
+          listings_src_10017.active_to IS NULL
         )
       )
     )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
index a4dc109e27..db50a9f2c8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.window_start__extract_month AS listing__window_start__extract_month
-        , subq_7.window_end__extract_month AS listing__window_end__extract_month
+        , subq_7.window_start__day AS listing__window_start__day
+        , subq_7.window_end__day AS listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.user__home_state_latest AS listing__user__home_state_latest
         , subq_2.bookings AS bookings
@@ -233,8 +233,8 @@ FROM (
         -- Pass Only Elements:
         --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
         SELECT
-          subq_6.window_start__extract_month
-          , subq_6.window_end__extract_month
+          subq_6.window_start__day
+          , subq_6.window_end__day
           , subq_6.listing
           , subq_6.user__home_state_latest
         FROM (
@@ -471,12 +471,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.window_start__extract_month
+            subq_2.metric_time__day >= subq_7.window_start__day
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.window_end__extract_month
+              subq_2.metric_time__day < subq_7.window_end__day
             ) OR (
-              subq_7.window_end__extract_month IS NULL
+              subq_7.window_end__day IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
index 004fe3196a..feb5ed0fdc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0_optimized.sql
@@ -23,8 +23,8 @@ LEFT OUTER JOIN (
   -- Pass Only Elements:
   --   ['user__home_state_latest', 'window_start__day', 'window_end__day', 'listing']
   SELECT
-    EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-    , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
+    listings_src_10017.active_from AS window_start__day
+    , listings_src_10017.active_to AS window_end__day
     , listings_src_10017.listing_id AS listing
     , users_latest_src_10021.home_state_latest AS user__home_state_latest
   FROM ***************************.dim_listings listings_src_10017
@@ -38,12 +38,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.window_start__extract_month
+      subq_13.metric_time__day >= subq_18.window_start__day
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.window_end__extract_month
+        subq_13.metric_time__day < subq_18.window_end__day
       ) OR (
-        subq_18.window_end__extract_month IS NULL
+        subq_18.window_end__day IS NULL
       )
     )
   )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
index a3b53ef6af..adaf16cf58 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
@@ -20,8 +20,8 @@ FROM (
       -- Join Standard Outputs
       SELECT
         subq_2.metric_time__day AS metric_time__day
-        , subq_7.lux_listing__window_start__extract_dayofyear AS listing__lux_listing__window_start__extract_dayofyear
-        , subq_7.lux_listing__window_end__extract_quarter AS listing__lux_listing__window_end__extract_quarter
+        , subq_7.lux_listing__window_start__day AS listing__lux_listing__window_start__day
+        , subq_7.lux_listing__window_end__day AS listing__lux_listing__window_end__day
         , subq_2.listing AS listing
         , subq_7.lux_listing__is_confirmed_lux AS listing__lux_listing__is_confirmed_lux
         , subq_2.bookings AS bookings
@@ -236,8 +236,8 @@ FROM (
         --    'lux_listing__window_end__day',
         --    'listing']
         SELECT
-          subq_6.lux_listing__window_start__extract_dayofyear
-          , subq_6.lux_listing__window_end__extract_quarter
+          subq_6.lux_listing__window_start__day
+          , subq_6.lux_listing__window_end__day
           , subq_6.listing
           , subq_6.lux_listing__is_confirmed_lux
         FROM (
@@ -450,12 +450,12 @@ FROM (
           subq_2.listing = subq_7.listing
         ) AND (
           (
-            subq_2.metric_time__day >= subq_7.lux_listing__window_start__extract_dayofyear
+            subq_2.metric_time__day >= subq_7.lux_listing__window_start__day
           ) AND (
             (
-              subq_2.metric_time__day < subq_7.lux_listing__window_end__extract_quarter
+              subq_2.metric_time__day < subq_7.lux_listing__window_end__day
             ) OR (
-              subq_7.lux_listing__window_end__extract_quarter IS NULL
+              subq_7.lux_listing__window_end__day IS NULL
             )
           )
         )
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
index 8dc33d857c..f1b419a284 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0_optimized.sql
@@ -26,8 +26,8 @@ LEFT OUTER JOIN (
   --    'lux_listing__window_end__day',
   --    'listing']
   SELECT
-    EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
-    , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
+    lux_listings_src_10019.valid_from AS lux_listing__window_start__day
+    , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
     , lux_listing_mapping_src_10018.listing_id AS listing
     , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
   FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_10018
@@ -41,12 +41,12 @@ ON
     subq_13.listing = subq_18.listing
   ) AND (
     (
-      subq_13.metric_time__day >= subq_18.lux_listing__window_start__extract_dayofyear
+      subq_13.metric_time__day >= subq_18.lux_listing__window_start__day
     ) AND (
       (
-        subq_13.metric_time__day < subq_18.lux_listing__window_end__extract_quarter
+        subq_13.metric_time__day < subq_18.lux_listing__window_end__day
       ) OR (
-        subq_18.lux_listing__window_end__extract_quarter IS NULL
+        subq_18.lux_listing__window_end__day IS NULL
       )
     )
   )

From 0f3cf0b5dcdcc2eb2ac75517fee09855f0ea7fc9 Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Mon, 11 Sep 2023 19:07:40 -0700
Subject: [PATCH 04/15] Handle time offset with date_part

---
 metricflow/plan_conversion/dataflow_to_sql.py | 46 +++++++++++--------
 metricflow/query/query_parser.py              |  1 +
 .../integration/test_cases/itest_metrics.yaml | 30 ++++++++++--
 .../test/integration/test_configured_cases.py | 19 ++++++++
 4 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/metricflow/plan_conversion/dataflow_to_sql.py b/metricflow/plan_conversion/dataflow_to_sql.py
index 6dc0db4c23..84b2e0d261 100644
--- a/metricflow/plan_conversion/dataflow_to_sql.py
+++ b/metricflow/plan_conversion/dataflow_to_sql.py
@@ -89,6 +89,7 @@
     SqlComparisonExpression,
     SqlDateTruncExpression,
     SqlExpressionNode,
+    SqlExtractExpression,
     SqlFunctionExpression,
     SqlLogicalExpression,
     SqlLogicalOperator,
@@ -292,7 +293,8 @@ def visit_join_over_time_range_node(self, node: JoinOverTimeRangeNode[SqlDataSet
             metric_time_dimension_spec
         ).column_name
 
-        # assemble dataset with metric_time_dimension to join
+        # Assemble time_spine dataset with metric_time_dimension to join.
+        # Granularity of time_spine column should match granularity of metric_time column from parent dataset.
         assert metric_time_dimension_instance
         time_spine_data_set = self._make_time_spine_data_set(
             metric_time_dimension_instance=metric_time_dimension_instance,
@@ -1354,11 +1356,11 @@ def visit_join_to_time_spine_node(self, node: JoinToTimeSpineNode[SourceDataSetT
             len(time_spine_dataset.instance_set.time_dimension_instances) == 1
             and len(time_spine_dataset.sql_select_node.select_columns) == 1
         ), "Time spine dataset not configured properly. Expected exactly one column."
-        original_time_dim_instance = time_spine_dataset.instance_set.time_dimension_instances[0]
+        time_dim_instance = time_spine_dataset.instance_set.time_dimension_instances[0]
         time_spine_column_select_expr: Union[
             SqlColumnReferenceExpression, SqlDateTruncExpression
         ] = SqlColumnReferenceExpression(
-            SqlColumnReference(table_alias=time_spine_alias, column_name=original_time_dim_instance.spec.qualified_name)
+            SqlColumnReference(table_alias=time_spine_alias, column_name=time_dim_instance.spec.qualified_name)
         )
 
         # Add requested granularities (skip for default granularity) and date_parts.
@@ -1366,28 +1368,15 @@ def visit_join_to_time_spine_node(self, node: JoinToTimeSpineNode[SourceDataSetT
         metric_time_dimension_instances = []
         where: Optional[SqlExpressionNode] = None
         for metric_time_dimension_spec in node.metric_time_dimension_specs:
+            # Apply granularity to SQL.
             if metric_time_dimension_spec.time_granularity == self._time_spine_source.time_column_granularity:
-                select_expr = time_spine_column_select_expr
-                time_dim_instance = original_time_dim_instance
-                column_alias = original_time_dim_instance.associated_column.column_name
+                select_expr: SqlExpressionNode = time_spine_column_select_expr
             else:
                 select_expr = SqlDateTruncExpression(
                     time_granularity=metric_time_dimension_spec.time_granularity, arg=time_spine_column_select_expr
                 )
-                new_time_dim_spec = TimeDimensionSpec(
-                    element_name=original_time_dim_instance.spec.element_name,
-                    entity_links=original_time_dim_instance.spec.entity_links,
-                    time_granularity=metric_time_dimension_spec.time_granularity,
-                    date_part=metric_time_dimension_spec.date_part,
-                    aggregation_state=original_time_dim_instance.spec.aggregation_state,
-                )
-                time_dim_instance = TimeDimensionInstance(
-                    defined_from=original_time_dim_instance.defined_from,
-                    associated_columns=(self._column_association_resolver.resolve_spec(new_time_dim_spec),),
-                    spec=new_time_dim_spec,
-                )
-                column_alias = time_dim_instance.associated_column.column_name
                 if node.offset_to_grain:
+                    # TODO: allow offset_to_grain w/ granularity & datepart? what's the expected behavior?
                     # Filter down to one row per granularity period
                     new_filter = SqlComparisonExpression(
                         left_expr=select_expr, comparison=SqlComparison.EQUALS, right_expr=time_spine_column_select_expr
@@ -1396,8 +1385,25 @@ def visit_join_to_time_spine_node(self, node: JoinToTimeSpineNode[SourceDataSetT
                         where = new_filter
                     else:
                         where = SqlLogicalExpression(operator=SqlLogicalOperator.OR, args=(where, new_filter))
+            # Apply date_part to SQL.
+            if metric_time_dimension_spec.date_part:
+                select_expr = SqlExtractExpression(date_part=metric_time_dimension_spec.date_part, arg=select_expr)
+            time_dim_spec = TimeDimensionSpec(
+                element_name=time_dim_instance.spec.element_name,
+                entity_links=time_dim_instance.spec.entity_links,
+                time_granularity=metric_time_dimension_spec.time_granularity,
+                date_part=metric_time_dimension_spec.date_part,
+                aggregation_state=time_dim_instance.spec.aggregation_state,
+            )
+            time_dim_instance = TimeDimensionInstance(
+                defined_from=time_dim_instance.defined_from,
+                associated_columns=(self._column_association_resolver.resolve_spec(time_dim_spec),),
+                spec=time_dim_spec,
+            )
             metric_time_dimension_instances.append(time_dim_instance)
-            metric_time_select_columns.append(SqlSelectColumn(expr=select_expr, column_alias=column_alias))
+            metric_time_select_columns.append(
+                SqlSelectColumn(expr=select_expr, column_alias=time_dim_instance.associated_column.column_name)
+            )
         metric_time_instance_set = InstanceSet(time_dimension_instances=tuple(metric_time_dimension_instances))
 
         return SqlDataSet(
diff --git a/metricflow/query/query_parser.py b/metricflow/query/query_parser.py
index 6f437117ac..956f3933fc 100644
--- a/metricflow/query/query_parser.py
+++ b/metricflow/query/query_parser.py
@@ -797,6 +797,7 @@ def _parse_order_by(
                                 element_name=parsed_name.element_name,
                                 entity_links=entity_links,
                                 time_granularity=parsed_name.time_granularity,
+                                date_part=parsed_name.date_part,
                             ),
                             descending=descending,
                         )
diff --git a/metricflow/test/integration/test_cases/itest_metrics.yaml b/metricflow/test/integration/test_cases/itest_metrics.yaml
index ced9b011a1..f08254aaa1 100644
--- a/metricflow/test/integration/test_cases/itest_metrics.yaml
+++ b/metricflow/test/integration/test_cases/itest_metrics.yaml
@@ -1053,7 +1053,31 @@ integration_test:
   check_query: |
     SELECT
       SUM(1) AS bookings
-      , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
+      , {{ render_extract("ds", DatePart.DAYOFWEEK) }} AS metric_time__extract_dayofweek
     FROM {{ source_schema }}.fct_bookings
-    GROUP BY EXTRACT(DAYOFWEEK FROM ds);
-# TODO: test with cumulative metric, offset metric, others?
+    GROUP BY {{ render_extract("ds", DatePart.DAYOFWEEK) }};
+---
+integration_test:
+  name: derived_metric_offset_window_and_date_part
+  description: Tests a derived metric offset query with window and date_part
+  model: SIMPLE_MODEL
+  metrics: ["bookings_5_day_lag"]
+  group_bys: ["metric_time__extract_month"]
+  check_query: |
+    SELECT
+      {{ render_extract("a.ds", DatePart.MONTH) }} AS metric_time__extract_month
+      , SUM(b.bookings_5_day_lag) AS bookings_5_day_lag
+    FROM {{ mf_time_spine_source }} a
+    INNER JOIN (
+      SELECT
+        ds AS metric_time__day
+        , 1 AS bookings_5_day_lag
+      FROM {{ source_schema }}.fct_bookings
+    ) b
+    ON {{ render_date_sub("a", "ds", 5, TimeGranularity.DAY) }} = b.metric_time__day
+    GROUP BY metric_time__extract_month
+
+# TODO:
+# test each date part syntax with each engine
+# dataflow plan tests?
+# dataflow to sql tests?
diff --git a/metricflow/test/integration/test_configured_cases.py b/metricflow/test/integration/test_configured_cases.py
index 12b6aac0f3..cde625fde7 100644
--- a/metricflow/test/integration/test_configured_cases.py
+++ b/metricflow/test/integration/test_configured_cases.py
@@ -23,6 +23,7 @@
     SqlColumnReference,
     SqlColumnReferenceExpression,
     SqlDateTruncExpression,
+    SqlExtractExpression,
     SqlPercentileExpression,
     SqlPercentileExpressionArgument,
     SqlPercentileFunctionType,
@@ -39,6 +40,7 @@
 from metricflow.test.time.configurable_time_source import (
     ConfigurableTimeSource,
 )
+from metricflow.time.date_part import DatePart
 
 logger = logging.getLogger(__name__)
 
@@ -100,6 +102,19 @@ def render_date_trunc(self, expr: str, granularity: TimeGranularity) -> str:
         )
         return self._sql_client.sql_query_plan_renderer.expr_renderer.render_sql_expr(renderable_expr).sql
 
+    def render_extract(self, expr: str, date_part: DatePart) -> str:
+        """Return the EXTRACT call that can be used for converting the given expr to the date_part."""
+        renderable_expr = SqlExtractExpression(
+            date_part=date_part,
+            arg=SqlCastToTimestampExpression(
+                arg=SqlStringExpression(
+                    sql_expr=expr,
+                    requires_parenthesis=False,
+                )
+            ),
+        )
+        return self._sql_client.sql_query_plan_renderer.expr_renderer.render_sql_expr(renderable_expr).sql
+
     def render_percentile_expr(
         self, expr: str, percentile: float, use_discrete_percentile: bool, use_approximate_percentile: bool
     ) -> str:
@@ -252,8 +267,10 @@ def test_case(
                 source_schema=mf_test_session_state.mf_source_schema,
                 render_time_constraint=check_query_helpers.render_time_constraint,
                 TimeGranularity=TimeGranularity,
+                DatePart=DatePart,
                 render_date_sub=check_query_helpers.render_date_sub,
                 render_date_trunc=check_query_helpers.render_date_trunc,
+                render_extract=check_query_helpers.render_extract,
                 render_percentile_expr=check_query_helpers.render_percentile_expr,
                 mf_time_spine_source=semantic_manifest_lookup.time_spine_source.spine_table.sql,
                 double_data_type_name=check_query_helpers.double_data_type_name,
@@ -277,8 +294,10 @@ def test_case(
             source_schema=mf_test_session_state.mf_source_schema,
             render_time_constraint=check_query_helpers.render_time_constraint,
             TimeGranularity=TimeGranularity,
+            DatePart=DatePart,
             render_date_sub=check_query_helpers.render_date_sub,
             render_date_trunc=check_query_helpers.render_date_trunc,
+            render_extract=check_query_helpers.render_extract,
             render_percentile_expr=check_query_helpers.render_percentile_expr,
             mf_time_spine_source=semantic_manifest_lookup.time_spine_source.spine_table.sql,
             double_data_type_name=check_query_helpers.double_data_type_name,

From cb71648ac4982ade297dd5bcc6cdf9f39f41445e Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Mon, 11 Sep 2023 19:09:35 -0700
Subject: [PATCH 05/15] Changelog

---
 .changes/unreleased/Features-20230911-190924.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changes/unreleased/Features-20230911-190924.yaml

diff --git a/.changes/unreleased/Features-20230911-190924.yaml b/.changes/unreleased/Features-20230911-190924.yaml
new file mode 100644
index 0000000000..8370049390
--- /dev/null
+++ b/.changes/unreleased/Features-20230911-190924.yaml
@@ -0,0 +1,6 @@
+kind: Features
+body: DatePart aggregation for time dimensions
+time: 2023-09-11T19:09:24.960342-07:00
+custom:
+  Author: courtneyholcomb
+  Issue: "770"

From 16adef79164d595772d4059cd504b54a272fbb11 Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Mon, 11 Sep 2023 20:18:12 -0700
Subject: [PATCH 06/15] Tests for all DateParts

---
 .../integration/test_cases/itest_metrics.yaml | 31 ++++++++++++++-----
 metricflow/test/sql/test_sql_expr_render.py   |  9 ++++++
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/metricflow/test/integration/test_cases/itest_metrics.yaml b/metricflow/test/integration/test_cases/itest_metrics.yaml
index f08254aaa1..b2cd3a914a 100644
--- a/metricflow/test/integration/test_cases/itest_metrics.yaml
+++ b/metricflow/test/integration/test_cases/itest_metrics.yaml
@@ -1049,13 +1049,35 @@ integration_test:
   description: Test query using date_part
   model: SIMPLE_MODEL
   metrics: ["bookings"]
-  group_bys: ["metric_time__extract_dayofweek"]
+  group_bys: ["metric_time__extract_year"]
   check_query: |
     SELECT
       SUM(1) AS bookings
+      , {{ render_extract("ds", DatePart.YEAR) }} AS metric_time__extract_year
+    FROM {{ source_schema }}.fct_bookings
+    GROUP BY {{ render_extract("ds", DatePart.YEAR) }};
+---
+integration_test:
+  name: simple_query_with_multiple_date_parts
+  description: Test query using multiple date_parts
+  model: SIMPLE_MODEL
+  metrics: ["bookings"]
+  group_bys: ["metric_time__extract_quarter", "metric_time__extract_dayofweek", "metric_time__extract_dayofyear", "metric_time__extract_day", "metric_time__extract_week"]
+  check_query: |
+    SELECT
+      SUM(1) AS bookings
+      , {{ render_extract("ds", DatePart.QUARTER) }} AS metric_time__extract_quarter
       , {{ render_extract("ds", DatePart.DAYOFWEEK) }} AS metric_time__extract_dayofweek
+      , {{ render_extract("ds", DatePart.DAYOFYEAR) }} AS metric_time__extract_dayofyear
+      , {{ render_extract("ds", DatePart.DAY) }} AS metric_time__extract_day
+      , {{ render_extract("ds", DatePart.WEEK) }} AS metric_time__extract_week
     FROM {{ source_schema }}.fct_bookings
-    GROUP BY {{ render_extract("ds", DatePart.DAYOFWEEK) }};
+    GROUP BY
+      {{ render_extract("ds", DatePart.QUARTER) }}
+      , {{ render_extract("ds", DatePart.DAYOFWEEK) }}
+      , {{ render_extract("ds", DatePart.DAYOFYEAR) }}
+      , {{ render_extract("ds", DatePart.DAY) }}
+      , {{ render_extract("ds", DatePart.WEEK) }};
 ---
 integration_test:
   name: derived_metric_offset_window_and_date_part
@@ -1076,8 +1098,3 @@ integration_test:
     ) b
     ON {{ render_date_sub("a", "ds", 5, TimeGranularity.DAY) }} = b.metric_time__day
     GROUP BY metric_time__extract_month
-
-# TODO:
-# test each date part syntax with each engine
-# dataflow plan tests?
-# dataflow to sql tests?
diff --git a/metricflow/test/sql/test_sql_expr_render.py b/metricflow/test/sql/test_sql_expr_render.py
index c123843ae2..035dca2f2e 100644
--- a/metricflow/test/sql/test_sql_expr_render.py
+++ b/metricflow/test/sql/test_sql_expr_render.py
@@ -17,6 +17,7 @@
     SqlComparison,
     SqlComparisonExpression,
     SqlDateTruncExpression,
+    SqlExtractExpression,
     SqlFunction,
     SqlIsNullExpression,
     SqlLogicalExpression,
@@ -29,6 +30,7 @@
     SqlWindowFunctionExpression,
     SqlWindowOrderByArgument,
 )
+from metricflow.time.date_part import DatePart
 
 logger = logging.getLogger(__name__)
 
@@ -193,6 +195,13 @@ def test_date_trunc_expr(default_expr_renderer: DefaultSqlExpressionRenderer) ->
     assert actual == "DATE_TRUNC('month', ds)"
 
 
+def test_extract_expr(default_expr_renderer: DefaultSqlExpressionRenderer) -> None:  # noqa: D
+    actual = default_expr_renderer.render_sql_expr(
+        SqlExtractExpression(date_part=DatePart.DAYOFYEAR, arg=SqlStringExpression("ds"))
+    ).sql
+    assert actual == "EXTRACT(DAYOFYEAR FROM ds)"
+
+
 def test_ratio_computation_expr(default_expr_renderer: DefaultSqlExpressionRenderer) -> None:  # noqa: D
     actual = default_expr_renderer.render_sql_expr(
         SqlRatioComputationExpression(

From b1468953c40f973fa458d4e4f752f8fb607e15da Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Mon, 11 Sep 2023 20:32:06 -0700
Subject: [PATCH 07/15] Rename to dow and doy

---
 .../integration/test_cases/itest_metrics.yaml |   6 +-
 ...st_convert_query_semantic_model__plan0.sql |   8 +-
 ...le_semantic_model_with_measures__plan0.sql |  16 +-
 ...semantic_model_without_measures__plan0.sql |   8 +-
 .../test_multihop_join_plan__dfp_0.xml        |  32 +-
 .../test_common_semantic_model__plan0.sql     | 104 ++--
 .../test_compute_metrics_node__plan0.sql      |  40 +-
 ...o_from_multiple_semantic_models__plan0.sql | 160 +++---
 ...atio_from_single_semantic_model__plan0.sql |  40 +-
 ...ompute_metrics_node_simple_expr__plan0.sql |  40 +-
 .../test_constrain_time_range_node__plan0.sql |  24 +-
 .../DuckDB/test_cumulative_metric__plan0.sql  |  20 +-
 ...cumulative_metric_grain_to_date__plan0.sql |  20 +-
 .../test_cumulative_metric_no_ds__plan0.sql   |  20 +-
 ...est_cumulative_metric_no_window__plan0.sql |  20 +-
 ..._no_window_with_time_constraint__plan0.sql |  32 +-
 ...ive_metric_with_time_constraint__plan0.sql |  32 +-
 .../DuckDB/test_derived_metric__plan0.sql     | 104 ++--
 ...ved_metric_with_offset_to_grain__plan0.sql | 128 ++---
 ...offset_to_grain_and_granularity__plan0.sql | 128 ++---
 ...rived_metric_with_offset_window__plan0.sql | 128 ++---
 ...h_offset_window_and_granularity__plan0.sql | 128 ++---
 ...fset_window_and_offset_to_grain__plan0.sql | 152 ++---
 ...offset_to_grain_and_granularity__plan0.sql | 152 ++---
 ...erived_offset_cumulative_metric__plan0.sql | 104 ++--
 ...et_metric_with_one_input_metric__plan0.sql |  76 +--
 .../DuckDB/test_distinct_values__plan0.sql    |  88 +--
 .../DuckDB/test_filter_node__plan0.sql        |  24 +-
 ...lter_with_where_constraint_node__plan0.sql |  24 +-
 ...th_where_constraint_on_join_dim__plan0.sql |  88 +--
 .../test_join_to_scd_dimension__plan0.sql     |  68 +--
 ...spine_node_with_offset_to_grain__plan0.sql |  52 +-
 ...e_spine_node_with_offset_window__plan0.sql |  52 +-
 ..._time_spine_node_without_offset__plan0.sql |  52 +-
 .../DuckDB/test_limit_rows__plan0.sql         |  52 +-
 ...al_dimension_using_local_entity__plan0.sql |  36 +-
 .../test_measure_aggregation_node__plan0.sql  |  24 +-
 .../DuckDB/test_measure_constraint__plan0.sql | 228 ++++----
 ..._constraint_with_reused_measure__plan0.sql | 104 ++--
 ...aint_with_single_expr_and_alias__plan0.sql |  52 +-
 ..._multiple_sources_no_dimensions__plan0.sql |  88 +--
 ...multi_hop_through_scd_dimension__plan0.sql | 104 ++--
 ...test_multi_hop_to_scd_dimension__plan0.sql |  92 +--
 .../DuckDB/test_multi_join_node__plan0.sql    |  56 +-
 .../DuckDB/test_multihop_node__plan0.sql      |  72 +--
 ..._multiple_metrics_no_dimensions__plan0.sql | 136 ++---
 .../test_nested_derived_metric__plan0.sql     | 208 +++----
 .../DuckDB/test_order_by_node__plan0.sql      |  24 +-
 .../DuckDB/test_partitioned_join__plan0.sql   |  60 +-
 .../test_semi_additive_join_node__plan0.sql   |  24 +-
 ...mi_additive_join_node__plan0_optimized.sql |  16 +-
 ...dditive_join_node_with_grouping__plan0.sql |  24 +-
 ...in_node_with_grouping__plan0_optimized.sql |  16 +-
 ...join_node_with_queried_group_by__plan0.sql |  24 +-
 ...with_queried_group_by__plan0_optimized.sql |  16 +-
 .../DuckDB/test_single_join_node__plan0.sql   |  40 +-
 .../DuckDB/test_source_node__plan0.sql        |  24 +-
 .../test_source_node__plan0_optimized.sql     |  24 +-
 .../test_common_semantic_model__plan0.xml     | 248 ++++----
 .../test_compute_metrics_node__plan0.xml      | 124 ++--
 ...o_from_multiple_semantic_models__plan0.xml | 364 ++++++------
 ...atio_from_single_semantic_model__plan0.xml | 124 ++--
 ...ompute_metrics_node_simple_expr__plan0.xml | 124 ++--
 .../test_constrain_time_range_node__plan0.xml |  72 +--
 .../test_cumulative_metric__plan0.xml         |  32 +-
 ...cumulative_metric_grain_to_date__plan0.xml |  32 +-
 .../test_cumulative_metric_no_ds__plan0.xml   |  32 +-
 ...est_cumulative_metric_no_window__plan0.xml |  32 +-
 ..._no_window_with_time_constraint__plan0.xml |  44 +-
 ...ive_metric_with_time_constraint__plan0.xml |  44 +-
 .../test_derived_metric__plan0.xml            | 248 ++++----
 ...ved_metric_with_offset_to_grain__plan0.xml | 296 +++++-----
 ...offset_to_grain_and_granularity__plan0.xml | 296 +++++-----
 ...rived_metric_with_offset_window__plan0.xml | 296 +++++-----
 ...h_offset_window_and_granularity__plan0.xml | 296 +++++-----
 ...fset_window_and_offset_to_grain__plan0.xml | 344 +++++------
 ...offset_to_grain_and_granularity__plan0.xml | 344 +++++------
 ...erived_offset_cumulative_metric__plan0.xml | 224 ++++----
 ...et_metric_with_one_input_metric__plan0.xml | 172 +++---
 .../test_distinct_values__plan0.xml           | 208 +++----
 .../SqlQueryPlan/test_filter_node__plan0.xml  |  72 +--
 ...lter_with_where_constraint_node__plan0.xml |  72 +--
 ...th_where_constraint_on_join_dim__plan0.xml | 208 +++----
 .../test_join_to_scd_dimension__plan0.xml     | 188 +++---
 ...spine_node_with_offset_to_grain__plan0.xml | 124 ++--
 ...e_spine_node_with_offset_window__plan0.xml | 124 ++--
 ..._time_spine_node_without_offset__plan0.xml | 124 ++--
 .../SqlQueryPlan/test_limit_rows__plan0.xml   | 124 ++--
 ...al_dimension_using_local_entity__plan0.xml |  84 +--
 .../test_measure_aggregation_node__plan0.xml  |  72 +--
 .../test_measure_constraint__plan0.xml        | 540 +++++++++---------
 ..._constraint_with_reused_measure__plan0.xml | 248 ++++----
 ...aint_with_single_expr_and_alias__plan0.xml | 124 ++--
 ..._multiple_sources_no_dimensions__plan0.xml | 208 +++----
 ...multi_hop_through_scd_dimension__plan0.xml | 248 ++++----
 ...test_multi_hop_to_scd_dimension__plan0.xml | 260 ++++-----
 .../test_multi_join_node__plan0.xml           | 176 +++---
 .../test_multihop_node__plan0.xml             | 204 +++----
 ..._multiple_metrics_no_dimensions__plan0.xml | 280 ++++-----
 .../test_nested_derived_metric__plan0.xml     | 496 ++++++++--------
 .../test_order_by_node__plan0.xml             |  72 +--
 .../test_partitioned_join__plan0.xml          | 168 +++---
 .../test_semi_additive_join_node__plan0.xml   |  48 +-
 ...dditive_join_node_with_grouping__plan0.xml |  48 +-
 ...join_node_with_queried_group_by__plan0.xml |  48 +-
 .../test_single_join_node__plan0.xml          | 124 ++--
 .../SqlQueryPlan/test_source_node__plan0.xml  |  72 +--
 ...orm_node_using_non_primary_time__plan0.sql |  52 +-
 ...sing_non_primary_time__plan0_optimized.sql |  28 +-
 ...ansform_node_using_primary_time__plan0.sql |  52 +-
 ...de_using_primary_time__plan0_optimized.sql |  28 +-
 ...uery_with_metric_time_dimension__plan0.sql | 104 ++--
 ...orm_node_using_non_primary_time__plan0.xml | 124 ++--
 ...ansform_node_using_primary_time__plan0.xml | 124 ++--
 ...uery_with_metric_time_dimension__plan0.xml | 248 ++++----
 metricflow/time/date_part.py                  |   4 +-
 116 files changed, 6515 insertions(+), 6515 deletions(-)

diff --git a/metricflow/test/integration/test_cases/itest_metrics.yaml b/metricflow/test/integration/test_cases/itest_metrics.yaml
index b2cd3a914a..aa184a67e1 100644
--- a/metricflow/test/integration/test_cases/itest_metrics.yaml
+++ b/metricflow/test/integration/test_cases/itest_metrics.yaml
@@ -1062,13 +1062,13 @@ integration_test:
   description: Test query using multiple date_parts
   model: SIMPLE_MODEL
   metrics: ["bookings"]
-  group_bys: ["metric_time__extract_quarter", "metric_time__extract_dayofweek", "metric_time__extract_dayofyear", "metric_time__extract_day", "metric_time__extract_week"]
+  group_bys: ["metric_time__extract_quarter", "metric_time__extract_dow", "metric_time__extract_doy", "metric_time__extract_day", "metric_time__extract_week"]
   check_query: |
     SELECT
       SUM(1) AS bookings
       , {{ render_extract("ds", DatePart.QUARTER) }} AS metric_time__extract_quarter
-      , {{ render_extract("ds", DatePart.DAYOFWEEK) }} AS metric_time__extract_dayofweek
-      , {{ render_extract("ds", DatePart.DAYOFYEAR) }} AS metric_time__extract_dayofyear
+      , {{ render_extract("ds", DatePart.DAYOFWEEK) }} AS metric_time__extract_dow
+      , {{ render_extract("ds", DatePart.DAYOFYEAR) }} AS metric_time__extract_doy
       , {{ render_extract("ds", DatePart.DAY) }} AS metric_time__extract_day
       , {{ render_extract("ds", DatePart.WEEK) }} AS metric_time__extract_week
     FROM {{ source_schema }}.fct_bookings
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
index 390e922160..db7d8060c4 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
@@ -11,8 +11,8 @@ SELECT
   , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
   , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
   , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
@@ -23,8 +23,8 @@ SELECT
   , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
   , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
   , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
index 4a4b1f53f4..dd7ccdf1b3 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -11,8 +11,8 @@ SELECT
   , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
   , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
   , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
@@ -23,8 +23,8 @@ SELECT
   , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
   , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
   , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
@@ -36,8 +36,8 @@ SELECT
   , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
   , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
   , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
@@ -48,8 +48,8 @@ SELECT
   , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
   , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
   , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
index e3f2a1d31a..c62de83dc6 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS ds__extract_month
   , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS ds__extract_week
   , EXTRACT(DAY FROM users_latest_src_10008.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_doy
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
@@ -23,8 +23,8 @@ SELECT
   , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS user__ds__extract_month
   , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
   , EXTRACT(DAY FROM users_latest_src_10008.ds) AS user__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_doy
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
index e29686410d..289229a67a 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
@@ -253,20 +253,20 @@
                                     <!--    'time_granularity': TimeGranularity.DAY,  -->
                                     <!--    'date_part': <DatePart.DAY: 'day'>,       -->
                                     <!--    'aggregation_state': None}                -->
-                                    <!-- include_spec =                                      -->
-                                    <!--   {'class': 'TimeDimensionSpec',                    -->
-                                    <!--    'element_name': 'ds_partitioned',                -->
-                                    <!--    'entity_links': (),                              -->
-                                    <!--    'time_granularity': TimeGranularity.DAY,         -->
-                                    <!--    'date_part': <DatePart.DAYOFWEEK: 'dayofweek'>,  -->
-                                    <!--    'aggregation_state': None}                       -->
-                                    <!-- include_spec =                                      -->
-                                    <!--   {'class': 'TimeDimensionSpec',                    -->
-                                    <!--    'element_name': 'ds_partitioned',                -->
-                                    <!--    'entity_links': (),                              -->
-                                    <!--    'time_granularity': TimeGranularity.DAY,         -->
-                                    <!--    'date_part': <DatePart.DAYOFYEAR: 'dayofyear'>,  -->
-                                    <!--    'aggregation_state': None}                       -->
+                                    <!-- include_spec =                                -->
+                                    <!--   {'class': 'TimeDimensionSpec',              -->
+                                    <!--    'element_name': 'ds_partitioned',          -->
+                                    <!--    'entity_links': (),                        -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,   -->
+                                    <!--    'date_part': <DatePart.DAYOFWEEK: 'dow'>,  -->
+                                    <!--    'aggregation_state': None}                 -->
+                                    <!-- include_spec =                                -->
+                                    <!--   {'class': 'TimeDimensionSpec',              -->
+                                    <!--    'element_name': 'ds_partitioned',          -->
+                                    <!--    'entity_links': (),                        -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,   -->
+                                    <!--    'date_part': <DatePart.DAYOFYEAR: 'doy'>,  -->
+                                    <!--    'aggregation_state': None}                 -->
                                     <!-- include_spec =                                                                      -->
                                     <!--   {'class': 'TimeDimensionSpec',                                                    -->
                                     <!--    'element_name': 'ds_partitioned',                                                -->
@@ -342,14 +342,14 @@
                                     <!--    'element_name': 'ds_partitioned',                                                -->
                                     <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
                                     <!--    'time_granularity': TimeGranularity.DAY,                                         -->
-                                    <!--    'date_part': <DatePart.DAYOFWEEK: 'dayofweek'>,                                  -->
+                                    <!--    'date_part': <DatePart.DAYOFWEEK: 'dow'>,                                        -->
                                     <!--    'aggregation_state': None}                                                       -->
                                     <!-- include_spec =                                                                      -->
                                     <!--   {'class': 'TimeDimensionSpec',                                                    -->
                                     <!--    'element_name': 'ds_partitioned',                                                -->
                                     <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
                                     <!--    'time_granularity': TimeGranularity.DAY,                                         -->
-                                    <!--    'date_part': <DatePart.DAYOFYEAR: 'dayofyear'>,                                  -->
+                                    <!--    'date_part': <DatePart.DAYOFYEAR: 'doy'>,                                        -->
                                     <!--    'aggregation_state': None}                                                       -->
                                     <!-- include_spec = EntitySpec(element_name='customer_id', entity_links=()) -->
                                     <ReadSqlSourceNode>
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
index d2a3c6afd9..618f5f9d28 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -155,8 +155,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -167,8 +167,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -179,8 +179,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -192,8 +192,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -204,8 +204,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -216,8 +216,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -261,8 +261,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month
           , subq_5.ds__extract_week
           , subq_5.ds__extract_day
-          , subq_5.ds__extract_dayofweek
-          , subq_5.ds__extract_dayofyear
+          , subq_5.ds__extract_dow
+          , subq_5.ds__extract_doy
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
@@ -273,8 +273,8 @@ FULL OUTER JOIN (
           , subq_5.ds_partitioned__extract_month
           , subq_5.ds_partitioned__extract_week
           , subq_5.ds_partitioned__extract_day
-          , subq_5.ds_partitioned__extract_dayofweek
-          , subq_5.ds_partitioned__extract_dayofyear
+          , subq_5.ds_partitioned__extract_dow
+          , subq_5.ds_partitioned__extract_doy
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
@@ -285,8 +285,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month
           , subq_5.paid_at__extract_week
           , subq_5.paid_at__extract_day
-          , subq_5.paid_at__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear
+          , subq_5.paid_at__extract_dow
+          , subq_5.paid_at__extract_doy
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
@@ -297,8 +297,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds__extract_month
           , subq_5.booking__ds__extract_week
           , subq_5.booking__ds__extract_day
-          , subq_5.booking__ds__extract_dayofweek
-          , subq_5.booking__ds__extract_dayofyear
+          , subq_5.booking__ds__extract_dow
+          , subq_5.booking__ds__extract_doy
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
@@ -309,8 +309,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds_partitioned__extract_month
           , subq_5.booking__ds_partitioned__extract_week
           , subq_5.booking__ds_partitioned__extract_day
-          , subq_5.booking__ds_partitioned__extract_dayofweek
-          , subq_5.booking__ds_partitioned__extract_dayofyear
+          , subq_5.booking__ds_partitioned__extract_dow
+          , subq_5.booking__ds_partitioned__extract_doy
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
@@ -321,8 +321,8 @@ FULL OUTER JOIN (
           , subq_5.booking__paid_at__extract_month
           , subq_5.booking__paid_at__extract_week
           , subq_5.booking__paid_at__extract_day
-          , subq_5.booking__paid_at__extract_dayofweek
-          , subq_5.booking__paid_at__extract_dayofyear
+          , subq_5.booking__paid_at__extract_dow
+          , subq_5.booking__paid_at__extract_doy
           , subq_5.ds__day AS metric_time__day
           , subq_5.ds__week AS metric_time__week
           , subq_5.ds__month AS metric_time__month
@@ -333,8 +333,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month AS metric_time__extract_month
           , subq_5.ds__extract_week AS metric_time__extract_week
           , subq_5.ds__extract_day AS metric_time__extract_day
-          , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_5.ds__extract_dow AS metric_time__extract_dow
+          , subq_5.ds__extract_doy AS metric_time__extract_doy
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
@@ -384,8 +384,8 @@ FULL OUTER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -396,8 +396,8 @@ FULL OUTER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -408,8 +408,8 @@ FULL OUTER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -421,8 +421,8 @@ FULL OUTER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -433,8 +433,8 @@ FULL OUTER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -445,8 +445,8 @@ FULL OUTER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql
index c80b16baf0..70db1edf09 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql
@@ -49,8 +49,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -61,8 +61,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -73,8 +73,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -86,8 +86,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -98,8 +98,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -110,8 +110,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -143,8 +143,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -155,8 +155,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -170,8 +170,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -182,8 +182,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index c45302afaf..350c29d01e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -56,8 +56,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -68,8 +68,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -80,8 +80,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -92,8 +92,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -104,8 +104,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -116,8 +116,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -128,8 +128,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -179,8 +179,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -191,8 +191,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -203,8 +203,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -216,8 +216,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -228,8 +228,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -240,8 +240,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -271,8 +271,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -283,8 +283,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -295,8 +295,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -307,8 +307,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -319,8 +319,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -349,8 +349,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -361,8 +361,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -376,8 +376,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -388,8 +388,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -455,8 +455,8 @@ FROM (
                 , subq_10.ds__extract_month
                 , subq_10.ds__extract_week
                 , subq_10.ds__extract_day
-                , subq_10.ds__extract_dayofweek
-                , subq_10.ds__extract_dayofyear
+                , subq_10.ds__extract_dow
+                , subq_10.ds__extract_doy
                 , subq_10.ds_partitioned__day
                 , subq_10.ds_partitioned__week
                 , subq_10.ds_partitioned__month
@@ -467,8 +467,8 @@ FROM (
                 , subq_10.ds_partitioned__extract_month
                 , subq_10.ds_partitioned__extract_week
                 , subq_10.ds_partitioned__extract_day
-                , subq_10.ds_partitioned__extract_dayofweek
-                , subq_10.ds_partitioned__extract_dayofyear
+                , subq_10.ds_partitioned__extract_dow
+                , subq_10.ds_partitioned__extract_doy
                 , subq_10.view__ds__day
                 , subq_10.view__ds__week
                 , subq_10.view__ds__month
@@ -479,8 +479,8 @@ FROM (
                 , subq_10.view__ds__extract_month
                 , subq_10.view__ds__extract_week
                 , subq_10.view__ds__extract_day
-                , subq_10.view__ds__extract_dayofweek
-                , subq_10.view__ds__extract_dayofyear
+                , subq_10.view__ds__extract_dow
+                , subq_10.view__ds__extract_doy
                 , subq_10.view__ds_partitioned__day
                 , subq_10.view__ds_partitioned__week
                 , subq_10.view__ds_partitioned__month
@@ -491,8 +491,8 @@ FROM (
                 , subq_10.view__ds_partitioned__extract_month
                 , subq_10.view__ds_partitioned__extract_week
                 , subq_10.view__ds_partitioned__extract_day
-                , subq_10.view__ds_partitioned__extract_dayofweek
-                , subq_10.view__ds_partitioned__extract_dayofyear
+                , subq_10.view__ds_partitioned__extract_dow
+                , subq_10.view__ds_partitioned__extract_doy
                 , subq_10.ds__day AS metric_time__day
                 , subq_10.ds__week AS metric_time__week
                 , subq_10.ds__month AS metric_time__month
@@ -503,8 +503,8 @@ FROM (
                 , subq_10.ds__extract_month AS metric_time__extract_month
                 , subq_10.ds__extract_week AS metric_time__extract_week
                 , subq_10.ds__extract_day AS metric_time__extract_day
-                , subq_10.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_10.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_10.ds__extract_dow AS metric_time__extract_dow
+                , subq_10.ds__extract_doy AS metric_time__extract_doy
                 , subq_10.listing
                 , subq_10.user
                 , subq_10.view__listing
@@ -524,8 +524,8 @@ FROM (
                   , EXTRACT(MONTH FROM views_source_src_10009.ds) AS ds__extract_month
                   , EXTRACT(WEEK FROM views_source_src_10009.ds) AS ds__extract_week
                   , EXTRACT(DAY FROM views_source_src_10009.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS ds_partitioned__month
@@ -536,8 +536,8 @@ FROM (
                   , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_doy
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC('week', views_source_src_10009.ds) AS view__ds__week
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS view__ds__month
@@ -548,8 +548,8 @@ FROM (
                   , EXTRACT(MONTH FROM views_source_src_10009.ds) AS view__ds__extract_month
                   , EXTRACT(WEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
                   , EXTRACT(DAY FROM views_source_src_10009.ds) AS view__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__month
@@ -560,8 +560,8 @@ FROM (
                   , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
                   , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_doy
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -589,8 +589,8 @@ FROM (
                 , subq_13.ds__extract_month
                 , subq_13.ds__extract_week
                 , subq_13.ds__extract_day
-                , subq_13.ds__extract_dayofweek
-                , subq_13.ds__extract_dayofyear
+                , subq_13.ds__extract_dow
+                , subq_13.ds__extract_doy
                 , subq_13.created_at__day
                 , subq_13.created_at__week
                 , subq_13.created_at__month
@@ -601,8 +601,8 @@ FROM (
                 , subq_13.created_at__extract_month
                 , subq_13.created_at__extract_week
                 , subq_13.created_at__extract_day
-                , subq_13.created_at__extract_dayofweek
-                , subq_13.created_at__extract_dayofyear
+                , subq_13.created_at__extract_dow
+                , subq_13.created_at__extract_doy
                 , subq_13.listing__ds__day
                 , subq_13.listing__ds__week
                 , subq_13.listing__ds__month
@@ -613,8 +613,8 @@ FROM (
                 , subq_13.listing__ds__extract_month
                 , subq_13.listing__ds__extract_week
                 , subq_13.listing__ds__extract_day
-                , subq_13.listing__ds__extract_dayofweek
-                , subq_13.listing__ds__extract_dayofyear
+                , subq_13.listing__ds__extract_dow
+                , subq_13.listing__ds__extract_doy
                 , subq_13.listing__created_at__day
                 , subq_13.listing__created_at__week
                 , subq_13.listing__created_at__month
@@ -625,8 +625,8 @@ FROM (
                 , subq_13.listing__created_at__extract_month
                 , subq_13.listing__created_at__extract_week
                 , subq_13.listing__created_at__extract_day
-                , subq_13.listing__created_at__extract_dayofweek
-                , subq_13.listing__created_at__extract_dayofyear
+                , subq_13.listing__created_at__extract_dow
+                , subq_13.listing__created_at__extract_doy
                 , subq_13.ds__day AS metric_time__day
                 , subq_13.ds__week AS metric_time__week
                 , subq_13.ds__month AS metric_time__month
@@ -637,8 +637,8 @@ FROM (
                 , subq_13.ds__extract_month AS metric_time__extract_month
                 , subq_13.ds__extract_week AS metric_time__extract_week
                 , subq_13.ds__extract_day AS metric_time__extract_day
-                , subq_13.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_13.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_13.ds__extract_dow AS metric_time__extract_dow
+                , subq_13.ds__extract_doy AS metric_time__extract_doy
                 , subq_13.listing
                 , subq_13.user
                 , subq_13.listing__user
@@ -667,8 +667,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -679,8 +679,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -694,8 +694,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -706,8 +706,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index a56183e745..6cae314057 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -52,8 +52,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -64,8 +64,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -76,8 +76,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -89,8 +89,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -101,8 +101,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -113,8 +113,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -146,8 +146,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -158,8 +158,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -173,8 +173,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -185,8 +185,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
index b6f01861d7..26ccf221dd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
@@ -49,8 +49,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -61,8 +61,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -73,8 +73,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -86,8 +86,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -98,8 +98,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -110,8 +110,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -143,8 +143,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -155,8 +155,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -170,8 +170,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -182,8 +182,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql
index d480357663..3de0908e02 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql
@@ -43,8 +43,8 @@ FROM (
         , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
         , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
         , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -55,8 +55,8 @@ FROM (
         , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
         , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
         , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -67,8 +67,8 @@ FROM (
         , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
         , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
         , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -80,8 +80,8 @@ FROM (
         , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
         , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
         , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -92,8 +92,8 @@ FROM (
         , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
         , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
         , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -104,8 +104,8 @@ FROM (
         , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
         , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
         , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
index ad08f90e35..ac35263413 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -69,8 +69,8 @@ FROM (
           , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
           , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
           , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
@@ -81,8 +81,8 @@ FROM (
           , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
           , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
           , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
index 8c2ab1a915..abf31492df 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -69,8 +69,8 @@ FROM (
           , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
           , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
           , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
@@ -81,8 +81,8 @@ FROM (
           , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
           , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
           , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
index 8d5b07c69a..20b5cb5156 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
@@ -23,8 +23,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -35,8 +35,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -47,8 +47,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -66,8 +66,8 @@ FROM (
           , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
           , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
           , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
@@ -78,8 +78,8 @@ FROM (
           , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
           , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
           , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
index d98f0f554a..aee104bfff 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -69,8 +69,8 @@ FROM (
           , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
           , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
           , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
@@ -81,8 +81,8 @@ FROM (
           , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
           , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
           , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 26ab44afcc..7ba9208a6a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_1.ds__extract_month
         , subq_1.ds__extract_week
         , subq_1.ds__extract_day
-        , subq_1.ds__extract_dayofweek
-        , subq_1.ds__extract_dayofyear
+        , subq_1.ds__extract_dow
+        , subq_1.ds__extract_doy
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_1.company__ds__extract_month
         , subq_1.company__ds__extract_week
         , subq_1.company__ds__extract_day
-        , subq_1.company__ds__extract_dayofweek
-        , subq_1.company__ds__extract_dayofyear
+        , subq_1.company__ds__extract_dow
+        , subq_1.company__ds__extract_doy
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_1.metric_time__extract_month
         , subq_1.metric_time__extract_week
         , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dayofweek
-        , subq_1.metric_time__extract_dayofyear
+        , subq_1.metric_time__extract_dow
+        , subq_1.metric_time__extract_doy
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -68,8 +68,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.company__ds__extract_month
           , subq_0.company__ds__extract_week
           , subq_0.company__ds__extract_day
-          , subq_0.company__ds__extract_dayofweek
-          , subq_0.company__ds__extract_dayofyear
+          , subq_0.company__ds__extract_dow
+          , subq_0.company__ds__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
@@ -111,8 +111,8 @@ FROM (
             , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
             , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
             , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
@@ -123,8 +123,8 @@ FROM (
             , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
             , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
             , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
index a670ac2189..788131918a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_1.ds__extract_month
         , subq_1.ds__extract_week
         , subq_1.ds__extract_day
-        , subq_1.ds__extract_dayofweek
-        , subq_1.ds__extract_dayofyear
+        , subq_1.ds__extract_dow
+        , subq_1.ds__extract_doy
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_1.company__ds__extract_month
         , subq_1.company__ds__extract_week
         , subq_1.company__ds__extract_day
-        , subq_1.company__ds__extract_dayofweek
-        , subq_1.company__ds__extract_dayofyear
+        , subq_1.company__ds__extract_dow
+        , subq_1.company__ds__extract_doy
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_1.metric_time__extract_month
         , subq_1.metric_time__extract_week
         , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dayofweek
-        , subq_1.metric_time__extract_dayofyear
+        , subq_1.metric_time__extract_dow
+        , subq_1.metric_time__extract_doy
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -68,8 +68,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.company__ds__extract_month
           , subq_0.company__ds__extract_week
           , subq_0.company__ds__extract_day
-          , subq_0.company__ds__extract_dayofweek
-          , subq_0.company__ds__extract_dayofyear
+          , subq_0.company__ds__extract_dow
+          , subq_0.company__ds__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
@@ -111,8 +111,8 @@ FROM (
             , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
             , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
             , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
@@ -123,8 +123,8 @@ FROM (
             , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
             , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
             , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
index 3d88c96009..09e9a7df29 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -160,8 +160,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -172,8 +172,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -184,8 +184,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -197,8 +197,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -209,8 +209,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -221,8 +221,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -266,8 +266,8 @@ FROM (
             , subq_5.ds__extract_month
             , subq_5.ds__extract_week
             , subq_5.ds__extract_day
-            , subq_5.ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear
+            , subq_5.ds__extract_dow
+            , subq_5.ds__extract_doy
             , subq_5.ds_partitioned__day
             , subq_5.ds_partitioned__week
             , subq_5.ds_partitioned__month
@@ -278,8 +278,8 @@ FROM (
             , subq_5.ds_partitioned__extract_month
             , subq_5.ds_partitioned__extract_week
             , subq_5.ds_partitioned__extract_day
-            , subq_5.ds_partitioned__extract_dayofweek
-            , subq_5.ds_partitioned__extract_dayofyear
+            , subq_5.ds_partitioned__extract_dow
+            , subq_5.ds_partitioned__extract_doy
             , subq_5.paid_at__day
             , subq_5.paid_at__week
             , subq_5.paid_at__month
@@ -290,8 +290,8 @@ FROM (
             , subq_5.paid_at__extract_month
             , subq_5.paid_at__extract_week
             , subq_5.paid_at__extract_day
-            , subq_5.paid_at__extract_dayofweek
-            , subq_5.paid_at__extract_dayofyear
+            , subq_5.paid_at__extract_dow
+            , subq_5.paid_at__extract_doy
             , subq_5.booking__ds__day
             , subq_5.booking__ds__week
             , subq_5.booking__ds__month
@@ -302,8 +302,8 @@ FROM (
             , subq_5.booking__ds__extract_month
             , subq_5.booking__ds__extract_week
             , subq_5.booking__ds__extract_day
-            , subq_5.booking__ds__extract_dayofweek
-            , subq_5.booking__ds__extract_dayofyear
+            , subq_5.booking__ds__extract_dow
+            , subq_5.booking__ds__extract_doy
             , subq_5.booking__ds_partitioned__day
             , subq_5.booking__ds_partitioned__week
             , subq_5.booking__ds_partitioned__month
@@ -314,8 +314,8 @@ FROM (
             , subq_5.booking__ds_partitioned__extract_month
             , subq_5.booking__ds_partitioned__extract_week
             , subq_5.booking__ds_partitioned__extract_day
-            , subq_5.booking__ds_partitioned__extract_dayofweek
-            , subq_5.booking__ds_partitioned__extract_dayofyear
+            , subq_5.booking__ds_partitioned__extract_dow
+            , subq_5.booking__ds_partitioned__extract_doy
             , subq_5.booking__paid_at__day
             , subq_5.booking__paid_at__week
             , subq_5.booking__paid_at__month
@@ -326,8 +326,8 @@ FROM (
             , subq_5.booking__paid_at__extract_month
             , subq_5.booking__paid_at__extract_week
             , subq_5.booking__paid_at__extract_day
-            , subq_5.booking__paid_at__extract_dayofweek
-            , subq_5.booking__paid_at__extract_dayofyear
+            , subq_5.booking__paid_at__extract_dow
+            , subq_5.booking__paid_at__extract_doy
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -338,8 +338,8 @@ FROM (
             , subq_5.ds__extract_month AS metric_time__extract_month
             , subq_5.ds__extract_week AS metric_time__extract_week
             , subq_5.ds__extract_day AS metric_time__extract_day
-            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_5.ds__extract_dow AS metric_time__extract_dow
+            , subq_5.ds__extract_doy AS metric_time__extract_doy
             , subq_5.listing
             , subq_5.guest
             , subq_5.host
@@ -389,8 +389,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -401,8 +401,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -413,8 +413,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -426,8 +426,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -438,8 +438,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -450,8 +450,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
index e2ff275b47..2f56bdd23c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -160,8 +160,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -172,8 +172,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -184,8 +184,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -197,8 +197,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -209,8 +209,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -221,8 +221,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -492,8 +492,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -504,8 +504,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -516,8 +516,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -529,8 +529,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -541,8 +541,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -553,8 +553,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 13d462ce84..c6aea810c4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -160,8 +160,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -172,8 +172,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -184,8 +184,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -197,8 +197,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -209,8 +209,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -221,8 +221,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -492,8 +492,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -504,8 +504,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -516,8 +516,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -529,8 +529,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -541,8 +541,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -553,8 +553,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
index 7763daf079..0596eaabd8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -160,8 +160,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -172,8 +172,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -184,8 +184,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -197,8 +197,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -209,8 +209,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -221,8 +221,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -492,8 +492,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -504,8 +504,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -516,8 +516,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -529,8 +529,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -541,8 +541,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -553,8 +553,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 8a1592b8e5..27218c34d0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -160,8 +160,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -172,8 +172,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -184,8 +184,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -197,8 +197,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -209,8 +209,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -221,8 +221,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -492,8 +492,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -504,8 +504,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -516,8 +516,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -529,8 +529,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -541,8 +541,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -553,8 +553,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 793e7f674c..539423b5b3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -38,8 +38,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -50,8 +50,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -62,8 +62,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -74,8 +74,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -86,8 +86,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -98,8 +98,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -140,8 +140,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -152,8 +152,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -164,8 +164,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -176,8 +176,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -188,8 +188,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -200,8 +200,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -212,8 +212,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -263,8 +263,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -275,8 +275,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -287,8 +287,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -300,8 +300,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -312,8 +312,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -324,8 +324,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -373,8 +373,8 @@ FROM (
             , subq_9.ds__extract_month AS ds__extract_month
             , subq_9.ds__extract_week AS ds__extract_week
             , subq_9.ds__extract_day AS ds__extract_day
-            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_9.ds__extract_dow AS ds__extract_dow
+            , subq_9.ds__extract_doy AS ds__extract_doy
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
@@ -385,8 +385,8 @@ FROM (
             , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_9.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_9.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
@@ -397,8 +397,8 @@ FROM (
             , subq_9.paid_at__extract_month AS paid_at__extract_month
             , subq_9.paid_at__extract_week AS paid_at__extract_week
             , subq_9.paid_at__extract_day AS paid_at__extract_day
-            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_9.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_9.paid_at__extract_doy AS paid_at__extract_doy
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
@@ -409,8 +409,8 @@ FROM (
             , subq_9.booking__ds__extract_month AS booking__ds__extract_month
             , subq_9.booking__ds__extract_week AS booking__ds__extract_week
             , subq_9.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_9.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_9.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -421,8 +421,8 @@ FROM (
             , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_9.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_9.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
@@ -433,8 +433,8 @@ FROM (
             , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_9.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_9.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -475,8 +475,8 @@ FROM (
               , subq_8.ds__extract_month
               , subq_8.ds__extract_week
               , subq_8.ds__extract_day
-              , subq_8.ds__extract_dayofweek
-              , subq_8.ds__extract_dayofyear
+              , subq_8.ds__extract_dow
+              , subq_8.ds__extract_doy
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
@@ -487,8 +487,8 @@ FROM (
               , subq_8.ds_partitioned__extract_month
               , subq_8.ds_partitioned__extract_week
               , subq_8.ds_partitioned__extract_day
-              , subq_8.ds_partitioned__extract_dayofweek
-              , subq_8.ds_partitioned__extract_dayofyear
+              , subq_8.ds_partitioned__extract_dow
+              , subq_8.ds_partitioned__extract_doy
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
@@ -499,8 +499,8 @@ FROM (
               , subq_8.paid_at__extract_month
               , subq_8.paid_at__extract_week
               , subq_8.paid_at__extract_day
-              , subq_8.paid_at__extract_dayofweek
-              , subq_8.paid_at__extract_dayofyear
+              , subq_8.paid_at__extract_dow
+              , subq_8.paid_at__extract_doy
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
@@ -511,8 +511,8 @@ FROM (
               , subq_8.booking__ds__extract_month
               , subq_8.booking__ds__extract_week
               , subq_8.booking__ds__extract_day
-              , subq_8.booking__ds__extract_dayofweek
-              , subq_8.booking__ds__extract_dayofyear
+              , subq_8.booking__ds__extract_dow
+              , subq_8.booking__ds__extract_doy
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
@@ -523,8 +523,8 @@ FROM (
               , subq_8.booking__ds_partitioned__extract_month
               , subq_8.booking__ds_partitioned__extract_week
               , subq_8.booking__ds_partitioned__extract_day
-              , subq_8.booking__ds_partitioned__extract_dayofweek
-              , subq_8.booking__ds_partitioned__extract_dayofyear
+              , subq_8.booking__ds_partitioned__extract_dow
+              , subq_8.booking__ds_partitioned__extract_doy
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
@@ -535,8 +535,8 @@ FROM (
               , subq_8.booking__paid_at__extract_month
               , subq_8.booking__paid_at__extract_week
               , subq_8.booking__paid_at__extract_day
-              , subq_8.booking__paid_at__extract_dayofweek
-              , subq_8.booking__paid_at__extract_dayofyear
+              , subq_8.booking__paid_at__extract_dow
+              , subq_8.booking__paid_at__extract_doy
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -547,8 +547,8 @@ FROM (
               , subq_8.ds__extract_month AS metric_time__extract_month
               , subq_8.ds__extract_week AS metric_time__extract_week
               , subq_8.ds__extract_day AS metric_time__extract_day
-              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_8.ds__extract_dow AS metric_time__extract_dow
+              , subq_8.ds__extract_doy AS metric_time__extract_doy
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
@@ -598,8 +598,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -610,8 +610,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -622,8 +622,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -635,8 +635,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -647,8 +647,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -659,8 +659,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index fd2a08f4dc..62ac8e39b4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -38,8 +38,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -50,8 +50,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -62,8 +62,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -74,8 +74,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -86,8 +86,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -98,8 +98,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -140,8 +140,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -152,8 +152,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -164,8 +164,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -176,8 +176,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -188,8 +188,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -200,8 +200,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -212,8 +212,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -263,8 +263,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -275,8 +275,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -287,8 +287,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -300,8 +300,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -312,8 +312,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -324,8 +324,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -374,8 +374,8 @@ FROM (
             , subq_9.ds__extract_month AS ds__extract_month
             , subq_9.ds__extract_week AS ds__extract_week
             , subq_9.ds__extract_day AS ds__extract_day
-            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_9.ds__extract_dow AS ds__extract_dow
+            , subq_9.ds__extract_doy AS ds__extract_doy
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
@@ -386,8 +386,8 @@ FROM (
             , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_9.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_9.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
@@ -398,8 +398,8 @@ FROM (
             , subq_9.paid_at__extract_month AS paid_at__extract_month
             , subq_9.paid_at__extract_week AS paid_at__extract_week
             , subq_9.paid_at__extract_day AS paid_at__extract_day
-            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_9.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_9.paid_at__extract_doy AS paid_at__extract_doy
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
@@ -410,8 +410,8 @@ FROM (
             , subq_9.booking__ds__extract_month AS booking__ds__extract_month
             , subq_9.booking__ds__extract_week AS booking__ds__extract_week
             , subq_9.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_9.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_9.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -422,8 +422,8 @@ FROM (
             , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_9.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_9.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
@@ -434,8 +434,8 @@ FROM (
             , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_9.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_9.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -476,8 +476,8 @@ FROM (
               , subq_8.ds__extract_month
               , subq_8.ds__extract_week
               , subq_8.ds__extract_day
-              , subq_8.ds__extract_dayofweek
-              , subq_8.ds__extract_dayofyear
+              , subq_8.ds__extract_dow
+              , subq_8.ds__extract_doy
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
@@ -488,8 +488,8 @@ FROM (
               , subq_8.ds_partitioned__extract_month
               , subq_8.ds_partitioned__extract_week
               , subq_8.ds_partitioned__extract_day
-              , subq_8.ds_partitioned__extract_dayofweek
-              , subq_8.ds_partitioned__extract_dayofyear
+              , subq_8.ds_partitioned__extract_dow
+              , subq_8.ds_partitioned__extract_doy
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
@@ -500,8 +500,8 @@ FROM (
               , subq_8.paid_at__extract_month
               , subq_8.paid_at__extract_week
               , subq_8.paid_at__extract_day
-              , subq_8.paid_at__extract_dayofweek
-              , subq_8.paid_at__extract_dayofyear
+              , subq_8.paid_at__extract_dow
+              , subq_8.paid_at__extract_doy
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
@@ -512,8 +512,8 @@ FROM (
               , subq_8.booking__ds__extract_month
               , subq_8.booking__ds__extract_week
               , subq_8.booking__ds__extract_day
-              , subq_8.booking__ds__extract_dayofweek
-              , subq_8.booking__ds__extract_dayofyear
+              , subq_8.booking__ds__extract_dow
+              , subq_8.booking__ds__extract_doy
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
@@ -524,8 +524,8 @@ FROM (
               , subq_8.booking__ds_partitioned__extract_month
               , subq_8.booking__ds_partitioned__extract_week
               , subq_8.booking__ds_partitioned__extract_day
-              , subq_8.booking__ds_partitioned__extract_dayofweek
-              , subq_8.booking__ds_partitioned__extract_dayofyear
+              , subq_8.booking__ds_partitioned__extract_dow
+              , subq_8.booking__ds_partitioned__extract_doy
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
@@ -536,8 +536,8 @@ FROM (
               , subq_8.booking__paid_at__extract_month
               , subq_8.booking__paid_at__extract_week
               , subq_8.booking__paid_at__extract_day
-              , subq_8.booking__paid_at__extract_dayofweek
-              , subq_8.booking__paid_at__extract_dayofyear
+              , subq_8.booking__paid_at__extract_dow
+              , subq_8.booking__paid_at__extract_doy
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -548,8 +548,8 @@ FROM (
               , subq_8.ds__extract_month AS metric_time__extract_month
               , subq_8.ds__extract_week AS metric_time__extract_week
               , subq_8.ds__extract_day AS metric_time__extract_day
-              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_8.ds__extract_dow AS metric_time__extract_dow
+              , subq_8.ds__extract_doy AS metric_time__extract_doy
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
@@ -599,8 +599,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -611,8 +611,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -623,8 +623,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -636,8 +636,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -648,8 +648,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -660,8 +660,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
index 9ff5c7ed82..23ad4fab94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_4.ds__extract_month AS ds__extract_month
           , subq_4.ds__extract_week AS ds__extract_week
           , subq_4.ds__extract_day AS ds__extract_day
-          , subq_4.ds__extract_dayofweek AS ds__extract_dayofweek
-          , subq_4.ds__extract_dayofyear AS ds__extract_dayofyear
+          , subq_4.ds__extract_dow AS ds__extract_dow
+          , subq_4.ds__extract_doy AS ds__extract_doy
           , subq_4.ds_partitioned__day AS ds_partitioned__day
           , subq_4.ds_partitioned__week AS ds_partitioned__week
           , subq_4.ds_partitioned__month AS ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_4.ds_partitioned__extract_month AS ds_partitioned__extract_month
           , subq_4.ds_partitioned__extract_week AS ds_partitioned__extract_week
           , subq_4.ds_partitioned__extract_day AS ds_partitioned__extract_day
-          , subq_4.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-          , subq_4.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+          , subq_4.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+          , subq_4.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
           , subq_4.paid_at__day AS paid_at__day
           , subq_4.paid_at__week AS paid_at__week
           , subq_4.paid_at__month AS paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_4.paid_at__extract_month AS paid_at__extract_month
           , subq_4.paid_at__extract_week AS paid_at__extract_week
           , subq_4.paid_at__extract_day AS paid_at__extract_day
-          , subq_4.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-          , subq_4.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+          , subq_4.paid_at__extract_dow AS paid_at__extract_dow
+          , subq_4.paid_at__extract_doy AS paid_at__extract_doy
           , subq_4.booking__ds__day AS booking__ds__day
           , subq_4.booking__ds__week AS booking__ds__week
           , subq_4.booking__ds__month AS booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_4.booking__ds__extract_month AS booking__ds__extract_month
           , subq_4.booking__ds__extract_week AS booking__ds__extract_week
           , subq_4.booking__ds__extract_day AS booking__ds__extract_day
-          , subq_4.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-          , subq_4.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+          , subq_4.booking__ds__extract_dow AS booking__ds__extract_dow
+          , subq_4.booking__ds__extract_doy AS booking__ds__extract_doy
           , subq_4.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_4.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_4.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_4.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
           , subq_4.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
           , subq_4.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-          , subq_4.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-          , subq_4.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+          , subq_4.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+          , subq_4.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
           , subq_4.booking__paid_at__day AS booking__paid_at__day
           , subq_4.booking__paid_at__week AS booking__paid_at__week
           , subq_4.booking__paid_at__month AS booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_4.booking__paid_at__extract_month AS booking__paid_at__extract_month
           , subq_4.booking__paid_at__extract_week AS booking__paid_at__extract_week
           , subq_4.booking__paid_at__extract_day AS booking__paid_at__extract_day
-          , subq_4.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-          , subq_4.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+          , subq_4.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+          , subq_4.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
           , subq_4.listing AS listing
           , subq_4.guest AS guest
           , subq_4.host AS host
@@ -135,8 +135,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -147,8 +147,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -159,8 +159,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -171,8 +171,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -183,8 +183,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -195,8 +195,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.metric_time__week AS metric_time__week
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
@@ -206,8 +206,8 @@ FROM (
             , subq_1.metric_time__extract_month AS metric_time__extract_month
             , subq_1.metric_time__extract_week AS metric_time__extract_week
             , subq_1.metric_time__extract_day AS metric_time__extract_day
-            , subq_1.metric_time__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_1.metric_time__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_1.metric_time__extract_dow AS metric_time__extract_dow
+            , subq_1.metric_time__extract_doy AS metric_time__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -248,8 +248,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -260,8 +260,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -272,8 +272,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -284,8 +284,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -296,8 +296,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -308,8 +308,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -320,8 +320,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -371,8 +371,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -383,8 +383,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -395,8 +395,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -408,8 +408,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -420,8 +420,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -432,8 +432,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 781610f066..6c3c772ab7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_1.ds__extract_month AS ds__extract_month
           , subq_1.ds__extract_week AS ds__extract_week
           , subq_1.ds__extract_day AS ds__extract_day
-          , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-          , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+          , subq_1.ds__extract_dow AS ds__extract_dow
+          , subq_1.ds__extract_doy AS ds__extract_doy
           , subq_1.ds_partitioned__day AS ds_partitioned__day
           , subq_1.ds_partitioned__week AS ds_partitioned__week
           , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
           , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
           , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-          , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-          , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+          , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+          , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
           , subq_1.paid_at__day AS paid_at__day
           , subq_1.paid_at__week AS paid_at__week
           , subq_1.paid_at__month AS paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_1.paid_at__extract_month AS paid_at__extract_month
           , subq_1.paid_at__extract_week AS paid_at__extract_week
           , subq_1.paid_at__extract_day AS paid_at__extract_day
-          , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-          , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+          , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+          , subq_1.paid_at__extract_doy AS paid_at__extract_doy
           , subq_1.booking__ds__day AS booking__ds__day
           , subq_1.booking__ds__week AS booking__ds__week
           , subq_1.booking__ds__month AS booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_1.booking__ds__extract_month AS booking__ds__extract_month
           , subq_1.booking__ds__extract_week AS booking__ds__extract_week
           , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-          , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-          , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+          , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+          , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
           , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
           , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
           , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-          , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-          , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+          , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+          , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
           , subq_1.booking__paid_at__day AS booking__paid_at__day
           , subq_1.booking__paid_at__week AS booking__paid_at__week
           , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
           , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
           , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-          , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-          , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+          , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+          , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
           , subq_1.listing AS listing
           , subq_1.guest AS guest
           , subq_1.host AS host
@@ -134,8 +134,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -146,8 +146,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -158,8 +158,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -170,8 +170,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -182,8 +182,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -194,8 +194,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -206,8 +206,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -257,8 +257,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -269,8 +269,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -281,8 +281,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -294,8 +294,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -306,8 +306,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -318,8 +318,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
index 693e200db3..dae3f52e98 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
@@ -47,8 +47,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -59,8 +59,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -71,8 +71,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -83,8 +83,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -95,8 +95,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -107,8 +107,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -119,8 +119,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -170,8 +170,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -182,8 +182,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -194,8 +194,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -207,8 +207,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -219,8 +219,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -231,8 +231,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -262,8 +262,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -274,8 +274,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -286,8 +286,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -298,8 +298,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -310,8 +310,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -340,8 +340,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -352,8 +352,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -367,8 +367,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -379,8 +379,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql
index 00efad0383..395033b94a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql
@@ -30,8 +30,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -42,8 +42,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -54,8 +54,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -67,8 +67,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -79,8 +79,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -91,8 +91,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
index 7e0fdff19e..18c852b528 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
@@ -36,8 +36,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -48,8 +48,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -60,8 +60,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -73,8 +73,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 1a6844636c..028e45452a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -53,8 +53,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -65,8 +65,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -77,8 +77,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -89,8 +89,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -101,8 +101,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -113,8 +113,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -125,8 +125,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -176,8 +176,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -188,8 +188,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -200,8 +200,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -213,8 +213,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -225,8 +225,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -237,8 +237,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -268,8 +268,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -280,8 +280,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -292,8 +292,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -304,8 +304,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -316,8 +316,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -346,8 +346,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -358,8 +358,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -373,8 +373,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -385,8 +385,8 @@ FROM (
                   , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
                   , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
                   , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
index 5712e1d25c..c2f4c8e617 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
@@ -55,8 +55,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -67,8 +67,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -79,8 +79,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -91,8 +91,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -103,8 +103,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -115,8 +115,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -127,8 +127,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -164,8 +164,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
@@ -176,8 +176,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
@@ -188,8 +188,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
@@ -201,8 +201,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
@@ -213,8 +213,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
@@ -225,8 +225,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -260,8 +260,8 @@ FROM (
                 , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
                 , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
                 , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dow
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_doy
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
@@ -272,8 +272,8 @@ FROM (
                 , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
                 , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
                 , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dow
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_doy
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -287,8 +287,8 @@ FROM (
                 , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
                 , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
                 , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
@@ -299,8 +299,8 @@ FROM (
                 , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
                 , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
                 , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 141c4fba09..56ed62001f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -165,8 +165,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -177,8 +177,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -189,8 +189,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -202,8 +202,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -214,8 +214,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -226,8 +226,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 093b149ba2..7dafb98791 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -165,8 +165,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -177,8 +177,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -189,8 +189,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -202,8 +202,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -214,8 +214,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -226,8 +226,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
index 7c85ab1cdb..5bf86bf052 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -165,8 +165,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -177,8 +177,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -189,8 +189,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -202,8 +202,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -214,8 +214,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -226,8 +226,8 @@ INNER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
index e89a957806..1680cc5146 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
@@ -31,8 +31,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -43,8 +43,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -55,8 +55,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -67,8 +67,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -79,8 +79,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -91,8 +91,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -103,8 +103,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -154,8 +154,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -166,8 +166,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -178,8 +178,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -191,8 +191,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -203,8 +203,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -215,8 +215,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
index 436f0e7545..909e22c61e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.created_at__day
         , subq_0.created_at__week
         , subq_0.created_at__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.created_at__extract_month
         , subq_0.created_at__extract_week
         , subq_0.created_at__extract_day
-        , subq_0.created_at__extract_dayofweek
-        , subq_0.created_at__extract_dayofyear
+        , subq_0.created_at__extract_dow
+        , subq_0.created_at__extract_doy
         , subq_0.listing__ds__day
         , subq_0.listing__ds__week
         , subq_0.listing__ds__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.listing__ds__extract_month
         , subq_0.listing__ds__extract_week
         , subq_0.listing__ds__extract_day
-        , subq_0.listing__ds__extract_dayofweek
-        , subq_0.listing__ds__extract_dayofyear
+        , subq_0.listing__ds__extract_dow
+        , subq_0.listing__ds__extract_doy
         , subq_0.listing__created_at__day
         , subq_0.listing__created_at__week
         , subq_0.listing__created_at__month
@@ -62,8 +62,8 @@ FROM (
         , subq_0.listing__created_at__extract_month
         , subq_0.listing__created_at__extract_week
         , subq_0.listing__created_at__extract_day
-        , subq_0.listing__created_at__extract_dayofweek
-        , subq_0.listing__created_at__extract_dayofyear
+        , subq_0.listing__created_at__extract_dow
+        , subq_0.listing__created_at__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -74,8 +74,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.listing
         , subq_0.user
         , subq_0.listing__user
@@ -104,8 +104,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -116,8 +116,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -131,8 +131,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -143,8 +143,8 @@ FROM (
           , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
           , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
           , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql
index b05da97264..65582ae31f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql
@@ -40,8 +40,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -52,8 +52,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -64,8 +64,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -77,8 +77,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -89,8 +89,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -101,8 +101,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
index 9223eebd6e..f74d279e69 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
@@ -65,8 +65,8 @@ FROM (
                     , subq_0.ds__extract_month
                     , subq_0.ds__extract_week
                     , subq_0.ds__extract_day
-                    , subq_0.ds__extract_dayofweek
-                    , subq_0.ds__extract_dayofyear
+                    , subq_0.ds__extract_dow
+                    , subq_0.ds__extract_doy
                     , subq_0.ds_partitioned__day
                     , subq_0.ds_partitioned__week
                     , subq_0.ds_partitioned__month
@@ -77,8 +77,8 @@ FROM (
                     , subq_0.ds_partitioned__extract_month
                     , subq_0.ds_partitioned__extract_week
                     , subq_0.ds_partitioned__extract_day
-                    , subq_0.ds_partitioned__extract_dayofweek
-                    , subq_0.ds_partitioned__extract_dayofyear
+                    , subq_0.ds_partitioned__extract_dow
+                    , subq_0.ds_partitioned__extract_doy
                     , subq_0.paid_at__day
                     , subq_0.paid_at__week
                     , subq_0.paid_at__month
@@ -89,8 +89,8 @@ FROM (
                     , subq_0.paid_at__extract_month
                     , subq_0.paid_at__extract_week
                     , subq_0.paid_at__extract_day
-                    , subq_0.paid_at__extract_dayofweek
-                    , subq_0.paid_at__extract_dayofyear
+                    , subq_0.paid_at__extract_dow
+                    , subq_0.paid_at__extract_doy
                     , subq_0.booking__ds__day
                     , subq_0.booking__ds__week
                     , subq_0.booking__ds__month
@@ -101,8 +101,8 @@ FROM (
                     , subq_0.booking__ds__extract_month
                     , subq_0.booking__ds__extract_week
                     , subq_0.booking__ds__extract_day
-                    , subq_0.booking__ds__extract_dayofweek
-                    , subq_0.booking__ds__extract_dayofyear
+                    , subq_0.booking__ds__extract_dow
+                    , subq_0.booking__ds__extract_doy
                     , subq_0.booking__ds_partitioned__day
                     , subq_0.booking__ds_partitioned__week
                     , subq_0.booking__ds_partitioned__month
@@ -113,8 +113,8 @@ FROM (
                     , subq_0.booking__ds_partitioned__extract_month
                     , subq_0.booking__ds_partitioned__extract_week
                     , subq_0.booking__ds_partitioned__extract_day
-                    , subq_0.booking__ds_partitioned__extract_dayofweek
-                    , subq_0.booking__ds_partitioned__extract_dayofyear
+                    , subq_0.booking__ds_partitioned__extract_dow
+                    , subq_0.booking__ds_partitioned__extract_doy
                     , subq_0.booking__paid_at__day
                     , subq_0.booking__paid_at__week
                     , subq_0.booking__paid_at__month
@@ -125,8 +125,8 @@ FROM (
                     , subq_0.booking__paid_at__extract_month
                     , subq_0.booking__paid_at__extract_week
                     , subq_0.booking__paid_at__extract_day
-                    , subq_0.booking__paid_at__extract_dayofweek
-                    , subq_0.booking__paid_at__extract_dayofyear
+                    , subq_0.booking__paid_at__extract_dow
+                    , subq_0.booking__paid_at__extract_doy
                     , subq_0.ds__day AS metric_time__day
                     , subq_0.ds__week AS metric_time__week
                     , subq_0.ds__month AS metric_time__month
@@ -137,8 +137,8 @@ FROM (
                     , subq_0.ds__extract_month AS metric_time__extract_month
                     , subq_0.ds__extract_week AS metric_time__extract_week
                     , subq_0.ds__extract_day AS metric_time__extract_day
-                    , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_0.ds__extract_dow AS metric_time__extract_dow
+                    , subq_0.ds__extract_doy AS metric_time__extract_doy
                     , subq_0.listing
                     , subq_0.guest
                     , subq_0.host
@@ -188,8 +188,8 @@ FROM (
                       , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                       , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                       , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -200,8 +200,8 @@ FROM (
                       , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                       , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                       , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -212,8 +212,8 @@ FROM (
                       , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                       , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                       , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -225,8 +225,8 @@ FROM (
                       , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                       , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                       , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -237,8 +237,8 @@ FROM (
                       , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                       , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                       , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -249,8 +249,8 @@ FROM (
                       , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                       , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                       , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -280,8 +280,8 @@ FROM (
                     , subq_3.ds__extract_month
                     , subq_3.ds__extract_week
                     , subq_3.ds__extract_day
-                    , subq_3.ds__extract_dayofweek
-                    , subq_3.ds__extract_dayofyear
+                    , subq_3.ds__extract_dow
+                    , subq_3.ds__extract_doy
                     , subq_3.created_at__day
                     , subq_3.created_at__week
                     , subq_3.created_at__month
@@ -292,8 +292,8 @@ FROM (
                     , subq_3.created_at__extract_month
                     , subq_3.created_at__extract_week
                     , subq_3.created_at__extract_day
-                    , subq_3.created_at__extract_dayofweek
-                    , subq_3.created_at__extract_dayofyear
+                    , subq_3.created_at__extract_dow
+                    , subq_3.created_at__extract_doy
                     , subq_3.listing__ds__day
                     , subq_3.listing__ds__week
                     , subq_3.listing__ds__month
@@ -304,8 +304,8 @@ FROM (
                     , subq_3.listing__ds__extract_month
                     , subq_3.listing__ds__extract_week
                     , subq_3.listing__ds__extract_day
-                    , subq_3.listing__ds__extract_dayofweek
-                    , subq_3.listing__ds__extract_dayofyear
+                    , subq_3.listing__ds__extract_dow
+                    , subq_3.listing__ds__extract_doy
                     , subq_3.listing__created_at__day
                     , subq_3.listing__created_at__week
                     , subq_3.listing__created_at__month
@@ -316,8 +316,8 @@ FROM (
                     , subq_3.listing__created_at__extract_month
                     , subq_3.listing__created_at__extract_week
                     , subq_3.listing__created_at__extract_day
-                    , subq_3.listing__created_at__extract_dayofweek
-                    , subq_3.listing__created_at__extract_dayofyear
+                    , subq_3.listing__created_at__extract_dow
+                    , subq_3.listing__created_at__extract_doy
                     , subq_3.ds__day AS metric_time__day
                     , subq_3.ds__week AS metric_time__week
                     , subq_3.ds__month AS metric_time__month
@@ -328,8 +328,8 @@ FROM (
                     , subq_3.ds__extract_month AS metric_time__extract_month
                     , subq_3.ds__extract_week AS metric_time__extract_week
                     , subq_3.ds__extract_day AS metric_time__extract_day
-                    , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_3.ds__extract_dow AS metric_time__extract_dow
+                    , subq_3.ds__extract_doy AS metric_time__extract_doy
                     , subq_3.listing
                     , subq_3.user
                     , subq_3.listing__user
@@ -358,8 +358,8 @@ FROM (
                       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
                       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
                       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -370,8 +370,8 @@ FROM (
                       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
                       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
                       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -385,8 +385,8 @@ FROM (
                       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
                       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
                       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -397,8 +397,8 @@ FROM (
                       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
                       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
                       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -476,8 +476,8 @@ FROM (
                     , subq_12.ds__extract_month
                     , subq_12.ds__extract_week
                     , subq_12.ds__extract_day
-                    , subq_12.ds__extract_dayofweek
-                    , subq_12.ds__extract_dayofyear
+                    , subq_12.ds__extract_dow
+                    , subq_12.ds__extract_doy
                     , subq_12.ds_partitioned__day
                     , subq_12.ds_partitioned__week
                     , subq_12.ds_partitioned__month
@@ -488,8 +488,8 @@ FROM (
                     , subq_12.ds_partitioned__extract_month
                     , subq_12.ds_partitioned__extract_week
                     , subq_12.ds_partitioned__extract_day
-                    , subq_12.ds_partitioned__extract_dayofweek
-                    , subq_12.ds_partitioned__extract_dayofyear
+                    , subq_12.ds_partitioned__extract_dow
+                    , subq_12.ds_partitioned__extract_doy
                     , subq_12.paid_at__day
                     , subq_12.paid_at__week
                     , subq_12.paid_at__month
@@ -500,8 +500,8 @@ FROM (
                     , subq_12.paid_at__extract_month
                     , subq_12.paid_at__extract_week
                     , subq_12.paid_at__extract_day
-                    , subq_12.paid_at__extract_dayofweek
-                    , subq_12.paid_at__extract_dayofyear
+                    , subq_12.paid_at__extract_dow
+                    , subq_12.paid_at__extract_doy
                     , subq_12.booking__ds__day
                     , subq_12.booking__ds__week
                     , subq_12.booking__ds__month
@@ -512,8 +512,8 @@ FROM (
                     , subq_12.booking__ds__extract_month
                     , subq_12.booking__ds__extract_week
                     , subq_12.booking__ds__extract_day
-                    , subq_12.booking__ds__extract_dayofweek
-                    , subq_12.booking__ds__extract_dayofyear
+                    , subq_12.booking__ds__extract_dow
+                    , subq_12.booking__ds__extract_doy
                     , subq_12.booking__ds_partitioned__day
                     , subq_12.booking__ds_partitioned__week
                     , subq_12.booking__ds_partitioned__month
@@ -524,8 +524,8 @@ FROM (
                     , subq_12.booking__ds_partitioned__extract_month
                     , subq_12.booking__ds_partitioned__extract_week
                     , subq_12.booking__ds_partitioned__extract_day
-                    , subq_12.booking__ds_partitioned__extract_dayofweek
-                    , subq_12.booking__ds_partitioned__extract_dayofyear
+                    , subq_12.booking__ds_partitioned__extract_dow
+                    , subq_12.booking__ds_partitioned__extract_doy
                     , subq_12.booking__paid_at__day
                     , subq_12.booking__paid_at__week
                     , subq_12.booking__paid_at__month
@@ -536,8 +536,8 @@ FROM (
                     , subq_12.booking__paid_at__extract_month
                     , subq_12.booking__paid_at__extract_week
                     , subq_12.booking__paid_at__extract_day
-                    , subq_12.booking__paid_at__extract_dayofweek
-                    , subq_12.booking__paid_at__extract_dayofyear
+                    , subq_12.booking__paid_at__extract_dow
+                    , subq_12.booking__paid_at__extract_doy
                     , subq_12.ds__day AS metric_time__day
                     , subq_12.ds__week AS metric_time__week
                     , subq_12.ds__month AS metric_time__month
@@ -548,8 +548,8 @@ FROM (
                     , subq_12.ds__extract_month AS metric_time__extract_month
                     , subq_12.ds__extract_week AS metric_time__extract_week
                     , subq_12.ds__extract_day AS metric_time__extract_day
-                    , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_12.ds__extract_dow AS metric_time__extract_dow
+                    , subq_12.ds__extract_doy AS metric_time__extract_doy
                     , subq_12.listing
                     , subq_12.guest
                     , subq_12.host
@@ -599,8 +599,8 @@ FROM (
                       , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                       , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                       , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -611,8 +611,8 @@ FROM (
                       , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                       , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                       , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -623,8 +623,8 @@ FROM (
                       , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                       , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                       , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -636,8 +636,8 @@ FROM (
                       , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                       , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                       , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -648,8 +648,8 @@ FROM (
                       , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                       , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                       , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -660,8 +660,8 @@ FROM (
                       , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                       , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                       , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -691,8 +691,8 @@ FROM (
                     , subq_15.ds__extract_month
                     , subq_15.ds__extract_week
                     , subq_15.ds__extract_day
-                    , subq_15.ds__extract_dayofweek
-                    , subq_15.ds__extract_dayofyear
+                    , subq_15.ds__extract_dow
+                    , subq_15.ds__extract_doy
                     , subq_15.created_at__day
                     , subq_15.created_at__week
                     , subq_15.created_at__month
@@ -703,8 +703,8 @@ FROM (
                     , subq_15.created_at__extract_month
                     , subq_15.created_at__extract_week
                     , subq_15.created_at__extract_day
-                    , subq_15.created_at__extract_dayofweek
-                    , subq_15.created_at__extract_dayofyear
+                    , subq_15.created_at__extract_dow
+                    , subq_15.created_at__extract_doy
                     , subq_15.listing__ds__day
                     , subq_15.listing__ds__week
                     , subq_15.listing__ds__month
@@ -715,8 +715,8 @@ FROM (
                     , subq_15.listing__ds__extract_month
                     , subq_15.listing__ds__extract_week
                     , subq_15.listing__ds__extract_day
-                    , subq_15.listing__ds__extract_dayofweek
-                    , subq_15.listing__ds__extract_dayofyear
+                    , subq_15.listing__ds__extract_dow
+                    , subq_15.listing__ds__extract_doy
                     , subq_15.listing__created_at__day
                     , subq_15.listing__created_at__week
                     , subq_15.listing__created_at__month
@@ -727,8 +727,8 @@ FROM (
                     , subq_15.listing__created_at__extract_month
                     , subq_15.listing__created_at__extract_week
                     , subq_15.listing__created_at__extract_day
-                    , subq_15.listing__created_at__extract_dayofweek
-                    , subq_15.listing__created_at__extract_dayofyear
+                    , subq_15.listing__created_at__extract_dow
+                    , subq_15.listing__created_at__extract_doy
                     , subq_15.ds__day AS metric_time__day
                     , subq_15.ds__week AS metric_time__week
                     , subq_15.ds__month AS metric_time__month
@@ -739,8 +739,8 @@ FROM (
                     , subq_15.ds__extract_month AS metric_time__extract_month
                     , subq_15.ds__extract_week AS metric_time__extract_week
                     , subq_15.ds__extract_day AS metric_time__extract_day
-                    , subq_15.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_15.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_15.ds__extract_dow AS metric_time__extract_dow
+                    , subq_15.ds__extract_doy AS metric_time__extract_doy
                     , subq_15.listing
                     , subq_15.user
                     , subq_15.listing__user
@@ -769,8 +769,8 @@ FROM (
                       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
                       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
                       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -781,8 +781,8 @@ FROM (
                       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
                       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
                       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -796,8 +796,8 @@ FROM (
                       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
                       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
                       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -808,8 +808,8 @@ FROM (
                       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
                       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
                       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -870,8 +870,8 @@ FROM (
             , subq_24.ds__extract_month
             , subq_24.ds__extract_week
             , subq_24.ds__extract_day
-            , subq_24.ds__extract_dayofweek
-            , subq_24.ds__extract_dayofyear
+            , subq_24.ds__extract_dow
+            , subq_24.ds__extract_doy
             , subq_24.ds_partitioned__day
             , subq_24.ds_partitioned__week
             , subq_24.ds_partitioned__month
@@ -882,8 +882,8 @@ FROM (
             , subq_24.ds_partitioned__extract_month
             , subq_24.ds_partitioned__extract_week
             , subq_24.ds_partitioned__extract_day
-            , subq_24.ds_partitioned__extract_dayofweek
-            , subq_24.ds_partitioned__extract_dayofyear
+            , subq_24.ds_partitioned__extract_dow
+            , subq_24.ds_partitioned__extract_doy
             , subq_24.paid_at__day
             , subq_24.paid_at__week
             , subq_24.paid_at__month
@@ -894,8 +894,8 @@ FROM (
             , subq_24.paid_at__extract_month
             , subq_24.paid_at__extract_week
             , subq_24.paid_at__extract_day
-            , subq_24.paid_at__extract_dayofweek
-            , subq_24.paid_at__extract_dayofyear
+            , subq_24.paid_at__extract_dow
+            , subq_24.paid_at__extract_doy
             , subq_24.booking__ds__day
             , subq_24.booking__ds__week
             , subq_24.booking__ds__month
@@ -906,8 +906,8 @@ FROM (
             , subq_24.booking__ds__extract_month
             , subq_24.booking__ds__extract_week
             , subq_24.booking__ds__extract_day
-            , subq_24.booking__ds__extract_dayofweek
-            , subq_24.booking__ds__extract_dayofyear
+            , subq_24.booking__ds__extract_dow
+            , subq_24.booking__ds__extract_doy
             , subq_24.booking__ds_partitioned__day
             , subq_24.booking__ds_partitioned__week
             , subq_24.booking__ds_partitioned__month
@@ -918,8 +918,8 @@ FROM (
             , subq_24.booking__ds_partitioned__extract_month
             , subq_24.booking__ds_partitioned__extract_week
             , subq_24.booking__ds_partitioned__extract_day
-            , subq_24.booking__ds_partitioned__extract_dayofweek
-            , subq_24.booking__ds_partitioned__extract_dayofyear
+            , subq_24.booking__ds_partitioned__extract_dow
+            , subq_24.booking__ds_partitioned__extract_doy
             , subq_24.booking__paid_at__day
             , subq_24.booking__paid_at__week
             , subq_24.booking__paid_at__month
@@ -930,8 +930,8 @@ FROM (
             , subq_24.booking__paid_at__extract_month
             , subq_24.booking__paid_at__extract_week
             , subq_24.booking__paid_at__extract_day
-            , subq_24.booking__paid_at__extract_dayofweek
-            , subq_24.booking__paid_at__extract_dayofyear
+            , subq_24.booking__paid_at__extract_dow
+            , subq_24.booking__paid_at__extract_doy
             , subq_24.ds__day AS metric_time__day
             , subq_24.ds__week AS metric_time__week
             , subq_24.ds__month AS metric_time__month
@@ -942,8 +942,8 @@ FROM (
             , subq_24.ds__extract_month AS metric_time__extract_month
             , subq_24.ds__extract_week AS metric_time__extract_week
             , subq_24.ds__extract_day AS metric_time__extract_day
-            , subq_24.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_24.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_24.ds__extract_dow AS metric_time__extract_dow
+            , subq_24.ds__extract_doy AS metric_time__extract_doy
             , subq_24.listing
             , subq_24.guest
             , subq_24.host
@@ -993,8 +993,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -1005,8 +1005,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -1017,8 +1017,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -1030,8 +1030,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -1042,8 +1042,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -1054,8 +1054,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
index 1f9e7a4524..f536c2ec12 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
@@ -50,8 +50,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -62,8 +62,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -74,8 +74,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -86,8 +86,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -98,8 +98,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -110,8 +110,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -122,8 +122,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -173,8 +173,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -185,8 +185,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -197,8 +197,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -210,8 +210,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -222,8 +222,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -234,8 +234,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -282,8 +282,8 @@ FROM (
             , subq_7.ds__extract_month
             , subq_7.ds__extract_week
             , subq_7.ds__extract_day
-            , subq_7.ds__extract_dayofweek
-            , subq_7.ds__extract_dayofyear
+            , subq_7.ds__extract_dow
+            , subq_7.ds__extract_doy
             , subq_7.ds_partitioned__day
             , subq_7.ds_partitioned__week
             , subq_7.ds_partitioned__month
@@ -294,8 +294,8 @@ FROM (
             , subq_7.ds_partitioned__extract_month
             , subq_7.ds_partitioned__extract_week
             , subq_7.ds_partitioned__extract_day
-            , subq_7.ds_partitioned__extract_dayofweek
-            , subq_7.ds_partitioned__extract_dayofyear
+            , subq_7.ds_partitioned__extract_dow
+            , subq_7.ds_partitioned__extract_doy
             , subq_7.paid_at__day
             , subq_7.paid_at__week
             , subq_7.paid_at__month
@@ -306,8 +306,8 @@ FROM (
             , subq_7.paid_at__extract_month
             , subq_7.paid_at__extract_week
             , subq_7.paid_at__extract_day
-            , subq_7.paid_at__extract_dayofweek
-            , subq_7.paid_at__extract_dayofyear
+            , subq_7.paid_at__extract_dow
+            , subq_7.paid_at__extract_doy
             , subq_7.booking__ds__day
             , subq_7.booking__ds__week
             , subq_7.booking__ds__month
@@ -318,8 +318,8 @@ FROM (
             , subq_7.booking__ds__extract_month
             , subq_7.booking__ds__extract_week
             , subq_7.booking__ds__extract_day
-            , subq_7.booking__ds__extract_dayofweek
-            , subq_7.booking__ds__extract_dayofyear
+            , subq_7.booking__ds__extract_dow
+            , subq_7.booking__ds__extract_doy
             , subq_7.booking__ds_partitioned__day
             , subq_7.booking__ds_partitioned__week
             , subq_7.booking__ds_partitioned__month
@@ -330,8 +330,8 @@ FROM (
             , subq_7.booking__ds_partitioned__extract_month
             , subq_7.booking__ds_partitioned__extract_week
             , subq_7.booking__ds_partitioned__extract_day
-            , subq_7.booking__ds_partitioned__extract_dayofweek
-            , subq_7.booking__ds_partitioned__extract_dayofyear
+            , subq_7.booking__ds_partitioned__extract_dow
+            , subq_7.booking__ds_partitioned__extract_doy
             , subq_7.booking__paid_at__day
             , subq_7.booking__paid_at__week
             , subq_7.booking__paid_at__month
@@ -342,8 +342,8 @@ FROM (
             , subq_7.booking__paid_at__extract_month
             , subq_7.booking__paid_at__extract_week
             , subq_7.booking__paid_at__extract_day
-            , subq_7.booking__paid_at__extract_dayofweek
-            , subq_7.booking__paid_at__extract_dayofyear
+            , subq_7.booking__paid_at__extract_dow
+            , subq_7.booking__paid_at__extract_doy
             , subq_7.ds__day AS metric_time__day
             , subq_7.ds__week AS metric_time__week
             , subq_7.ds__month AS metric_time__month
@@ -354,8 +354,8 @@ FROM (
             , subq_7.ds__extract_month AS metric_time__extract_month
             , subq_7.ds__extract_week AS metric_time__extract_week
             , subq_7.ds__extract_day AS metric_time__extract_day
-            , subq_7.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_7.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_7.ds__extract_dow AS metric_time__extract_dow
+            , subq_7.ds__extract_doy AS metric_time__extract_doy
             , subq_7.listing
             , subq_7.guest
             , subq_7.host
@@ -405,8 +405,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -442,8 +442,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -454,8 +454,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -466,8 +466,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 2d8a10e755..61e0a3c0e0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -44,8 +44,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -56,8 +56,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -68,8 +68,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -80,8 +80,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -92,8 +92,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -104,8 +104,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -116,8 +116,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -167,8 +167,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -179,8 +179,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -191,8 +191,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -204,8 +204,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -216,8 +216,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -228,8 +228,8 @@ FROM (
                 , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                 , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 4ef0714be2..59683b27c8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -32,8 +32,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,8 +155,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -167,8 +167,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -179,8 +179,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -192,8 +192,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -204,8 +204,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -216,8 +216,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -256,8 +256,8 @@ FROM (
             , subq_5.ds__extract_month
             , subq_5.ds__extract_week
             , subq_5.ds__extract_day
-            , subq_5.ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear
+            , subq_5.ds__extract_dow
+            , subq_5.ds__extract_doy
             , subq_5.created_at__day
             , subq_5.created_at__week
             , subq_5.created_at__month
@@ -268,8 +268,8 @@ FROM (
             , subq_5.created_at__extract_month
             , subq_5.created_at__extract_week
             , subq_5.created_at__extract_day
-            , subq_5.created_at__extract_dayofweek
-            , subq_5.created_at__extract_dayofyear
+            , subq_5.created_at__extract_dow
+            , subq_5.created_at__extract_doy
             , subq_5.listing__ds__day
             , subq_5.listing__ds__week
             , subq_5.listing__ds__month
@@ -280,8 +280,8 @@ FROM (
             , subq_5.listing__ds__extract_month
             , subq_5.listing__ds__extract_week
             , subq_5.listing__ds__extract_day
-            , subq_5.listing__ds__extract_dayofweek
-            , subq_5.listing__ds__extract_dayofyear
+            , subq_5.listing__ds__extract_dow
+            , subq_5.listing__ds__extract_doy
             , subq_5.listing__created_at__day
             , subq_5.listing__created_at__week
             , subq_5.listing__created_at__month
@@ -292,8 +292,8 @@ FROM (
             , subq_5.listing__created_at__extract_month
             , subq_5.listing__created_at__extract_week
             , subq_5.listing__created_at__extract_day
-            , subq_5.listing__created_at__extract_dayofweek
-            , subq_5.listing__created_at__extract_dayofyear
+            , subq_5.listing__created_at__extract_dow
+            , subq_5.listing__created_at__extract_doy
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -304,8 +304,8 @@ FROM (
             , subq_5.ds__extract_month AS metric_time__extract_month
             , subq_5.ds__extract_week AS metric_time__extract_week
             , subq_5.ds__extract_day AS metric_time__extract_day
-            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_5.ds__extract_dow AS metric_time__extract_dow
+            , subq_5.ds__extract_doy AS metric_time__extract_doy
             , subq_5.listing
             , subq_5.user
             , subq_5.listing__user
@@ -334,8 +334,8 @@ FROM (
               , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
               , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
               , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -346,8 +346,8 @@ FROM (
               , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
               , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
               , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -361,8 +361,8 @@ FROM (
               , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
               , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
               , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -373,8 +373,8 @@ FROM (
               , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
               , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
               , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
index db50a9f2c8..3f01da6648 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
@@ -45,8 +45,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -57,8 +57,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -69,8 +69,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -81,8 +81,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -93,8 +93,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -105,8 +105,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -117,8 +117,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -154,8 +154,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
@@ -166,8 +166,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
@@ -178,8 +178,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
@@ -191,8 +191,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
@@ -203,8 +203,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
@@ -215,8 +215,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -250,8 +250,8 @@ FROM (
             , subq_3.window_start__extract_month AS window_start__extract_month
             , subq_3.window_start__extract_week AS window_start__extract_week
             , subq_3.window_start__extract_day AS window_start__extract_day
-            , subq_3.window_start__extract_dayofweek AS window_start__extract_dayofweek
-            , subq_3.window_start__extract_dayofyear AS window_start__extract_dayofyear
+            , subq_3.window_start__extract_dow AS window_start__extract_dow
+            , subq_3.window_start__extract_doy AS window_start__extract_doy
             , subq_3.window_end__day AS window_end__day
             , subq_3.window_end__week AS window_end__week
             , subq_3.window_end__month AS window_end__month
@@ -262,8 +262,8 @@ FROM (
             , subq_3.window_end__extract_month AS window_end__extract_month
             , subq_3.window_end__extract_week AS window_end__extract_week
             , subq_3.window_end__extract_day AS window_end__extract_day
-            , subq_3.window_end__extract_dayofweek AS window_end__extract_dayofweek
-            , subq_3.window_end__extract_dayofyear AS window_end__extract_dayofyear
+            , subq_3.window_end__extract_dow AS window_end__extract_dow
+            , subq_3.window_end__extract_doy AS window_end__extract_doy
             , subq_3.listing__window_start__day AS listing__window_start__day
             , subq_3.listing__window_start__week AS listing__window_start__week
             , subq_3.listing__window_start__month AS listing__window_start__month
@@ -274,8 +274,8 @@ FROM (
             , subq_3.listing__window_start__extract_month AS listing__window_start__extract_month
             , subq_3.listing__window_start__extract_week AS listing__window_start__extract_week
             , subq_3.listing__window_start__extract_day AS listing__window_start__extract_day
-            , subq_3.listing__window_start__extract_dayofweek AS listing__window_start__extract_dayofweek
-            , subq_3.listing__window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
+            , subq_3.listing__window_start__extract_dow AS listing__window_start__extract_dow
+            , subq_3.listing__window_start__extract_doy AS listing__window_start__extract_doy
             , subq_3.listing__window_end__day AS listing__window_end__day
             , subq_3.listing__window_end__week AS listing__window_end__week
             , subq_3.listing__window_end__month AS listing__window_end__month
@@ -286,8 +286,8 @@ FROM (
             , subq_3.listing__window_end__extract_month AS listing__window_end__extract_month
             , subq_3.listing__window_end__extract_week AS listing__window_end__extract_week
             , subq_3.listing__window_end__extract_day AS listing__window_end__extract_day
-            , subq_3.listing__window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
-            , subq_3.listing__window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
+            , subq_3.listing__window_end__extract_dow AS listing__window_end__extract_dow
+            , subq_3.listing__window_end__extract_doy AS listing__window_end__extract_doy
             , subq_5.ds__day AS user__ds__day
             , subq_5.ds__week AS user__ds__week
             , subq_5.ds__month AS user__ds__month
@@ -298,8 +298,8 @@ FROM (
             , subq_5.ds__extract_month AS user__ds__extract_month
             , subq_5.ds__extract_week AS user__ds__extract_week
             , subq_5.ds__extract_day AS user__ds__extract_day
-            , subq_5.ds__extract_dayofweek AS user__ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS user__ds__extract_dayofyear
+            , subq_5.ds__extract_dow AS user__ds__extract_dow
+            , subq_5.ds__extract_doy AS user__ds__extract_doy
             , subq_3.listing AS listing
             , subq_3.user AS user
             , subq_3.listing__user AS listing__user
@@ -323,8 +323,8 @@ FROM (
               , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
               , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
               , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_doy
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
@@ -335,8 +335,8 @@ FROM (
               , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
               , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
               , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_doy
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -350,8 +350,8 @@ FROM (
               , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
               , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
               , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
@@ -362,8 +362,8 @@ FROM (
               , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
               , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
               , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -412,8 +412,8 @@ FROM (
               , subq_4.ds__extract_month
               , subq_4.ds__extract_week
               , subq_4.ds__extract_day
-              , subq_4.ds__extract_dayofweek
-              , subq_4.ds__extract_dayofyear
+              , subq_4.ds__extract_dow
+              , subq_4.ds__extract_doy
               , subq_4.user__ds__day
               , subq_4.user__ds__week
               , subq_4.user__ds__month
@@ -424,8 +424,8 @@ FROM (
               , subq_4.user__ds__extract_month
               , subq_4.user__ds__extract_week
               , subq_4.user__ds__extract_day
-              , subq_4.user__ds__extract_dayofweek
-              , subq_4.user__ds__extract_dayofyear
+              , subq_4.user__ds__extract_dow
+              , subq_4.user__ds__extract_doy
               , subq_4.user
               , subq_4.home_state_latest
               , subq_4.user__home_state_latest
@@ -442,8 +442,8 @@ FROM (
                 , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS ds__extract_month
                 , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS ds__extract_week
                 , EXTRACT(DAY FROM users_latest_src_10021.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_doy
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC('week', users_latest_src_10021.ds) AS user__ds__week
@@ -455,8 +455,8 @@ FROM (
                 , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS user__ds__extract_month
                 , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
                 , EXTRACT(DAY FROM users_latest_src_10021.ds) AS user__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_doy
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
index adaf16cf58..2303464654 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
@@ -45,8 +45,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -57,8 +57,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -69,8 +69,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -81,8 +81,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -93,8 +93,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -105,8 +105,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -117,8 +117,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -154,8 +154,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
@@ -166,8 +166,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
@@ -178,8 +178,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
@@ -191,8 +191,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
@@ -203,8 +203,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
@@ -215,8 +215,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -253,8 +253,8 @@ FROM (
             , subq_5.window_start__extract_month AS lux_listing__window_start__extract_month
             , subq_5.window_start__extract_week AS lux_listing__window_start__extract_week
             , subq_5.window_start__extract_day AS lux_listing__window_start__extract_day
-            , subq_5.window_start__extract_dayofweek AS lux_listing__window_start__extract_dayofweek
-            , subq_5.window_start__extract_dayofyear AS lux_listing__window_start__extract_dayofyear
+            , subq_5.window_start__extract_dow AS lux_listing__window_start__extract_dow
+            , subq_5.window_start__extract_doy AS lux_listing__window_start__extract_doy
             , subq_5.window_end__day AS lux_listing__window_end__day
             , subq_5.window_end__week AS lux_listing__window_end__week
             , subq_5.window_end__month AS lux_listing__window_end__month
@@ -265,8 +265,8 @@ FROM (
             , subq_5.window_end__extract_month AS lux_listing__window_end__extract_month
             , subq_5.window_end__extract_week AS lux_listing__window_end__extract_week
             , subq_5.window_end__extract_day AS lux_listing__window_end__extract_day
-            , subq_5.window_end__extract_dayofweek AS lux_listing__window_end__extract_dayofweek
-            , subq_5.window_end__extract_dayofyear AS lux_listing__window_end__extract_dayofyear
+            , subq_5.window_end__extract_dow AS lux_listing__window_end__extract_dow
+            , subq_5.window_end__extract_doy AS lux_listing__window_end__extract_doy
             , subq_3.listing AS listing
             , subq_3.lux_listing AS lux_listing
             , subq_3.listing__lux_listing AS listing__lux_listing
@@ -343,8 +343,8 @@ FROM (
               , subq_4.window_start__extract_month
               , subq_4.window_start__extract_week
               , subq_4.window_start__extract_day
-              , subq_4.window_start__extract_dayofweek
-              , subq_4.window_start__extract_dayofyear
+              , subq_4.window_start__extract_dow
+              , subq_4.window_start__extract_doy
               , subq_4.window_end__day
               , subq_4.window_end__week
               , subq_4.window_end__month
@@ -355,8 +355,8 @@ FROM (
               , subq_4.window_end__extract_month
               , subq_4.window_end__extract_week
               , subq_4.window_end__extract_day
-              , subq_4.window_end__extract_dayofweek
-              , subq_4.window_end__extract_dayofyear
+              , subq_4.window_end__extract_dow
+              , subq_4.window_end__extract_doy
               , subq_4.lux_listing__window_start__day
               , subq_4.lux_listing__window_start__week
               , subq_4.lux_listing__window_start__month
@@ -367,8 +367,8 @@ FROM (
               , subq_4.lux_listing__window_start__extract_month
               , subq_4.lux_listing__window_start__extract_week
               , subq_4.lux_listing__window_start__extract_day
-              , subq_4.lux_listing__window_start__extract_dayofweek
-              , subq_4.lux_listing__window_start__extract_dayofyear
+              , subq_4.lux_listing__window_start__extract_dow
+              , subq_4.lux_listing__window_start__extract_doy
               , subq_4.lux_listing__window_end__day
               , subq_4.lux_listing__window_end__week
               , subq_4.lux_listing__window_end__month
@@ -379,8 +379,8 @@ FROM (
               , subq_4.lux_listing__window_end__extract_month
               , subq_4.lux_listing__window_end__extract_week
               , subq_4.lux_listing__window_end__extract_day
-              , subq_4.lux_listing__window_end__extract_dayofweek
-              , subq_4.lux_listing__window_end__extract_dayofyear
+              , subq_4.lux_listing__window_end__extract_dow
+              , subq_4.lux_listing__window_end__extract_doy
               , subq_4.lux_listing
               , subq_4.is_confirmed_lux
               , subq_4.lux_listing__is_confirmed_lux
@@ -397,8 +397,8 @@ FROM (
                 , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
                 , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
                 , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dow
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS window_end__month
@@ -409,8 +409,8 @@ FROM (
                 , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
                 , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
                 , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dow
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_from) AS lux_listing__window_start__week
@@ -422,8 +422,8 @@ FROM (
                 , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
                 , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
                 , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dow
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS lux_listing__window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS lux_listing__window_end__month
@@ -434,8 +434,8 @@ FROM (
                 , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
                 , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
                 , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dow
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql
index cb9670f074..2ef9e97902 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql
@@ -38,8 +38,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -50,8 +50,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -62,8 +62,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -75,8 +75,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -87,8 +87,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -99,8 +99,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -132,8 +132,8 @@ LEFT OUTER JOIN (
       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -144,8 +144,8 @@ LEFT OUTER JOIN (
       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -159,8 +159,8 @@ LEFT OUTER JOIN (
       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -171,8 +171,8 @@ LEFT OUTER JOIN (
       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -206,8 +206,8 @@ LEFT OUTER JOIN (
       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -218,8 +218,8 @@ LEFT OUTER JOIN (
       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -233,8 +233,8 @@ LEFT OUTER JOIN (
       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -245,8 +245,8 @@ LEFT OUTER JOIN (
       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
index 7638105966..5a28324203 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
@@ -41,8 +41,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.ds__day
             , subq_0.ds__week
             , subq_0.ds__month
@@ -53,8 +53,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.account_id__ds_partitioned__day
             , subq_0.account_id__ds_partitioned__week
             , subq_0.account_id__ds_partitioned__month
@@ -65,8 +65,8 @@ FROM (
             , subq_0.account_id__ds_partitioned__extract_month
             , subq_0.account_id__ds_partitioned__extract_week
             , subq_0.account_id__ds_partitioned__extract_day
-            , subq_0.account_id__ds_partitioned__extract_dayofweek
-            , subq_0.account_id__ds_partitioned__extract_dayofyear
+            , subq_0.account_id__ds_partitioned__extract_dow
+            , subq_0.account_id__ds_partitioned__extract_doy
             , subq_0.account_id__ds__day
             , subq_0.account_id__ds__week
             , subq_0.account_id__ds__month
@@ -77,8 +77,8 @@ FROM (
             , subq_0.account_id__ds__extract_month
             , subq_0.account_id__ds__extract_week
             , subq_0.account_id__ds__extract_day
-            , subq_0.account_id__ds__extract_dayofweek
-            , subq_0.account_id__ds__extract_dayofyear
+            , subq_0.account_id__ds__extract_dow
+            , subq_0.account_id__ds__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -89,8 +89,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.account_id
             , subq_0.account_month
             , subq_0.account_id__account_month
@@ -109,8 +109,8 @@ FROM (
               , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS ds__month
@@ -121,8 +121,8 @@ FROM (
               , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
               , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_doy
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__week
@@ -134,8 +134,8 @@ FROM (
               , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
               , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS account_id__ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS account_id__ds__month
@@ -146,8 +146,8 @@ FROM (
               , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
               , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
               , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_doy
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -174,8 +174,8 @@ FROM (
             , subq_3.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_3.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_3.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_3.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_3.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_3.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_3.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_3.account_id__ds_partitioned__day AS account_id__ds_partitioned__day
             , subq_3.account_id__ds_partitioned__week AS account_id__ds_partitioned__week
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
@@ -186,8 +186,8 @@ FROM (
             , subq_3.account_id__ds_partitioned__extract_month AS account_id__ds_partitioned__extract_month
             , subq_3.account_id__ds_partitioned__extract_week AS account_id__ds_partitioned__extract_week
             , subq_3.account_id__ds_partitioned__extract_day AS account_id__ds_partitioned__extract_day
-            , subq_3.account_id__ds_partitioned__extract_dayofweek AS account_id__ds_partitioned__extract_dayofweek
-            , subq_3.account_id__ds_partitioned__extract_dayofyear AS account_id__ds_partitioned__extract_dayofyear
+            , subq_3.account_id__ds_partitioned__extract_dow AS account_id__ds_partitioned__extract_dow
+            , subq_3.account_id__ds_partitioned__extract_doy AS account_id__ds_partitioned__extract_doy
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
@@ -198,8 +198,8 @@ FROM (
             , subq_5.ds_partitioned__extract_month AS customer_id__ds_partitioned__extract_month
             , subq_5.ds_partitioned__extract_week AS customer_id__ds_partitioned__extract_week
             , subq_5.ds_partitioned__extract_day AS customer_id__ds_partitioned__extract_day
-            , subq_5.ds_partitioned__extract_dayofweek AS customer_id__ds_partitioned__extract_dayofweek
-            , subq_5.ds_partitioned__extract_dayofyear AS customer_id__ds_partitioned__extract_dayofyear
+            , subq_5.ds_partitioned__extract_dow AS customer_id__ds_partitioned__extract_dow
+            , subq_5.ds_partitioned__extract_doy AS customer_id__ds_partitioned__extract_doy
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
@@ -221,8 +221,8 @@ FROM (
               , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_doy
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__week
@@ -234,8 +234,8 @@ FROM (
               , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -283,8 +283,8 @@ FROM (
               , subq_4.ds_partitioned__extract_month
               , subq_4.ds_partitioned__extract_week
               , subq_4.ds_partitioned__extract_day
-              , subq_4.ds_partitioned__extract_dayofweek
-              , subq_4.ds_partitioned__extract_dayofyear
+              , subq_4.ds_partitioned__extract_dow
+              , subq_4.ds_partitioned__extract_doy
               , subq_4.customer_id__ds_partitioned__day
               , subq_4.customer_id__ds_partitioned__week
               , subq_4.customer_id__ds_partitioned__month
@@ -295,8 +295,8 @@ FROM (
               , subq_4.customer_id__ds_partitioned__extract_month
               , subq_4.customer_id__ds_partitioned__extract_week
               , subq_4.customer_id__ds_partitioned__extract_day
-              , subq_4.customer_id__ds_partitioned__extract_dayofweek
-              , subq_4.customer_id__ds_partitioned__extract_dayofyear
+              , subq_4.customer_id__ds_partitioned__extract_dow
+              , subq_4.customer_id__ds_partitioned__extract_doy
               , subq_4.customer_id
               , subq_4.customer_name
               , subq_4.customer_atomic_weight
@@ -317,8 +317,8 @@ FROM (
                 , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -331,8 +331,8 @@ FROM (
                 , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
                 , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
                 , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofyear
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
index 3d8fba9b22..38e701d35f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
@@ -28,8 +28,8 @@ FROM (
           , subq_1.ds__extract_month
           , subq_1.ds__extract_week
           , subq_1.ds__extract_day
-          , subq_1.ds__extract_dayofweek
-          , subq_1.ds__extract_dayofyear
+          , subq_1.ds__extract_dow
+          , subq_1.ds__extract_doy
           , subq_1.ds_partitioned__day
           , subq_1.ds_partitioned__week
           , subq_1.ds_partitioned__month
@@ -40,8 +40,8 @@ FROM (
           , subq_1.ds_partitioned__extract_month
           , subq_1.ds_partitioned__extract_week
           , subq_1.ds_partitioned__extract_day
-          , subq_1.ds_partitioned__extract_dayofweek
-          , subq_1.ds_partitioned__extract_dayofyear
+          , subq_1.ds_partitioned__extract_dow
+          , subq_1.ds_partitioned__extract_doy
           , subq_1.paid_at__day
           , subq_1.paid_at__week
           , subq_1.paid_at__month
@@ -52,8 +52,8 @@ FROM (
           , subq_1.paid_at__extract_month
           , subq_1.paid_at__extract_week
           , subq_1.paid_at__extract_day
-          , subq_1.paid_at__extract_dayofweek
-          , subq_1.paid_at__extract_dayofyear
+          , subq_1.paid_at__extract_dow
+          , subq_1.paid_at__extract_doy
           , subq_1.booking__ds__day
           , subq_1.booking__ds__week
           , subq_1.booking__ds__month
@@ -64,8 +64,8 @@ FROM (
           , subq_1.booking__ds__extract_month
           , subq_1.booking__ds__extract_week
           , subq_1.booking__ds__extract_day
-          , subq_1.booking__ds__extract_dayofweek
-          , subq_1.booking__ds__extract_dayofyear
+          , subq_1.booking__ds__extract_dow
+          , subq_1.booking__ds__extract_doy
           , subq_1.booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month
@@ -76,8 +76,8 @@ FROM (
           , subq_1.booking__ds_partitioned__extract_month
           , subq_1.booking__ds_partitioned__extract_week
           , subq_1.booking__ds_partitioned__extract_day
-          , subq_1.booking__ds_partitioned__extract_dayofweek
-          , subq_1.booking__ds_partitioned__extract_dayofyear
+          , subq_1.booking__ds_partitioned__extract_dow
+          , subq_1.booking__ds_partitioned__extract_doy
           , subq_1.booking__paid_at__day
           , subq_1.booking__paid_at__week
           , subq_1.booking__paid_at__month
@@ -88,8 +88,8 @@ FROM (
           , subq_1.booking__paid_at__extract_month
           , subq_1.booking__paid_at__extract_week
           , subq_1.booking__paid_at__extract_day
-          , subq_1.booking__paid_at__extract_dayofweek
-          , subq_1.booking__paid_at__extract_dayofyear
+          , subq_1.booking__paid_at__extract_dow
+          , subq_1.booking__paid_at__extract_doy
           , subq_1.metric_time__day
           , subq_1.metric_time__week
           , subq_1.metric_time__month
@@ -100,8 +100,8 @@ FROM (
           , subq_1.metric_time__extract_month
           , subq_1.metric_time__extract_week
           , subq_1.metric_time__extract_day
-          , subq_1.metric_time__extract_dayofweek
-          , subq_1.metric_time__extract_dayofyear
+          , subq_1.metric_time__extract_dow
+          , subq_1.metric_time__extract_doy
           , subq_1.listing
           , subq_1.guest
           , subq_1.host
@@ -136,8 +136,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -148,8 +148,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -160,8 +160,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -172,8 +172,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -184,8 +184,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -196,8 +196,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -208,8 +208,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -259,8 +259,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -271,8 +271,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -283,8 +283,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -296,8 +296,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -308,8 +308,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -320,8 +320,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -362,8 +362,8 @@ CROSS JOIN (
           , subq_7.ds__extract_month
           , subq_7.ds__extract_week
           , subq_7.ds__extract_day
-          , subq_7.ds__extract_dayofweek
-          , subq_7.ds__extract_dayofyear
+          , subq_7.ds__extract_dow
+          , subq_7.ds__extract_doy
           , subq_7.created_at__day
           , subq_7.created_at__week
           , subq_7.created_at__month
@@ -374,8 +374,8 @@ CROSS JOIN (
           , subq_7.created_at__extract_month
           , subq_7.created_at__extract_week
           , subq_7.created_at__extract_day
-          , subq_7.created_at__extract_dayofweek
-          , subq_7.created_at__extract_dayofyear
+          , subq_7.created_at__extract_dow
+          , subq_7.created_at__extract_doy
           , subq_7.listing__ds__day
           , subq_7.listing__ds__week
           , subq_7.listing__ds__month
@@ -386,8 +386,8 @@ CROSS JOIN (
           , subq_7.listing__ds__extract_month
           , subq_7.listing__ds__extract_week
           , subq_7.listing__ds__extract_day
-          , subq_7.listing__ds__extract_dayofweek
-          , subq_7.listing__ds__extract_dayofyear
+          , subq_7.listing__ds__extract_dow
+          , subq_7.listing__ds__extract_doy
           , subq_7.listing__created_at__day
           , subq_7.listing__created_at__week
           , subq_7.listing__created_at__month
@@ -398,8 +398,8 @@ CROSS JOIN (
           , subq_7.listing__created_at__extract_month
           , subq_7.listing__created_at__extract_week
           , subq_7.listing__created_at__extract_day
-          , subq_7.listing__created_at__extract_dayofweek
-          , subq_7.listing__created_at__extract_dayofyear
+          , subq_7.listing__created_at__extract_dow
+          , subq_7.listing__created_at__extract_doy
           , subq_7.metric_time__day
           , subq_7.metric_time__week
           , subq_7.metric_time__month
@@ -410,8 +410,8 @@ CROSS JOIN (
           , subq_7.metric_time__extract_month
           , subq_7.metric_time__extract_week
           , subq_7.metric_time__extract_day
-          , subq_7.metric_time__extract_dayofweek
-          , subq_7.metric_time__extract_dayofyear
+          , subq_7.metric_time__extract_dow
+          , subq_7.metric_time__extract_doy
           , subq_7.listing
           , subq_7.user
           , subq_7.listing__user
@@ -437,8 +437,8 @@ CROSS JOIN (
             , subq_6.ds__extract_month
             , subq_6.ds__extract_week
             , subq_6.ds__extract_day
-            , subq_6.ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear
+            , subq_6.ds__extract_dow
+            , subq_6.ds__extract_doy
             , subq_6.created_at__day
             , subq_6.created_at__week
             , subq_6.created_at__month
@@ -449,8 +449,8 @@ CROSS JOIN (
             , subq_6.created_at__extract_month
             , subq_6.created_at__extract_week
             , subq_6.created_at__extract_day
-            , subq_6.created_at__extract_dayofweek
-            , subq_6.created_at__extract_dayofyear
+            , subq_6.created_at__extract_dow
+            , subq_6.created_at__extract_doy
             , subq_6.listing__ds__day
             , subq_6.listing__ds__week
             , subq_6.listing__ds__month
@@ -461,8 +461,8 @@ CROSS JOIN (
             , subq_6.listing__ds__extract_month
             , subq_6.listing__ds__extract_week
             , subq_6.listing__ds__extract_day
-            , subq_6.listing__ds__extract_dayofweek
-            , subq_6.listing__ds__extract_dayofyear
+            , subq_6.listing__ds__extract_dow
+            , subq_6.listing__ds__extract_doy
             , subq_6.listing__created_at__day
             , subq_6.listing__created_at__week
             , subq_6.listing__created_at__month
@@ -473,8 +473,8 @@ CROSS JOIN (
             , subq_6.listing__created_at__extract_month
             , subq_6.listing__created_at__extract_week
             , subq_6.listing__created_at__extract_day
-            , subq_6.listing__created_at__extract_dayofweek
-            , subq_6.listing__created_at__extract_dayofyear
+            , subq_6.listing__created_at__extract_dow
+            , subq_6.listing__created_at__extract_doy
             , subq_6.ds__day AS metric_time__day
             , subq_6.ds__week AS metric_time__week
             , subq_6.ds__month AS metric_time__month
@@ -485,8 +485,8 @@ CROSS JOIN (
             , subq_6.ds__extract_month AS metric_time__extract_month
             , subq_6.ds__extract_week AS metric_time__extract_week
             , subq_6.ds__extract_day AS metric_time__extract_day
-            , subq_6.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_6.ds__extract_dow AS metric_time__extract_dow
+            , subq_6.ds__extract_doy AS metric_time__extract_doy
             , subq_6.listing
             , subq_6.user
             , subq_6.listing__user
@@ -515,8 +515,8 @@ CROSS JOIN (
               , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
               , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
               , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -527,8 +527,8 @@ CROSS JOIN (
               , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
               , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
               , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -542,8 +542,8 @@ CROSS JOIN (
               , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
               , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
               , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -554,8 +554,8 @@ CROSS JOIN (
               , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
               , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
               , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
index 138d3b47ca..c84ceda6fa 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
@@ -49,8 +49,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -61,8 +61,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -73,8 +73,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -85,8 +85,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -97,8 +97,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -109,8 +109,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -121,8 +121,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -172,8 +172,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -184,8 +184,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -196,8 +196,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -209,8 +209,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -221,8 +221,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -233,8 +233,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -278,8 +278,8 @@ FROM (
                 , subq_5.ds__extract_month
                 , subq_5.ds__extract_week
                 , subq_5.ds__extract_day
-                , subq_5.ds__extract_dayofweek
-                , subq_5.ds__extract_dayofyear
+                , subq_5.ds__extract_dow
+                , subq_5.ds__extract_doy
                 , subq_5.ds_partitioned__day
                 , subq_5.ds_partitioned__week
                 , subq_5.ds_partitioned__month
@@ -290,8 +290,8 @@ FROM (
                 , subq_5.ds_partitioned__extract_month
                 , subq_5.ds_partitioned__extract_week
                 , subq_5.ds_partitioned__extract_day
-                , subq_5.ds_partitioned__extract_dayofweek
-                , subq_5.ds_partitioned__extract_dayofyear
+                , subq_5.ds_partitioned__extract_dow
+                , subq_5.ds_partitioned__extract_doy
                 , subq_5.paid_at__day
                 , subq_5.paid_at__week
                 , subq_5.paid_at__month
@@ -302,8 +302,8 @@ FROM (
                 , subq_5.paid_at__extract_month
                 , subq_5.paid_at__extract_week
                 , subq_5.paid_at__extract_day
-                , subq_5.paid_at__extract_dayofweek
-                , subq_5.paid_at__extract_dayofyear
+                , subq_5.paid_at__extract_dow
+                , subq_5.paid_at__extract_doy
                 , subq_5.booking__ds__day
                 , subq_5.booking__ds__week
                 , subq_5.booking__ds__month
@@ -314,8 +314,8 @@ FROM (
                 , subq_5.booking__ds__extract_month
                 , subq_5.booking__ds__extract_week
                 , subq_5.booking__ds__extract_day
-                , subq_5.booking__ds__extract_dayofweek
-                , subq_5.booking__ds__extract_dayofyear
+                , subq_5.booking__ds__extract_dow
+                , subq_5.booking__ds__extract_doy
                 , subq_5.booking__ds_partitioned__day
                 , subq_5.booking__ds_partitioned__week
                 , subq_5.booking__ds_partitioned__month
@@ -326,8 +326,8 @@ FROM (
                 , subq_5.booking__ds_partitioned__extract_month
                 , subq_5.booking__ds_partitioned__extract_week
                 , subq_5.booking__ds_partitioned__extract_day
-                , subq_5.booking__ds_partitioned__extract_dayofweek
-                , subq_5.booking__ds_partitioned__extract_dayofyear
+                , subq_5.booking__ds_partitioned__extract_dow
+                , subq_5.booking__ds_partitioned__extract_doy
                 , subq_5.booking__paid_at__day
                 , subq_5.booking__paid_at__week
                 , subq_5.booking__paid_at__month
@@ -338,8 +338,8 @@ FROM (
                 , subq_5.booking__paid_at__extract_month
                 , subq_5.booking__paid_at__extract_week
                 , subq_5.booking__paid_at__extract_day
-                , subq_5.booking__paid_at__extract_dayofweek
-                , subq_5.booking__paid_at__extract_dayofyear
+                , subq_5.booking__paid_at__extract_dow
+                , subq_5.booking__paid_at__extract_doy
                 , subq_5.ds__day AS metric_time__day
                 , subq_5.ds__week AS metric_time__week
                 , subq_5.ds__month AS metric_time__month
@@ -350,8 +350,8 @@ FROM (
                 , subq_5.ds__extract_month AS metric_time__extract_month
                 , subq_5.ds__extract_week AS metric_time__extract_week
                 , subq_5.ds__extract_day AS metric_time__extract_day
-                , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_5.ds__extract_dow AS metric_time__extract_dow
+                , subq_5.ds__extract_doy AS metric_time__extract_doy
                 , subq_5.listing
                 , subq_5.guest
                 , subq_5.host
@@ -401,8 +401,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -413,8 +413,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -425,8 +425,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -438,8 +438,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -450,8 +450,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -462,8 +462,8 @@ FROM (
                   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
                   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -519,8 +519,8 @@ FROM (
             , subq_12.ds__extract_month
             , subq_12.ds__extract_week
             , subq_12.ds__extract_day
-            , subq_12.ds__extract_dayofweek
-            , subq_12.ds__extract_dayofyear
+            , subq_12.ds__extract_dow
+            , subq_12.ds__extract_doy
             , subq_12.ds_partitioned__day
             , subq_12.ds_partitioned__week
             , subq_12.ds_partitioned__month
@@ -531,8 +531,8 @@ FROM (
             , subq_12.ds_partitioned__extract_month
             , subq_12.ds_partitioned__extract_week
             , subq_12.ds_partitioned__extract_day
-            , subq_12.ds_partitioned__extract_dayofweek
-            , subq_12.ds_partitioned__extract_dayofyear
+            , subq_12.ds_partitioned__extract_dow
+            , subq_12.ds_partitioned__extract_doy
             , subq_12.paid_at__day
             , subq_12.paid_at__week
             , subq_12.paid_at__month
@@ -543,8 +543,8 @@ FROM (
             , subq_12.paid_at__extract_month
             , subq_12.paid_at__extract_week
             , subq_12.paid_at__extract_day
-            , subq_12.paid_at__extract_dayofweek
-            , subq_12.paid_at__extract_dayofyear
+            , subq_12.paid_at__extract_dow
+            , subq_12.paid_at__extract_doy
             , subq_12.booking__ds__day
             , subq_12.booking__ds__week
             , subq_12.booking__ds__month
@@ -555,8 +555,8 @@ FROM (
             , subq_12.booking__ds__extract_month
             , subq_12.booking__ds__extract_week
             , subq_12.booking__ds__extract_day
-            , subq_12.booking__ds__extract_dayofweek
-            , subq_12.booking__ds__extract_dayofyear
+            , subq_12.booking__ds__extract_dow
+            , subq_12.booking__ds__extract_doy
             , subq_12.booking__ds_partitioned__day
             , subq_12.booking__ds_partitioned__week
             , subq_12.booking__ds_partitioned__month
@@ -567,8 +567,8 @@ FROM (
             , subq_12.booking__ds_partitioned__extract_month
             , subq_12.booking__ds_partitioned__extract_week
             , subq_12.booking__ds_partitioned__extract_day
-            , subq_12.booking__ds_partitioned__extract_dayofweek
-            , subq_12.booking__ds_partitioned__extract_dayofyear
+            , subq_12.booking__ds_partitioned__extract_dow
+            , subq_12.booking__ds_partitioned__extract_doy
             , subq_12.booking__paid_at__day
             , subq_12.booking__paid_at__week
             , subq_12.booking__paid_at__month
@@ -579,8 +579,8 @@ FROM (
             , subq_12.booking__paid_at__extract_month
             , subq_12.booking__paid_at__extract_week
             , subq_12.booking__paid_at__extract_day
-            , subq_12.booking__paid_at__extract_dayofweek
-            , subq_12.booking__paid_at__extract_dayofyear
+            , subq_12.booking__paid_at__extract_dow
+            , subq_12.booking__paid_at__extract_doy
             , subq_12.ds__day AS metric_time__day
             , subq_12.ds__week AS metric_time__week
             , subq_12.ds__month AS metric_time__month
@@ -591,8 +591,8 @@ FROM (
             , subq_12.ds__extract_month AS metric_time__extract_month
             , subq_12.ds__extract_week AS metric_time__extract_week
             , subq_12.ds__extract_day AS metric_time__extract_day
-            , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_12.ds__extract_dow AS metric_time__extract_dow
+            , subq_12.ds__extract_doy AS metric_time__extract_doy
             , subq_12.listing
             , subq_12.guest
             , subq_12.host
@@ -642,8 +642,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -654,8 +654,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -666,8 +666,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -679,8 +679,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -691,8 +691,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -703,8 +703,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -758,8 +758,8 @@ FROM (
             , subq_17.ds__extract_month
             , subq_17.ds__extract_week
             , subq_17.ds__extract_day
-            , subq_17.ds__extract_dayofweek
-            , subq_17.ds__extract_dayofyear
+            , subq_17.ds__extract_dow
+            , subq_17.ds__extract_doy
             , subq_17.ds_partitioned__day
             , subq_17.ds_partitioned__week
             , subq_17.ds_partitioned__month
@@ -770,8 +770,8 @@ FROM (
             , subq_17.ds_partitioned__extract_month
             , subq_17.ds_partitioned__extract_week
             , subq_17.ds_partitioned__extract_day
-            , subq_17.ds_partitioned__extract_dayofweek
-            , subq_17.ds_partitioned__extract_dayofyear
+            , subq_17.ds_partitioned__extract_dow
+            , subq_17.ds_partitioned__extract_doy
             , subq_17.paid_at__day
             , subq_17.paid_at__week
             , subq_17.paid_at__month
@@ -782,8 +782,8 @@ FROM (
             , subq_17.paid_at__extract_month
             , subq_17.paid_at__extract_week
             , subq_17.paid_at__extract_day
-            , subq_17.paid_at__extract_dayofweek
-            , subq_17.paid_at__extract_dayofyear
+            , subq_17.paid_at__extract_dow
+            , subq_17.paid_at__extract_doy
             , subq_17.booking__ds__day
             , subq_17.booking__ds__week
             , subq_17.booking__ds__month
@@ -794,8 +794,8 @@ FROM (
             , subq_17.booking__ds__extract_month
             , subq_17.booking__ds__extract_week
             , subq_17.booking__ds__extract_day
-            , subq_17.booking__ds__extract_dayofweek
-            , subq_17.booking__ds__extract_dayofyear
+            , subq_17.booking__ds__extract_dow
+            , subq_17.booking__ds__extract_doy
             , subq_17.booking__ds_partitioned__day
             , subq_17.booking__ds_partitioned__week
             , subq_17.booking__ds_partitioned__month
@@ -806,8 +806,8 @@ FROM (
             , subq_17.booking__ds_partitioned__extract_month
             , subq_17.booking__ds_partitioned__extract_week
             , subq_17.booking__ds_partitioned__extract_day
-            , subq_17.booking__ds_partitioned__extract_dayofweek
-            , subq_17.booking__ds_partitioned__extract_dayofyear
+            , subq_17.booking__ds_partitioned__extract_dow
+            , subq_17.booking__ds_partitioned__extract_doy
             , subq_17.booking__paid_at__day
             , subq_17.booking__paid_at__week
             , subq_17.booking__paid_at__month
@@ -818,8 +818,8 @@ FROM (
             , subq_17.booking__paid_at__extract_month
             , subq_17.booking__paid_at__extract_week
             , subq_17.booking__paid_at__extract_day
-            , subq_17.booking__paid_at__extract_dayofweek
-            , subq_17.booking__paid_at__extract_dayofyear
+            , subq_17.booking__paid_at__extract_dow
+            , subq_17.booking__paid_at__extract_doy
             , subq_17.ds__day AS metric_time__day
             , subq_17.ds__week AS metric_time__week
             , subq_17.ds__month AS metric_time__month
@@ -830,8 +830,8 @@ FROM (
             , subq_17.ds__extract_month AS metric_time__extract_month
             , subq_17.ds__extract_week AS metric_time__extract_week
             , subq_17.ds__extract_day AS metric_time__extract_day
-            , subq_17.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_17.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_17.ds__extract_dow AS metric_time__extract_dow
+            , subq_17.ds__extract_doy AS metric_time__extract_doy
             , subq_17.listing
             , subq_17.guest
             , subq_17.host
@@ -881,8 +881,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -893,8 +893,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -905,8 +905,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -918,8 +918,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -930,8 +930,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -942,8 +942,8 @@ FROM (
               , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
               , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql
index 63116a5458..d9c8ed0995 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql
@@ -50,8 +50,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -62,8 +62,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -74,8 +74,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -87,8 +87,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -99,8 +99,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -111,8 +111,8 @@ FROM (
           , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
           , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
           , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
index e43e265eff..73a3eb36fd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
@@ -41,8 +41,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -53,8 +53,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.verification__ds__day
             , subq_0.verification__ds__week
             , subq_0.verification__ds__month
@@ -65,8 +65,8 @@ FROM (
             , subq_0.verification__ds__extract_month
             , subq_0.verification__ds__extract_week
             , subq_0.verification__ds__extract_day
-            , subq_0.verification__ds__extract_dayofweek
-            , subq_0.verification__ds__extract_dayofyear
+            , subq_0.verification__ds__extract_dow
+            , subq_0.verification__ds__extract_doy
             , subq_0.verification__ds_partitioned__day
             , subq_0.verification__ds_partitioned__week
             , subq_0.verification__ds_partitioned__month
@@ -77,8 +77,8 @@ FROM (
             , subq_0.verification__ds_partitioned__extract_month
             , subq_0.verification__ds_partitioned__extract_week
             , subq_0.verification__ds_partitioned__extract_day
-            , subq_0.verification__ds_partitioned__extract_dayofweek
-            , subq_0.verification__ds_partitioned__extract_dayofyear
+            , subq_0.verification__ds_partitioned__extract_dow
+            , subq_0.verification__ds_partitioned__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -89,8 +89,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.verification
             , subq_0.user
             , subq_0.verification__user
@@ -111,8 +111,8 @@ FROM (
               , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
               , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
               , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
@@ -123,8 +123,8 @@ FROM (
               , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
               , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
@@ -136,8 +136,8 @@ FROM (
               , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
               , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
               , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
@@ -148,8 +148,8 @@ FROM (
               , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
               , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
               , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -178,8 +178,8 @@ FROM (
             , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS ds__extract_month
             , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
             , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_doy
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS created_at__month
@@ -190,8 +190,8 @@ FROM (
             , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
             , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
             , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__month
@@ -202,8 +202,8 @@ FROM (
             , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
             , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds) AS user__ds__week
@@ -215,8 +215,8 @@ FROM (
             , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
             , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
             , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_doy
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS user__created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS user__created_at__month
@@ -227,8 +227,8 @@ FROM (
             , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
             , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
             , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__month
@@ -239,8 +239,8 @@ FROM (
             , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
             , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
             , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql
index d88d2d32f3..bf73140286 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -47,8 +47,8 @@ FROM (
     , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
     , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
     , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
@@ -60,8 +60,8 @@ FROM (
     , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
     , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
     , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -87,8 +87,8 @@ INNER JOIN (
       , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
       , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
       , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
@@ -100,8 +100,8 @@ INNER JOIN (
       , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
       , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
       , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
index 094486f462..37fb636c96 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -47,8 +47,8 @@ FROM (
     , EXTRACT(MONTH FROM ds) AS ds__extract_month
     , EXTRACT(WEEK FROM ds) AS ds__extract_week
     , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
@@ -60,8 +60,8 @@ FROM (
     , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
     , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
     , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
index a8a26c9899..5801bf4ecd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -47,8 +47,8 @@ FROM (
     , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
     , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
     , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
@@ -60,8 +60,8 @@ FROM (
     , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
     , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
     , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -88,8 +88,8 @@ INNER JOIN (
       , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
       , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
       , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
@@ -101,8 +101,8 @@ INNER JOIN (
       , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
       , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
       , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index c400372dd4..b83343fe92 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -47,8 +47,8 @@ FROM (
     , EXTRACT(MONTH FROM ds) AS ds__extract_month
     , EXTRACT(WEEK FROM ds) AS ds__extract_week
     , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
@@ -60,8 +60,8 @@ FROM (
     , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
     , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
     , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 30ab4c1851..d76c04b1c2 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -47,8 +47,8 @@ FROM (
     , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
     , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
     , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
@@ -60,8 +60,8 @@ FROM (
     , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
     , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
     , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -88,8 +88,8 @@ INNER JOIN (
       , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
       , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
       , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
@@ -101,8 +101,8 @@ INNER JOIN (
       , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
       , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
       , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index ef337f422c..7b9abd7ccb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -47,8 +47,8 @@ FROM (
     , EXTRACT(MONTH FROM ds) AS ds__extract_month
     , EXTRACT(WEEK FROM ds) AS ds__extract_week
     , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
@@ -60,8 +60,8 @@ FROM (
     , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
     , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
     , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql
index 16b897731d..79dbc6f87e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql
@@ -36,8 +36,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -48,8 +48,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -60,8 +60,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -73,8 +73,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
       , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
       , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
       , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -130,8 +130,8 @@ LEFT OUTER JOIN (
       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
@@ -142,8 +142,8 @@ LEFT OUTER JOIN (
       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -157,8 +157,8 @@ LEFT OUTER JOIN (
       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
@@ -169,8 +169,8 @@ LEFT OUTER JOIN (
       , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
       , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
       , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql
index 7dd5c3b39d..a046c27cbb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql
@@ -25,8 +25,8 @@ SELECT
   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -37,8 +37,8 @@ SELECT
   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -49,8 +49,8 @@ SELECT
   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -62,8 +62,8 @@ SELECT
   , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
   , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
   , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -74,8 +74,8 @@ SELECT
   , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
   , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
   , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -86,8 +86,8 @@ SELECT
   , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
   , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
   , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql
index e240956212..fd0050700e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql
@@ -25,8 +25,8 @@ SELECT
   , EXTRACT(MONTH FROM ds) AS ds__extract_month
   , EXTRACT(WEEK FROM ds) AS ds__extract_week
   , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
@@ -37,8 +37,8 @@ SELECT
   , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
   , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
   , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
@@ -49,8 +49,8 @@ SELECT
   , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
   , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
   , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_doy
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
@@ -62,8 +62,8 @@ SELECT
   , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
   , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
   , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
@@ -74,8 +74,8 @@ SELECT
   , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
   , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
   , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
@@ -86,8 +86,8 @@ SELECT
   , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
   , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
   , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml
index 97591729c5..d5208d36cf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_common_semantic_model__plan0.xml
@@ -117,11 +117,11 @@
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                        <!--    'column_alias': 'ds__extract_dow'}                     -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                        <!--    'column_alias': 'ds__extract_doy'}                     -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -165,11 +165,11 @@
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -213,11 +213,11 @@
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}                -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}                -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -261,11 +261,11 @@
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -306,14 +306,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col58 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col59 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col58 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col59 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col60 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -354,14 +354,14 @@
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                        <!-- col70 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col71 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col70 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                        <!-- col71 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                         <!-- col72 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -405,11 +405,11 @@
                         <!-- col82 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}            -->
                         <!-- col83 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'metric_time__extract_doy'}            -->
                         <!-- col84 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -602,11 +602,11 @@
                             <!-- col25 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!--    'column_alias': 'ds__extract_dow'}               -->
                             <!-- col26 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!--    'column_alias': 'ds__extract_doy'}               -->
                             <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -647,14 +647,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                            <!-- col37 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col38 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col37 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                            <!-- col38 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                             <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -698,11 +698,11 @@
                             <!-- col49 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}          -->
                             <!-- col50 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}          -->
                             <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -747,14 +747,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                            <!-- col62 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                            <!-- col63 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col62 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                            <!-- col63 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                             <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -795,14 +795,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col74 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col75 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col74 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col75 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -843,14 +843,14 @@
                             <!--   {'class': 'SqlSelectColumn',                       -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                            <!-- col86 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col87 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col86 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                            <!-- col87 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                             <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -978,11 +978,11 @@
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                        <!--    'column_alias': 'ds__extract_dow'}                     -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                        <!--    'column_alias': 'ds__extract_doy'}                     -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
@@ -1026,11 +1026,11 @@
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
@@ -1074,11 +1074,11 @@
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}                -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}                -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
@@ -1122,11 +1122,11 @@
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
@@ -1167,14 +1167,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col58 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col59 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col58 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col59 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col60 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
@@ -1215,14 +1215,14 @@
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                        <!-- col70 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col71 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col70 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                        <!-- col71 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                         <!-- col72 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
@@ -1266,11 +1266,11 @@
                         <!-- col82 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}            -->
                         <!-- col83 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'metric_time__extract_doy'}            -->
                         <!-- col84 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
@@ -1463,11 +1463,11 @@
                             <!-- col25 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!--    'column_alias': 'ds__extract_dow'}               -->
                             <!-- col26 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!--    'column_alias': 'ds__extract_doy'}               -->
                             <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1508,14 +1508,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                            <!-- col37 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col38 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col37 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                            <!-- col38 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                             <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1559,11 +1559,11 @@
                             <!-- col49 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}          -->
                             <!-- col50 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}          -->
                             <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -1608,14 +1608,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                            <!-- col62 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                            <!-- col63 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col62 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                            <!-- col63 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                             <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -1656,14 +1656,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col74 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col75 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col74 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col75 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -1704,14 +1704,14 @@
                             <!--   {'class': 'SqlSelectColumn',                       -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                            <!-- col86 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col87 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col86 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                            <!-- col87 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                             <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml
index 34419b3c74..2660580f8d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node__plan0.xml
@@ -185,11 +185,11 @@
                         <!-- col25 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
                         <!-- col26 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
                         <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -230,14 +230,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                        <!-- col37 =                                                  -->
-                        <!--   {'class': 'SqlSelectColumn',                           -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col38 =                                                  -->
-                        <!--   {'class': 'SqlSelectColumn',                           -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col37 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                        <!-- col38 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                         <!-- col39 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -281,11 +281,11 @@
                         <!-- col49 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}          -->
                         <!-- col50 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}          -->
                         <!-- col51 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -330,14 +330,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                         <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                        <!-- col62 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                        <!-- col63 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                        <!-- col62 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                        <!-- col63 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                         <!-- col64 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -378,14 +378,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col74 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col75 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col74 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col75 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col76 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -426,14 +426,14 @@
                         <!--   {'class': 'SqlSelectColumn',                       -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                        <!-- col86 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col87 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col86 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                        <!-- col87 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                         <!-- col88 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -540,11 +540,11 @@
                         <!-- col13 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
                         <!-- col14 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
                         <!-- col15 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -585,14 +585,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                         <!--    'column_alias': 'created_at__extract_day'}       -->
-                        <!-- col25 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                       -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                        <!-- col26 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                       -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                        <!-- col25 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                        <!--    'column_alias': 'created_at__extract_dow'}       -->
+                        <!-- col26 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                        <!--    'column_alias': 'created_at__extract_doy'}       -->
                         <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -645,14 +645,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                         <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                        <!-- col40 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                        <!-- col41 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                        <!-- col40 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                        <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                        <!-- col41 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                        <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                         <!-- col42 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -693,14 +693,14 @@
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                         <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                        <!-- col52 =                                                       -->
-                        <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                        <!-- col53 =                                                       -->
-                        <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                        <!-- col52 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                        <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                        <!-- col53 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                        <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                         <!-- col54 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
index 7fc551df80..543c84a88f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.xml
@@ -196,11 +196,11 @@
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -244,11 +244,11 @@
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -292,11 +292,11 @@
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -340,11 +340,11 @@
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -385,14 +385,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col58 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col59 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col58 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col59 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -433,14 +433,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                    <!-- col70 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col71 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col70 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                    <!-- col71 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -484,11 +484,11 @@
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -681,11 +681,11 @@
                                         <!-- col25 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!--    'column_alias': 'ds__extract_dow'}               -->
                                         <!-- col26 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!--    'column_alias': 'ds__extract_doy'}               -->
                                         <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -726,14 +726,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                         <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                        <!-- col37 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col38 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col37 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                        <!-- col38 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                         <!-- col39 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -777,11 +777,11 @@
                                         <!-- col49 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                         <!-- col50 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                         <!-- col51 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -826,14 +826,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                         <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                        <!-- col62 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                        <!-- col63 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col62 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                        <!-- col63 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                         <!-- col64 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -874,14 +874,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                        <!-- col74 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col75 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col74 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                        <!-- col75 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                         <!-- col76 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -922,14 +922,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                       -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                         <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                        <!-- col86 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                        <!-- col87 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col86 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                        <!-- col87 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                         <!-- col88 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -1025,11 +1025,11 @@
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
@@ -1073,11 +1073,11 @@
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
-                                    <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
+                                    <!--    'column_alias': 'created_at__extract_dow'}             -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
-                                    <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
+                                    <!--    'column_alias': 'created_at__extract_doy'}             -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
@@ -1121,11 +1121,11 @@
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
-                                    <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'listing__ds__extract_dow'}            -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
-                                    <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'listing__ds__extract_doy'}            -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
@@ -1166,14 +1166,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_day'}    -->
-                                    <!-- col46 =                                                       -->
-                                    <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),      -->
-                                    <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                    <!-- col47 =                                                       -->
-                                    <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),      -->
-                                    <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                    <!-- col46 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_dow'}    -->
+                                    <!-- col47 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_doy'}    -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
@@ -1217,11 +1217,11 @@
                                     <!-- col58 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                     <!-- col59 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
@@ -1330,11 +1330,11 @@
                                         <!-- col13 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!--    'column_alias': 'ds__extract_dow'}               -->
                                         <!-- col14 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!--    'column_alias': 'ds__extract_doy'}               -->
                                         <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -1375,14 +1375,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                                         <!--    'column_alias': 'created_at__extract_day'}       -->
-                                        <!-- col25 =                                              -->
-                                        <!--   {'class': 'SqlSelectColumn',                       -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                                        <!-- col26 =                                              -->
-                                        <!--   {'class': 'SqlSelectColumn',                       -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                        <!-- col25 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                                        <!--    'column_alias': 'created_at__extract_dow'}       -->
+                                        <!-- col26 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                                        <!--    'column_alias': 'created_at__extract_doy'}       -->
                                         <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -1435,14 +1435,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                                         <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                                        <!-- col40 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                                        <!-- col41 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                        <!-- col40 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                                        <!-- col41 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                                         <!-- col42 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -1483,14 +1483,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                          -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                                         <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                                        <!-- col52 =                                                       -->
-                                        <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                        <!-- col53 =                                                       -->
-                                        <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                        <!-- col52 =                                                 -->
+                                        <!--   {'class': 'SqlSelectColumn',                          -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                                        <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                                        <!-- col53 =                                                 -->
+                                        <!--   {'class': 'SqlSelectColumn',                          -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                                        <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                                         <!-- col54 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
@@ -1682,11 +1682,11 @@
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
@@ -1730,11 +1730,11 @@
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
@@ -1778,11 +1778,11 @@
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
-                                    <!--    'column_alias': 'view__ds__extract_dayofweek'}         -->
+                                    <!--    'column_alias': 'view__ds__extract_dow'}               -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
-                                    <!--    'column_alias': 'view__ds__extract_dayofyear'}         -->
+                                    <!--    'column_alias': 'view__ds__extract_doy'}               -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
@@ -1823,14 +1823,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
                                     <!--    'column_alias': 'view__ds_partitioned__extract_day'}   -->
-                                    <!-- col46 =                                                        -->
-                                    <!--   {'class': 'SqlSelectColumn',                                 -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),       -->
-                                    <!--    'column_alias': 'view__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col47 =                                                        -->
-                                    <!--   {'class': 'SqlSelectColumn',                                 -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),       -->
-                                    <!--    'column_alias': 'view__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col46 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                                    <!--    'column_alias': 'view__ds_partitioned__extract_dow'}   -->
+                                    <!-- col47 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                                    <!--    'column_alias': 'view__ds_partitioned__extract_doy'}   -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
@@ -1874,11 +1874,11 @@
                                     <!-- col58 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                     <!-- col59 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
@@ -1951,11 +1951,11 @@
                                         <!-- col11 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10187),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!--    'column_alias': 'ds__extract_dow'}               -->
                                         <!-- col12 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10188),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!--    'column_alias': 'ds__extract_doy'}               -->
                                         <!-- col13 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10088),  -->
@@ -1996,14 +1996,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10193),  -->
                                         <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                        <!-- col23 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10194),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col24 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10195),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col23 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10194),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                        <!-- col24 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10195),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                         <!-- col25 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10089),  -->
@@ -2047,11 +2047,11 @@
                                         <!-- col35 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10201),  -->
-                                        <!--    'column_alias': 'view__ds__extract_dayofweek'}   -->
+                                        <!--    'column_alias': 'view__ds__extract_dow'}         -->
                                         <!-- col36 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10202),  -->
-                                        <!--    'column_alias': 'view__ds__extract_dayofyear'}   -->
+                                        <!--    'column_alias': 'view__ds__extract_doy'}         -->
                                         <!-- col37 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10090),  -->
@@ -2092,14 +2092,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                           -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10207),       -->
                                         <!--    'column_alias': 'view__ds_partitioned__extract_day'}  -->
-                                        <!-- col47 =                                                        -->
-                                        <!--   {'class': 'SqlSelectColumn',                                 -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10208),             -->
-                                        <!--    'column_alias': 'view__ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col48 =                                                        -->
-                                        <!--   {'class': 'SqlSelectColumn',                                 -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10209),             -->
-                                        <!--    'column_alias': 'view__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col47 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10208),       -->
+                                        <!--    'column_alias': 'view__ds_partitioned__extract_dow'}  -->
+                                        <!-- col48 =                                                  -->
+                                        <!--   {'class': 'SqlSelectColumn',                           -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10209),       -->
+                                        <!--    'column_alias': 'view__ds_partitioned__extract_doy'}  -->
                                         <!-- col49 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10091),  -->
@@ -2187,11 +2187,11 @@
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
@@ -2235,11 +2235,11 @@
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
-                                    <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
+                                    <!--    'column_alias': 'created_at__extract_dow'}             -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
-                                    <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
+                                    <!--    'column_alias': 'created_at__extract_doy'}             -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
@@ -2283,11 +2283,11 @@
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
-                                    <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'listing__ds__extract_dow'}            -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
-                                    <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'listing__ds__extract_doy'}            -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
@@ -2328,14 +2328,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_802),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_day'}    -->
-                                    <!-- col46 =                                                       -->
-                                    <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),      -->
-                                    <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                    <!-- col47 =                                                       -->
-                                    <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),      -->
-                                    <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                    <!-- col46 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_803),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_dow'}    -->
+                                    <!-- col47 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_doy'}    -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
@@ -2379,11 +2379,11 @@
                                     <!-- col58 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_815),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                     <!-- col59 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_816),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_817),  -->
@@ -2492,11 +2492,11 @@
                                         <!-- col13 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!--    'column_alias': 'ds__extract_dow'}               -->
                                         <!-- col14 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!--    'column_alias': 'ds__extract_doy'}               -->
                                         <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -2537,14 +2537,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                                         <!--    'column_alias': 'created_at__extract_day'}       -->
-                                        <!-- col25 =                                              -->
-                                        <!--   {'class': 'SqlSelectColumn',                       -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                                        <!-- col26 =                                              -->
-                                        <!--   {'class': 'SqlSelectColumn',                       -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                        <!-- col25 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                                        <!--    'column_alias': 'created_at__extract_dow'}       -->
+                                        <!-- col26 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                                        <!--    'column_alias': 'created_at__extract_doy'}       -->
                                         <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -2597,14 +2597,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                                         <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                                        <!-- col40 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                                        <!-- col41 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                        <!-- col40 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                                        <!-- col41 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                                         <!-- col42 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -2645,14 +2645,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                          -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                                         <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                                        <!-- col52 =                                                       -->
-                                        <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                        <!-- col53 =                                                       -->
-                                        <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                        <!-- col52 =                                                 -->
+                                        <!--   {'class': 'SqlSelectColumn',                          -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                                        <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                                        <!-- col53 =                                                 -->
+                                        <!--   {'class': 'SqlSelectColumn',                          -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                                        <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                                         <!-- col54 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
index 95cd7fa4a4..9caab95d18 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.xml
@@ -197,11 +197,11 @@
                         <!-- col25 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
                         <!-- col26 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
                         <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -242,14 +242,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                        <!-- col37 =                                                  -->
-                        <!--   {'class': 'SqlSelectColumn',                           -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col38 =                                                  -->
-                        <!--   {'class': 'SqlSelectColumn',                           -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col37 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                        <!-- col38 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                         <!-- col39 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -293,11 +293,11 @@
                         <!-- col49 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}          -->
                         <!-- col50 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}          -->
                         <!-- col51 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -342,14 +342,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                         <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                        <!-- col62 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                        <!-- col63 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                        <!-- col62 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                        <!-- col63 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                         <!-- col64 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -390,14 +390,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col74 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col75 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col74 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col75 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col76 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -438,14 +438,14 @@
                         <!--   {'class': 'SqlSelectColumn',                       -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                        <!-- col86 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col87 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col86 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                        <!-- col87 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                         <!-- col88 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -552,11 +552,11 @@
                         <!-- col13 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
                         <!-- col14 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
                         <!-- col15 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -597,14 +597,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                         <!--    'column_alias': 'created_at__extract_day'}       -->
-                        <!-- col25 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                       -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                        <!-- col26 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                       -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                        <!-- col25 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                        <!--    'column_alias': 'created_at__extract_dow'}       -->
+                        <!-- col26 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                        <!--    'column_alias': 'created_at__extract_doy'}       -->
                         <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -657,14 +657,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                         <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                        <!-- col40 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                        <!-- col41 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                        <!-- col40 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                        <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                        <!-- col41 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                        <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                         <!-- col42 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -705,14 +705,14 @@
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                         <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                        <!-- col52 =                                                       -->
-                        <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                        <!-- col53 =                                                       -->
-                        <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                        <!-- col52 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                        <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                        <!-- col53 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                        <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                         <!-- col54 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml
index 9f5069ebd5..5510083da3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_compute_metrics_node_simple_expr__plan0.xml
@@ -185,11 +185,11 @@
                         <!-- col25 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
                         <!-- col26 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
                         <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -230,14 +230,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                        <!-- col37 =                                                  -->
-                        <!--   {'class': 'SqlSelectColumn',                           -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col38 =                                                  -->
-                        <!--   {'class': 'SqlSelectColumn',                           -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col37 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                        <!-- col38 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                         <!-- col39 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -281,11 +281,11 @@
                         <!-- col49 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}          -->
                         <!-- col50 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}          -->
                         <!-- col51 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -330,14 +330,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                         <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                        <!-- col62 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                        <!-- col63 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                        <!-- col62 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                        <!-- col63 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                         <!-- col64 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -378,14 +378,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col74 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col75 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col74 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col75 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col76 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -426,14 +426,14 @@
                         <!--   {'class': 'SqlSelectColumn',                       -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                        <!-- col86 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col87 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col86 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                        <!-- col87 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                         <!-- col88 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -540,11 +540,11 @@
                         <!-- col13 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
                         <!-- col14 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
                         <!-- col15 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -585,14 +585,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                         <!--    'column_alias': 'created_at__extract_day'}       -->
-                        <!-- col25 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                       -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                        <!-- col26 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                       -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                        <!-- col25 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                        <!--    'column_alias': 'created_at__extract_dow'}       -->
+                        <!-- col26 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                        <!--    'column_alias': 'created_at__extract_doy'}       -->
                         <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -645,14 +645,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                         <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                        <!-- col40 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                        <!-- col41 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                        <!-- col40 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                        <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                        <!-- col41 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                        <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                         <!-- col42 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -693,14 +693,14 @@
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                         <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                        <!-- col52 =                                                       -->
-                        <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                        <!-- col53 =                                                       -->
-                        <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                        <!-- col52 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                        <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                        <!-- col53 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                        <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                         <!-- col54 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml
index 4dbe746624..6832ab1d88 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_constrain_time_range_node__plan0.xml
@@ -155,11 +155,11 @@
                     <!-- col25 =                                             -->
                     <!--   {'class': 'SqlSelectColumn',                      -->
                     <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                    <!--    'column_alias': 'ds__extract_dow'}               -->
                     <!-- col26 =                                             -->
                     <!--   {'class': 'SqlSelectColumn',                      -->
                     <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                    <!--    'column_alias': 'ds__extract_doy'}               -->
                     <!-- col27 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -200,14 +200,14 @@
                     <!--   {'class': 'SqlSelectColumn',                      -->
                     <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                     <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                    <!-- col37 =                                                  -->
-                    <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                    <!-- col38 =                                                  -->
-                    <!--   {'class': 'SqlSelectColumn',                           -->
-                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                    <!-- col37 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                    <!-- col38 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                     <!-- col39 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -251,11 +251,11 @@
                     <!-- col49 =                                             -->
                     <!--   {'class': 'SqlSelectColumn',                      -->
                     <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                    <!--    'column_alias': 'paid_at__extract_dow'}          -->
                     <!-- col50 =                                             -->
                     <!--   {'class': 'SqlSelectColumn',                      -->
                     <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                    <!--    'column_alias': 'paid_at__extract_doy'}          -->
                     <!-- col51 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -300,14 +300,14 @@
                     <!--   {'class': 'SqlSelectColumn',                      -->
                     <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                     <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                    <!-- col62 =                                               -->
-                    <!--   {'class': 'SqlSelectColumn',                        -->
-                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                    <!-- col63 =                                               -->
-                    <!--   {'class': 'SqlSelectColumn',                        -->
-                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                    <!-- col62 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                    <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                    <!-- col63 =                                             -->
+                    <!--   {'class': 'SqlSelectColumn',                      -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                    <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                     <!-- col64 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -348,14 +348,14 @@
                     <!--   {'class': 'SqlSelectColumn',                              -->
                     <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                    <!-- col74 =                                                           -->
-                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                    <!-- col75 =                                                           -->
-                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                    <!-- col74 =                                                     -->
+                    <!--   {'class': 'SqlSelectColumn',                              -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                    <!-- col75 =                                                     -->
+                    <!--   {'class': 'SqlSelectColumn',                              -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                     <!-- col76 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -396,14 +396,14 @@
                     <!--   {'class': 'SqlSelectColumn',                       -->
                     <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                     <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                    <!-- col86 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                             -->
-                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                    <!-- col87 =                                                    -->
-                    <!--   {'class': 'SqlSelectColumn',                             -->
-                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                    <!-- col86 =                                              -->
+                    <!--   {'class': 'SqlSelectColumn',                       -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                    <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                    <!-- col87 =                                              -->
+                    <!--   {'class': 'SqlSelectColumn',                       -->
+                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                    <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                     <!-- col88 =                                                     -->
                     <!--   {'class': 'SqlSelectColumn',                              -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
index 37c8fa43eb..6a4f2968b1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric__plan0.xml
@@ -90,11 +90,11 @@
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
-                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
-                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
@@ -138,11 +138,11 @@
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
-                    <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'company__ds__extract_dow'}            -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
-                    <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'company__ds__extract_doy'}            -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
@@ -186,11 +186,11 @@
                     <!-- col34 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                     <!-- col35 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                     <!-- col36 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
@@ -255,11 +255,11 @@
                         <!-- col11 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10117),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
                         <!-- col12 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10118),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
                         <!-- col13 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10070),  -->
@@ -300,14 +300,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10123),  -->
                         <!--    'column_alias': 'company__ds__extract_day'}      -->
-                        <!-- col23 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10124),    -->
-                        <!--    'column_alias': 'company__ds__extract_dayofweek'}  -->
-                        <!-- col24 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10125),    -->
-                        <!--    'column_alias': 'company__ds__extract_dayofyear'}  -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10124),  -->
+                        <!--    'column_alias': 'company__ds__extract_dow'}      -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10125),  -->
+                        <!--    'column_alias': 'company__ds__extract_doy'}      -->
                         <!-- col25 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
index 5dc0f7e4cf..05e69c0c94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_grain_to_date__plan0.xml
@@ -90,11 +90,11 @@
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
-                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
-                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
@@ -138,11 +138,11 @@
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
-                    <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'company__ds__extract_dow'}            -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
-                    <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'company__ds__extract_doy'}            -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
@@ -186,11 +186,11 @@
                     <!-- col34 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                     <!-- col35 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                     <!-- col36 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
@@ -255,11 +255,11 @@
                         <!-- col11 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10117),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
                         <!-- col12 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10118),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
                         <!-- col13 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10070),  -->
@@ -300,14 +300,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10123),  -->
                         <!--    'column_alias': 'company__ds__extract_day'}      -->
-                        <!-- col23 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10124),    -->
-                        <!--    'column_alias': 'company__ds__extract_dayofweek'}  -->
-                        <!-- col24 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10125),    -->
-                        <!--    'column_alias': 'company__ds__extract_dayofyear'}  -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10124),  -->
+                        <!--    'column_alias': 'company__ds__extract_dow'}      -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10125),  -->
+                        <!--    'column_alias': 'company__ds__extract_doy'}      -->
                         <!-- col25 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
index ea17474430..c44152f685 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_ds__plan0.xml
@@ -74,11 +74,11 @@
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
-                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
-                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
@@ -122,11 +122,11 @@
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
-                    <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'company__ds__extract_dow'}            -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
-                    <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'company__ds__extract_doy'}            -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
@@ -170,11 +170,11 @@
                     <!-- col34 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                     <!-- col35 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                     <!-- col36 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
@@ -239,11 +239,11 @@
                         <!-- col11 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10117),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
                         <!-- col12 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10118),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
                         <!-- col13 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10070),  -->
@@ -284,14 +284,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10123),  -->
                         <!--    'column_alias': 'company__ds__extract_day'}      -->
-                        <!-- col23 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10124),    -->
-                        <!--    'column_alias': 'company__ds__extract_dayofweek'}  -->
-                        <!-- col24 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10125),    -->
-                        <!--    'column_alias': 'company__ds__extract_dayofyear'}  -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10124),  -->
+                        <!--    'column_alias': 'company__ds__extract_dow'}      -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10125),  -->
+                        <!--    'column_alias': 'company__ds__extract_doy'}      -->
                         <!-- col25 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
index e1894ad698..c246fb55db 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window__plan0.xml
@@ -90,11 +90,11 @@
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),  -->
-                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),  -->
-                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
@@ -138,11 +138,11 @@
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
-                    <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'company__ds__extract_dow'}            -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
-                    <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'company__ds__extract_doy'}            -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
@@ -186,11 +186,11 @@
                     <!-- col34 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                     <!-- col35 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                     <!-- col36 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
@@ -255,11 +255,11 @@
                         <!-- col11 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10117),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
                         <!-- col12 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10118),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
                         <!-- col13 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10070),  -->
@@ -300,14 +300,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10123),  -->
                         <!--    'column_alias': 'company__ds__extract_day'}      -->
-                        <!-- col23 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10124),    -->
-                        <!--    'column_alias': 'company__ds__extract_dayofweek'}  -->
-                        <!-- col24 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10125),    -->
-                        <!--    'column_alias': 'company__ds__extract_dayofyear'}  -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10124),  -->
+                        <!--    'column_alias': 'company__ds__extract_dow'}      -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10125),  -->
+                        <!--    'column_alias': 'company__ds__extract_doy'}      -->
                         <!-- col25 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
index 015b695d28..11c4a6ef28 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_no_window_with_time_constraint__plan0.xml
@@ -91,11 +91,11 @@
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
-                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
-                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
@@ -139,11 +139,11 @@
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
-                    <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'company__ds__extract_dow'}            -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
-                    <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'company__ds__extract_doy'}            -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
@@ -187,11 +187,11 @@
                     <!-- col34 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                     <!-- col35 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                     <!-- col36 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
@@ -252,11 +252,11 @@
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                        <!--    'column_alias': 'ds__extract_dow'}                     -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                        <!--    'column_alias': 'ds__extract_doy'}                     -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
@@ -300,11 +300,11 @@
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
-                        <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'company__ds__extract_dow'}            -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
-                        <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'company__ds__extract_doy'}            -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
@@ -348,11 +348,11 @@
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}            -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'metric_time__extract_doy'}            -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
@@ -417,11 +417,11 @@
                             <!-- col11 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10117),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!--    'column_alias': 'ds__extract_dow'}               -->
                             <!-- col12 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10118),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!--    'column_alias': 'ds__extract_doy'}               -->
                             <!-- col13 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10070),  -->
@@ -462,14 +462,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10123),  -->
                             <!--    'column_alias': 'company__ds__extract_day'}      -->
-                            <!-- col23 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10124),    -->
-                            <!--    'column_alias': 'company__ds__extract_dayofweek'}  -->
-                            <!-- col24 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10125),    -->
-                            <!--    'column_alias': 'company__ds__extract_dayofyear'}  -->
+                            <!-- col23 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10124),  -->
+                            <!--    'column_alias': 'company__ds__extract_dow'}      -->
+                            <!-- col24 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10125),  -->
+                            <!--    'column_alias': 'company__ds__extract_doy'}      -->
                             <!-- col25 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
index dfb4ab1ff7..69648ea206 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_cumulative_metric_with_time_constraint__plan0.xml
@@ -91,11 +91,11 @@
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
-                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
-                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
@@ -139,11 +139,11 @@
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
-                    <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'company__ds__extract_dow'}            -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
-                    <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'company__ds__extract_doy'}            -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
@@ -187,11 +187,11 @@
                     <!-- col34 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                     <!-- col35 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                     <!-- col36 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
@@ -252,11 +252,11 @@
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                        <!--    'column_alias': 'ds__extract_dow'}                     -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                        <!--    'column_alias': 'ds__extract_doy'}                     -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
@@ -300,11 +300,11 @@
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
-                        <!--    'column_alias': 'company__ds__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'company__ds__extract_dow'}            -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
-                        <!--    'column_alias': 'company__ds__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'company__ds__extract_doy'}            -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
@@ -348,11 +348,11 @@
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}            -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'metric_time__extract_doy'}            -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
@@ -417,11 +417,11 @@
                             <!-- col11 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10117),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!--    'column_alias': 'ds__extract_dow'}               -->
                             <!-- col12 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10118),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!--    'column_alias': 'ds__extract_doy'}               -->
                             <!-- col13 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10070),  -->
@@ -462,14 +462,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10123),  -->
                             <!--    'column_alias': 'company__ds__extract_day'}      -->
-                            <!-- col23 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10124),    -->
-                            <!--    'column_alias': 'company__ds__extract_dayofweek'}  -->
-                            <!-- col24 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10125),    -->
-                            <!--    'column_alias': 'company__ds__extract_dayofyear'}  -->
+                            <!-- col23 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10124),  -->
+                            <!--    'column_alias': 'company__ds__extract_dow'}      -->
+                            <!-- col24 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10125),  -->
+                            <!--    'column_alias': 'company__ds__extract_doy'}      -->
                             <!-- col25 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10071),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml
index dd9355e958..c527d74a06 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric__plan0.xml
@@ -126,11 +126,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -174,11 +174,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -222,11 +222,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -270,11 +270,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -315,14 +315,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -363,14 +363,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -414,11 +414,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -611,11 +611,11 @@
                                 <!-- col25 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col26 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -656,14 +656,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col37 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col38 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -707,11 +707,11 @@
                                 <!-- col49 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col50 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -756,14 +756,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col62 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col63 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -804,14 +804,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col74 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col75 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -852,14 +852,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col86 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col87 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -987,11 +987,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
@@ -1035,11 +1035,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
@@ -1083,11 +1083,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
@@ -1131,11 +1131,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
@@ -1176,14 +1176,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
@@ -1224,14 +1224,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
@@ -1275,11 +1275,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
@@ -1472,11 +1472,11 @@
                                 <!-- col25 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col26 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1517,14 +1517,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col37 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col38 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1568,11 +1568,11 @@
                                 <!-- col49 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col50 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -1617,14 +1617,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col62 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col63 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -1665,14 +1665,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col74 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col75 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -1713,14 +1713,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col86 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col87 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml
index d630756d83..d35dd96911 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain__plan0.xml
@@ -126,11 +126,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -174,11 +174,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -222,11 +222,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -270,11 +270,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -315,14 +315,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -363,14 +363,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -414,11 +414,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -611,11 +611,11 @@
                                 <!-- col25 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col26 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -656,14 +656,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col37 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col38 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -707,11 +707,11 @@
                                 <!-- col49 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col50 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -756,14 +756,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col62 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col63 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -804,14 +804,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col74 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col75 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -852,14 +852,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col86 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col87 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -991,11 +991,11 @@
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
@@ -1039,11 +1039,11 @@
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
@@ -1087,11 +1087,11 @@
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
@@ -1135,11 +1135,11 @@
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
@@ -1180,14 +1180,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col60 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col60 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
@@ -1228,14 +1228,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col72 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
@@ -1389,11 +1389,11 @@
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                <!--    'column_alias': 'ds__extract_dow'}                     -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                <!--    'column_alias': 'ds__extract_doy'}                     -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
@@ -1437,11 +1437,11 @@
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
@@ -1485,11 +1485,11 @@
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
@@ -1533,11 +1533,11 @@
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
@@ -1578,14 +1578,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col58 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col59 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col58 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col59 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
@@ -1626,14 +1626,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                <!-- col70 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col71 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col70 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                <!-- col71 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
@@ -1677,11 +1677,11 @@
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
@@ -1874,11 +1874,11 @@
                                     <!-- col25 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!--    'column_alias': 'ds__extract_dow'}               -->
                                     <!-- col26 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!--    'column_alias': 'ds__extract_doy'}               -->
                                     <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1919,14 +1919,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                    <!-- col37 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col38 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col37 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                    <!-- col38 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                     <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1970,11 +1970,11 @@
                                     <!-- col49 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                     <!-- col50 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                     <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -2019,14 +2019,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                    <!-- col62 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                    <!-- col63 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col62 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                    <!-- col63 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                     <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -2067,14 +2067,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col74 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col75 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col74 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col75 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -2115,14 +2115,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                       -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                    <!-- col86 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col87 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col86 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                    <!-- col87 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                     <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml
index 62931da30f..6b48478444 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_to_grain_and_granularity__plan0.xml
@@ -126,11 +126,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -174,11 +174,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -222,11 +222,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -270,11 +270,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -315,14 +315,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -363,14 +363,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -414,11 +414,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -611,11 +611,11 @@
                                 <!-- col25 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col26 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -656,14 +656,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col37 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col38 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -707,11 +707,11 @@
                                 <!-- col49 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col50 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -756,14 +756,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col62 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col63 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -804,14 +804,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col74 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col75 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -852,14 +852,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col86 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col87 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -991,11 +991,11 @@
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
@@ -1039,11 +1039,11 @@
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
@@ -1087,11 +1087,11 @@
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
@@ -1135,11 +1135,11 @@
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
@@ -1180,14 +1180,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col60 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col60 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
@@ -1228,14 +1228,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col72 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
@@ -1389,11 +1389,11 @@
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                <!--    'column_alias': 'ds__extract_dow'}                     -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                <!--    'column_alias': 'ds__extract_doy'}                     -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
@@ -1437,11 +1437,11 @@
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
@@ -1485,11 +1485,11 @@
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
@@ -1533,11 +1533,11 @@
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
@@ -1578,14 +1578,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col58 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col59 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col58 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col59 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
@@ -1626,14 +1626,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                <!-- col70 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col71 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col70 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                <!-- col71 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
@@ -1677,11 +1677,11 @@
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
@@ -1874,11 +1874,11 @@
                                     <!-- col25 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!--    'column_alias': 'ds__extract_dow'}               -->
                                     <!-- col26 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!--    'column_alias': 'ds__extract_doy'}               -->
                                     <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1919,14 +1919,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                    <!-- col37 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col38 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col37 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                    <!-- col38 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                     <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1970,11 +1970,11 @@
                                     <!-- col49 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                     <!-- col50 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                     <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -2019,14 +2019,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                    <!-- col62 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                    <!-- col63 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col62 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                    <!-- col63 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                     <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -2067,14 +2067,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col74 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col75 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col74 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col75 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -2115,14 +2115,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                       -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                    <!-- col86 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col87 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col86 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                    <!-- col87 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                     <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml
index f0fad5688e..5b50744b8e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window__plan0.xml
@@ -126,11 +126,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -174,11 +174,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -222,11 +222,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -270,11 +270,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -315,14 +315,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -363,14 +363,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -414,11 +414,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -611,11 +611,11 @@
                                 <!-- col25 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col26 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -656,14 +656,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col37 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col38 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -707,11 +707,11 @@
                                 <!-- col49 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col50 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -756,14 +756,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col62 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col63 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -804,14 +804,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col74 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col75 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -852,14 +852,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col86 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col87 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -991,11 +991,11 @@
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
@@ -1039,11 +1039,11 @@
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
@@ -1087,11 +1087,11 @@
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
@@ -1135,11 +1135,11 @@
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
@@ -1180,14 +1180,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col60 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col60 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
@@ -1228,14 +1228,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col72 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
@@ -1389,11 +1389,11 @@
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                <!--    'column_alias': 'ds__extract_dow'}                     -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                <!--    'column_alias': 'ds__extract_doy'}                     -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
@@ -1437,11 +1437,11 @@
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
@@ -1485,11 +1485,11 @@
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
@@ -1533,11 +1533,11 @@
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
@@ -1578,14 +1578,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col58 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col59 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col58 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col59 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
@@ -1626,14 +1626,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                <!-- col70 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col71 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col70 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                <!-- col71 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
@@ -1677,11 +1677,11 @@
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
@@ -1874,11 +1874,11 @@
                                     <!-- col25 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!--    'column_alias': 'ds__extract_dow'}               -->
                                     <!-- col26 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!--    'column_alias': 'ds__extract_doy'}               -->
                                     <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1919,14 +1919,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                    <!-- col37 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col38 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col37 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                    <!-- col38 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                     <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1970,11 +1970,11 @@
                                     <!-- col49 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                     <!-- col50 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                     <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -2019,14 +2019,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                    <!-- col62 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                    <!-- col63 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col62 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                    <!-- col63 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                     <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -2067,14 +2067,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col74 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col75 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col74 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col75 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -2115,14 +2115,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                       -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                    <!-- col86 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col87 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col86 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                    <!-- col87 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                     <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml
index df2164f79a..ec4e79d22a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_granularity__plan0.xml
@@ -126,11 +126,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -174,11 +174,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -222,11 +222,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -270,11 +270,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -315,14 +315,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -363,14 +363,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -414,11 +414,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -611,11 +611,11 @@
                                 <!-- col25 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col26 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -656,14 +656,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col37 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col38 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -707,11 +707,11 @@
                                 <!-- col49 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col50 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -756,14 +756,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col62 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col63 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -804,14 +804,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col74 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col75 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -852,14 +852,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col86 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col87 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -991,11 +991,11 @@
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
@@ -1039,11 +1039,11 @@
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
@@ -1087,11 +1087,11 @@
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
@@ -1135,11 +1135,11 @@
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
@@ -1180,14 +1180,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col60 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col60 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
@@ -1228,14 +1228,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col72 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
@@ -1389,11 +1389,11 @@
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                <!--    'column_alias': 'ds__extract_dow'}                     -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                <!--    'column_alias': 'ds__extract_doy'}                     -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
@@ -1437,11 +1437,11 @@
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
@@ -1485,11 +1485,11 @@
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
@@ -1533,11 +1533,11 @@
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
@@ -1578,14 +1578,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col58 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col59 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col58 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col59 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
@@ -1626,14 +1626,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                <!-- col70 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col71 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col70 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                <!-- col71 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
@@ -1677,11 +1677,11 @@
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
@@ -1874,11 +1874,11 @@
                                     <!-- col25 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!--    'column_alias': 'ds__extract_dow'}               -->
                                     <!-- col26 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!--    'column_alias': 'ds__extract_doy'}               -->
                                     <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1919,14 +1919,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                    <!-- col37 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col38 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col37 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                    <!-- col38 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                     <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1970,11 +1970,11 @@
                                     <!-- col49 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                     <!-- col50 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                     <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -2019,14 +2019,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                    <!-- col62 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                    <!-- col63 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col62 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                    <!-- col63 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                     <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -2067,14 +2067,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col74 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col75 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col74 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col75 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -2115,14 +2115,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                       -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                    <!-- col86 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col87 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col86 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                    <!-- col87 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                     <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml
index aec16b0428..1014811f94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.xml
@@ -130,11 +130,11 @@
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
@@ -178,11 +178,11 @@
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
@@ -226,11 +226,11 @@
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
@@ -274,11 +274,11 @@
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
@@ -319,14 +319,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col60 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col60 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
@@ -367,14 +367,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col72 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
@@ -528,11 +528,11 @@
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                <!--    'column_alias': 'ds__extract_dow'}                     -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                <!--    'column_alias': 'ds__extract_doy'}                     -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -576,11 +576,11 @@
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -624,11 +624,11 @@
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -672,11 +672,11 @@
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -717,14 +717,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col58 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col59 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col58 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col59 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -765,14 +765,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                <!-- col70 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col71 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col70 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                <!-- col71 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -816,11 +816,11 @@
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -1013,11 +1013,11 @@
                                     <!-- col25 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!--    'column_alias': 'ds__extract_dow'}               -->
                                     <!-- col26 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!--    'column_alias': 'ds__extract_doy'}               -->
                                     <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1058,14 +1058,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                    <!-- col37 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col38 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col37 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                    <!-- col38 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                     <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1109,11 +1109,11 @@
                                     <!-- col49 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                     <!-- col50 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                     <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -1158,14 +1158,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                    <!-- col62 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                    <!-- col63 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col62 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                    <!-- col63 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                     <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -1206,14 +1206,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col74 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col75 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col74 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col75 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -1254,14 +1254,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                       -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                    <!-- col86 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col87 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col86 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                    <!-- col87 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                     <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -1394,11 +1394,11 @@
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
@@ -1442,11 +1442,11 @@
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
@@ -1490,11 +1490,11 @@
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
@@ -1538,11 +1538,11 @@
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
@@ -1583,14 +1583,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col60 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col60 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),  -->
@@ -1631,14 +1631,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col72 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
@@ -1792,11 +1792,11 @@
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                <!--    'column_alias': 'ds__extract_dow'}                     -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                <!--    'column_alias': 'ds__extract_doy'}                     -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
@@ -1840,11 +1840,11 @@
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
@@ -1888,11 +1888,11 @@
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
@@ -1936,11 +1936,11 @@
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
@@ -1981,14 +1981,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col58 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col59 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col58 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col59 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
@@ -2029,14 +2029,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                <!-- col70 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col71 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col70 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                <!-- col71 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
@@ -2080,11 +2080,11 @@
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
@@ -2277,11 +2277,11 @@
                                     <!-- col25 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!--    'column_alias': 'ds__extract_dow'}               -->
                                     <!-- col26 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!--    'column_alias': 'ds__extract_doy'}               -->
                                     <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -2322,14 +2322,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                    <!-- col37 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col38 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col37 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                    <!-- col38 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                     <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -2373,11 +2373,11 @@
                                     <!-- col49 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                     <!-- col50 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                     <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -2422,14 +2422,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                    <!-- col62 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                    <!-- col63 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col62 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                    <!-- col63 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                     <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -2470,14 +2470,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col74 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col75 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col74 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col75 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -2518,14 +2518,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                       -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                    <!-- col86 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col87 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col86 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                    <!-- col87 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                     <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml
index 600937f011..db25cedbd2 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.xml
@@ -130,11 +130,11 @@
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
@@ -178,11 +178,11 @@
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
@@ -226,11 +226,11 @@
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
@@ -274,11 +274,11 @@
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
@@ -319,14 +319,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col60 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col60 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
@@ -367,14 +367,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col72 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
@@ -528,11 +528,11 @@
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                <!--    'column_alias': 'ds__extract_dow'}                     -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                <!--    'column_alias': 'ds__extract_doy'}                     -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -576,11 +576,11 @@
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -624,11 +624,11 @@
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -672,11 +672,11 @@
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -717,14 +717,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col58 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col59 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col58 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col59 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -765,14 +765,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                <!-- col70 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col71 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col70 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                <!-- col71 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -816,11 +816,11 @@
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -1013,11 +1013,11 @@
                                     <!-- col25 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!--    'column_alias': 'ds__extract_dow'}               -->
                                     <!-- col26 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!--    'column_alias': 'ds__extract_doy'}               -->
                                     <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1058,14 +1058,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                    <!-- col37 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col38 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col37 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                    <!-- col38 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                     <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1109,11 +1109,11 @@
                                     <!-- col49 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                     <!-- col50 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                     <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -1158,14 +1158,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                    <!-- col62 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                    <!-- col63 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col62 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                    <!-- col63 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                     <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -1206,14 +1206,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col74 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col75 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col74 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col75 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -1254,14 +1254,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                       -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                    <!-- col86 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col87 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col86 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                    <!-- col87 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                     <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -1394,11 +1394,11 @@
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_825),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_826),  -->
@@ -1442,11 +1442,11 @@
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_837),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_838),  -->
@@ -1490,11 +1490,11 @@
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
@@ -1538,11 +1538,11 @@
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
@@ -1583,14 +1583,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_871),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col60 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col60 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),  -->
@@ -1631,14 +1631,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_883),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col72 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
@@ -1792,11 +1792,11 @@
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                <!--    'column_alias': 'ds__extract_dow'}                     -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                <!--    'column_alias': 'ds__extract_doy'}                     -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
@@ -1840,11 +1840,11 @@
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
@@ -1888,11 +1888,11 @@
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
@@ -1936,11 +1936,11 @@
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
@@ -1981,14 +1981,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col58 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col59 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col58 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col59 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
@@ -2029,14 +2029,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                <!-- col70 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col71 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col70 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                <!-- col71 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
@@ -2080,11 +2080,11 @@
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
@@ -2277,11 +2277,11 @@
                                     <!-- col25 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!--    'column_alias': 'ds__extract_dow'}               -->
                                     <!-- col26 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!--    'column_alias': 'ds__extract_doy'}               -->
                                     <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -2322,14 +2322,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                    <!-- col37 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col38 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col37 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                    <!-- col38 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                     <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -2373,11 +2373,11 @@
                                     <!-- col49 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                     <!-- col50 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                     <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -2422,14 +2422,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                    <!-- col62 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                    <!-- col63 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col62 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                    <!-- col63 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                     <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -2470,14 +2470,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col74 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col75 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col74 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col75 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -2518,14 +2518,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                       -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                    <!-- col86 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col87 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col86 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                    <!-- col87 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                     <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml
index 30d603cdd8..91104c0b88 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_cumulative_metric__plan0.xml
@@ -107,11 +107,11 @@
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                        <!--    'column_alias': 'ds__extract_dow'}                     -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                        <!--    'column_alias': 'ds__extract_doy'}                     -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
@@ -155,11 +155,11 @@
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
@@ -203,11 +203,11 @@
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}                -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}                -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
@@ -251,11 +251,11 @@
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
@@ -296,14 +296,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col59 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col60 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col59 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col60 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col61 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
@@ -344,14 +344,14 @@
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                        <!-- col71 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col72 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col71 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                        <!-- col72 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                         <!-- col73 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
@@ -509,11 +509,11 @@
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col13 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
@@ -557,11 +557,11 @@
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col25 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
@@ -605,11 +605,11 @@
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col37 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
@@ -653,11 +653,11 @@
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col49 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
@@ -698,14 +698,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col60 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col60 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col61 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
@@ -746,14 +746,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col72 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col73 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
@@ -793,11 +793,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
@@ -951,11 +951,11 @@
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                <!--    'column_alias': 'ds__extract_dow'}                     -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                <!--    'column_alias': 'ds__extract_doy'}                     -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -999,11 +999,11 @@
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -1047,11 +1047,11 @@
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -1095,11 +1095,11 @@
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -1140,14 +1140,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col58 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col59 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col58 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col59 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -1188,14 +1188,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                <!-- col70 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col71 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col70 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                <!-- col71 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -1239,11 +1239,11 @@
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -1436,11 +1436,11 @@
                                     <!-- col25 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!--    'column_alias': 'ds__extract_dow'}               -->
                                     <!-- col26 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!--    'column_alias': 'ds__extract_doy'}               -->
                                     <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1481,14 +1481,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                    <!-- col37 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col38 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col37 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                    <!-- col38 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                     <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1532,11 +1532,11 @@
                                     <!-- col49 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                     <!-- col50 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                     <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -1581,14 +1581,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                    <!-- col62 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                    <!-- col63 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col62 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                    <!-- col63 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                     <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -1629,14 +1629,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col74 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col75 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col74 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col75 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -1677,14 +1677,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                       -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                    <!-- col86 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col87 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col86 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                    <!-- col87 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                     <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml
index 3a6e566a97..9ebd2f147b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_derived_offset_metric_with_one_input_metric__plan0.xml
@@ -107,11 +107,11 @@
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                        <!--    'column_alias': 'ds__extract_dow'}                     -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                        <!--    'column_alias': 'ds__extract_doy'}                     -->
                         <!-- col13 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
@@ -155,11 +155,11 @@
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                         <!-- col25 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
@@ -203,11 +203,11 @@
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}                -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}                -->
                         <!-- col37 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
@@ -251,11 +251,11 @@
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                         <!-- col49 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
@@ -296,14 +296,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col59 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col60 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col59 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col60 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col61 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
@@ -344,14 +344,14 @@
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                        <!-- col71 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col72 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col71 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                        <!-- col72 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                         <!-- col73 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
@@ -505,11 +505,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -553,11 +553,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -601,11 +601,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -649,11 +649,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -694,14 +694,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -742,14 +742,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -793,11 +793,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -990,11 +990,11 @@
                                 <!-- col25 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col26 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1035,14 +1035,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col37 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col38 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1086,11 +1086,11 @@
                                 <!-- col49 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col50 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -1135,14 +1135,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col62 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col63 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -1183,14 +1183,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col74 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col75 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -1231,14 +1231,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col86 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col87 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml
index b0116367f0..919417183e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_distinct_values__plan0.xml
@@ -152,11 +152,11 @@
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -200,11 +200,11 @@
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -248,11 +248,11 @@
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -296,11 +296,11 @@
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -341,14 +341,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col58 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col59 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col58 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col59 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -389,14 +389,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                    <!-- col70 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col71 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col70 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                    <!-- col71 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -440,11 +440,11 @@
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -637,11 +637,11 @@
                                         <!-- col25 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!--    'column_alias': 'ds__extract_dow'}               -->
                                         <!-- col26 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!--    'column_alias': 'ds__extract_doy'}               -->
                                         <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -682,14 +682,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                         <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                        <!-- col37 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col38 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col37 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                        <!-- col38 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                         <!-- col39 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -733,11 +733,11 @@
                                         <!-- col49 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                         <!-- col50 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                         <!-- col51 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -782,14 +782,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                         <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                        <!-- col62 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                        <!-- col63 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col62 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                        <!-- col63 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                         <!-- col64 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -830,14 +830,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                        <!-- col74 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col75 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col74 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                        <!-- col75 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                         <!-- col76 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -878,14 +878,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                       -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                         <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                        <!-- col86 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                        <!-- col87 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col86 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                        <!-- col87 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                         <!-- col88 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -981,11 +981,11 @@
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
@@ -1029,11 +1029,11 @@
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
-                                    <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
+                                    <!--    'column_alias': 'created_at__extract_dow'}             -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
-                                    <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
+                                    <!--    'column_alias': 'created_at__extract_doy'}             -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
@@ -1077,11 +1077,11 @@
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
-                                    <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'listing__ds__extract_dow'}            -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
-                                    <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'listing__ds__extract_doy'}            -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
@@ -1122,14 +1122,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_day'}    -->
-                                    <!-- col46 =                                                       -->
-                                    <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),      -->
-                                    <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                    <!-- col47 =                                                       -->
-                                    <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),      -->
-                                    <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                    <!-- col46 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_dow'}    -->
+                                    <!-- col47 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_doy'}    -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
@@ -1173,11 +1173,11 @@
                                     <!-- col58 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                     <!-- col59 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
@@ -1286,11 +1286,11 @@
                                         <!-- col13 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!--    'column_alias': 'ds__extract_dow'}               -->
                                         <!-- col14 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!--    'column_alias': 'ds__extract_doy'}               -->
                                         <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -1331,14 +1331,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                                         <!--    'column_alias': 'created_at__extract_day'}       -->
-                                        <!-- col25 =                                              -->
-                                        <!--   {'class': 'SqlSelectColumn',                       -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                                        <!-- col26 =                                              -->
-                                        <!--   {'class': 'SqlSelectColumn',                       -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                        <!-- col25 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                                        <!--    'column_alias': 'created_at__extract_dow'}       -->
+                                        <!-- col26 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                                        <!--    'column_alias': 'created_at__extract_doy'}       -->
                                         <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -1391,14 +1391,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                                         <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                                        <!-- col40 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                                        <!-- col41 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                        <!-- col40 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                                        <!-- col41 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                                         <!-- col42 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -1439,14 +1439,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                          -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                                         <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                                        <!-- col52 =                                                       -->
-                                        <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                        <!-- col53 =                                                       -->
-                                        <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                        <!-- col52 =                                                 -->
+                                        <!--   {'class': 'SqlSelectColumn',                          -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                                        <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                                        <!-- col53 =                                                 -->
+                                        <!--   {'class': 'SqlSelectColumn',                          -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                                        <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                                         <!-- col54 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml
index fcfe3e55b0..aba5cdf553 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_node__plan0.xml
@@ -116,11 +116,11 @@
             <!-- col25 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+            <!--    'column_alias': 'ds__extract_dow'}               -->
             <!-- col26 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+            <!--    'column_alias': 'ds__extract_doy'}               -->
             <!-- col27 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -161,14 +161,14 @@
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
             <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-            <!-- col37 =                                                  -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-            <!-- col38 =                                                  -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+            <!-- col37 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+            <!-- col38 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
             <!-- col39 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -212,11 +212,11 @@
             <!-- col49 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+            <!--    'column_alias': 'paid_at__extract_dow'}          -->
             <!-- col50 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+            <!--    'column_alias': 'paid_at__extract_doy'}          -->
             <!-- col51 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -261,14 +261,14 @@
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
             <!--    'column_alias': 'booking__ds__extract_day'}      -->
-            <!-- col62 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                        -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-            <!-- col63 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                        -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+            <!-- col62 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+            <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+            <!-- col63 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+            <!--    'column_alias': 'booking__ds__extract_doy'}      -->
             <!-- col64 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -309,14 +309,14 @@
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-            <!-- col74 =                                                           -->
-            <!--   {'class': 'SqlSelectColumn',                                    -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-            <!-- col75 =                                                           -->
-            <!--   {'class': 'SqlSelectColumn',                                    -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+            <!-- col74 =                                                     -->
+            <!--   {'class': 'SqlSelectColumn',                              -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+            <!-- col75 =                                                     -->
+            <!--   {'class': 'SqlSelectColumn',                              -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
             <!-- col76 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -357,14 +357,14 @@
             <!--   {'class': 'SqlSelectColumn',                       -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
             <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-            <!-- col86 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                             -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-            <!-- col87 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                             -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+            <!-- col86 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                       -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+            <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+            <!-- col87 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                       -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+            <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
             <!-- col88 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml
index 3588eccfef..81fcf21f1b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_node__plan0.xml
@@ -134,11 +134,11 @@
                 <!-- col25 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!--    'column_alias': 'ds__extract_dow'}               -->
                 <!-- col26 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!--    'column_alias': 'ds__extract_doy'}               -->
                 <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -179,14 +179,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                <!-- col37 =                                                  -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                <!-- col38 =                                                  -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                <!-- col37 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                <!-- col38 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                 <!-- col39 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -230,11 +230,11 @@
                 <!-- col49 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                 <!-- col50 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                 <!-- col51 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -279,14 +279,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                <!-- col62 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                <!-- col63 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                <!-- col62 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                <!-- col63 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                 <!-- col64 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -327,14 +327,14 @@
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                <!-- col74 =                                                           -->
-                <!--   {'class': 'SqlSelectColumn',                                    -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                <!-- col75 =                                                           -->
-                <!--   {'class': 'SqlSelectColumn',                                    -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                <!-- col74 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                <!-- col75 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                 <!-- col76 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -375,14 +375,14 @@
                 <!--   {'class': 'SqlSelectColumn',                       -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                <!-- col86 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                             -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                <!-- col87 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                             -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                <!-- col86 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                <!-- col87 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                 <!-- col88 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml
index a809f0c726..ea3ee863e4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_filter_with_where_constraint_on_join_dim__plan0.xml
@@ -173,11 +173,11 @@
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -221,11 +221,11 @@
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -269,11 +269,11 @@
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -317,11 +317,11 @@
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -362,14 +362,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col58 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col59 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col58 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col59 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -410,14 +410,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                    <!-- col70 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col71 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col70 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                    <!-- col71 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -461,11 +461,11 @@
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -658,11 +658,11 @@
                                         <!-- col25 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!--    'column_alias': 'ds__extract_dow'}               -->
                                         <!-- col26 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!--    'column_alias': 'ds__extract_doy'}               -->
                                         <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -703,14 +703,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                         <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                        <!-- col37 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col38 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col37 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                        <!-- col38 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                         <!-- col39 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -754,11 +754,11 @@
                                         <!-- col49 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                         <!-- col50 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                         <!-- col51 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -803,14 +803,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                         <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                        <!-- col62 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                        <!-- col63 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col62 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                        <!-- col63 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                         <!-- col64 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -851,14 +851,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                        <!-- col74 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col75 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col74 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                        <!-- col75 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                         <!-- col76 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -899,14 +899,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                       -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                         <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                        <!-- col86 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                        <!-- col87 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col86 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                        <!-- col87 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                         <!-- col88 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -1002,11 +1002,11 @@
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
@@ -1050,11 +1050,11 @@
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
-                                    <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
+                                    <!--    'column_alias': 'created_at__extract_dow'}             -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
-                                    <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
+                                    <!--    'column_alias': 'created_at__extract_doy'}             -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
@@ -1098,11 +1098,11 @@
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
-                                    <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'listing__ds__extract_dow'}            -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
-                                    <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'listing__ds__extract_doy'}            -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
@@ -1143,14 +1143,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                                     <!--    'column_alias': 'listing__created_at__extract_day'}    -->
-                                    <!-- col46 =                                                       -->
-                                    <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),      -->
-                                    <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                    <!-- col47 =                                                       -->
-                                    <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),      -->
-                                    <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                    <!-- col46 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_dow'}    -->
+                                    <!-- col47 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                                    <!--    'column_alias': 'listing__created_at__extract_doy'}    -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
@@ -1194,11 +1194,11 @@
                                     <!-- col58 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                     <!-- col59 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
@@ -1307,11 +1307,11 @@
                                         <!-- col13 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!--    'column_alias': 'ds__extract_dow'}               -->
                                         <!-- col14 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!--    'column_alias': 'ds__extract_doy'}               -->
                                         <!-- col15 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -1352,14 +1352,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                                         <!--    'column_alias': 'created_at__extract_day'}       -->
-                                        <!-- col25 =                                              -->
-                                        <!--   {'class': 'SqlSelectColumn',                       -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                                        <!-- col26 =                                              -->
-                                        <!--   {'class': 'SqlSelectColumn',                       -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                        <!-- col25 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                                        <!--    'column_alias': 'created_at__extract_dow'}       -->
+                                        <!-- col26 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                                        <!--    'column_alias': 'created_at__extract_doy'}       -->
                                         <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -1412,14 +1412,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                                         <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                                        <!-- col40 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                                        <!-- col41 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                        <!-- col40 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                                        <!-- col41 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                                        <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                                         <!-- col42 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -1460,14 +1460,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                          -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                                         <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                                        <!-- col52 =                                                       -->
-                                        <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                        <!-- col53 =                                                       -->
-                                        <!--   {'class': 'SqlSelectColumn',                                -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                        <!-- col52 =                                                 -->
+                                        <!--   {'class': 'SqlSelectColumn',                          -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                                        <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                                        <!-- col53 =                                                 -->
+                                        <!--   {'class': 'SqlSelectColumn',                          -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                                        <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                                         <!-- col54 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
index 9cc83dfb26..79159f5015 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_scd_dimension__plan0.xml
@@ -181,11 +181,11 @@
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_211),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_212),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_213),  -->
@@ -229,11 +229,11 @@
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_223),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_224),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_225),  -->
@@ -277,11 +277,11 @@
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_235),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_236),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_237),  -->
@@ -325,11 +325,11 @@
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_247),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_248),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_249),  -->
@@ -370,14 +370,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_258),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col58 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col59 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col58 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_259),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col59 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_260),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_261),  -->
@@ -418,14 +418,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_270),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                    <!-- col70 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col71 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col70 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                    <!-- col71 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_272),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_273),  -->
@@ -469,11 +469,11 @@
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_283),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_284),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_285),  -->
@@ -610,11 +610,11 @@
                                         <!-- col17 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10271),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!--    'column_alias': 'ds__extract_dow'}               -->
                                         <!-- col18 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10272),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!--    'column_alias': 'ds__extract_doy'}               -->
                                         <!-- col19 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10133),  -->
@@ -655,14 +655,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10277),  -->
                                         <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                        <!-- col29 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10278),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col30 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10279),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col29 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10278),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                        <!-- col30 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10279),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                         <!-- col31 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10134),  -->
@@ -706,11 +706,11 @@
                                         <!-- col41 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10285),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                         <!-- col42 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10286),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                         <!-- col43 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10135),  -->
@@ -755,14 +755,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10291),  -->
                                         <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                        <!-- col54 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10292),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                        <!-- col55 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10293),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col54 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10292),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                        <!-- col55 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10293),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                         <!-- col56 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10137),  -->
@@ -803,14 +803,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10298),          -->
                                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                        <!-- col66 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10299),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col67 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10300),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col66 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10299),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                        <!-- col67 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10300),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                         <!-- col68 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10138),  -->
@@ -851,14 +851,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                       -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10305),   -->
                                         <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                        <!-- col78 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10306),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                        <!-- col79 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10307),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col78 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10306),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                        <!-- col79 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10307),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                         <!-- col80 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10139),  -->
@@ -967,14 +967,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10312),  -->
                                     <!--    'column_alias': 'window_start__extract_day'}     -->
-                                    <!-- col10 =                                                -->
-                                    <!--   {'class': 'SqlSelectColumn',                         -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10313),     -->
-                                    <!--    'column_alias': 'window_start__extract_dayofweek'}  -->
-                                    <!-- col11 =                                                -->
-                                    <!--   {'class': 'SqlSelectColumn',                         -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10314),     -->
-                                    <!--    'column_alias': 'window_start__extract_dayofyear'}  -->
+                                    <!-- col10 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10313),  -->
+                                    <!--    'column_alias': 'window_start__extract_dow'}     -->
+                                    <!-- col11 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10314),  -->
+                                    <!--    'column_alias': 'window_start__extract_doy'}     -->
                                     <!-- col12 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10155),  -->
@@ -1015,14 +1015,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10319),  -->
                                     <!--    'column_alias': 'window_end__extract_day'}       -->
-                                    <!-- col22 =                                              -->
-                                    <!--   {'class': 'SqlSelectColumn',                       -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10320),   -->
-                                    <!--    'column_alias': 'window_end__extract_dayofweek'}  -->
-                                    <!-- col23 =                                              -->
-                                    <!--   {'class': 'SqlSelectColumn',                       -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10321),   -->
-                                    <!--    'column_alias': 'window_end__extract_dayofyear'}  -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10320),  -->
+                                    <!--    'column_alias': 'window_end__extract_dow'}       -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10321),  -->
+                                    <!--    'column_alias': 'window_end__extract_doy'}       -->
                                     <!-- col24 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10156),  -->
@@ -1075,14 +1075,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10326),        -->
                                     <!--    'column_alias': 'listing__window_start__extract_day'}  -->
-                                    <!-- col37 =                                                         -->
-                                    <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10327),              -->
-                                    <!--    'column_alias': 'listing__window_start__extract_dayofweek'}  -->
-                                    <!-- col38 =                                                         -->
-                                    <!--   {'class': 'SqlSelectColumn',                                  -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10328),              -->
-                                    <!--    'column_alias': 'listing__window_start__extract_dayofyear'}  -->
+                                    <!-- col37 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10327),        -->
+                                    <!--    'column_alias': 'listing__window_start__extract_dow'}  -->
+                                    <!-- col38 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10328),        -->
+                                    <!--    'column_alias': 'listing__window_start__extract_doy'}  -->
                                     <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10160),  -->
@@ -1123,14 +1123,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                          -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10333),      -->
                                     <!--    'column_alias': 'listing__window_end__extract_day'}  -->
-                                    <!-- col49 =                                                       -->
-                                    <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10334),            -->
-                                    <!--    'column_alias': 'listing__window_end__extract_dayofweek'}  -->
-                                    <!-- col50 =                                                       -->
-                                    <!--   {'class': 'SqlSelectColumn',                                -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10335),            -->
-                                    <!--    'column_alias': 'listing__window_end__extract_dayofyear'}  -->
+                                    <!-- col49 =                                                 -->
+                                    <!--   {'class': 'SqlSelectColumn',                          -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10334),      -->
+                                    <!--    'column_alias': 'listing__window_end__extract_dow'}  -->
+                                    <!-- col50 =                                                 -->
+                                    <!--   {'class': 'SqlSelectColumn',                          -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10335),      -->
+                                    <!--    'column_alias': 'listing__window_end__extract_doy'}  -->
                                     <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10161),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
index deb1256c84..6c3d99f0d6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_to_grain__plan0.xml
@@ -144,11 +144,11 @@
                         <!-- col10 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_25),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
+                        <!--    'column_alias': 'ds__extract_dow'}                    -->
                         <!-- col11 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_26),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
+                        <!--    'column_alias': 'ds__extract_doy'}                    -->
                         <!-- col12 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_27),  -->
@@ -192,11 +192,11 @@
                         <!-- col22 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_37),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}        -->
                         <!-- col23 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_38),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}        -->
                         <!-- col24 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_39),  -->
@@ -240,11 +240,11 @@
                         <!-- col34 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_49),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}               -->
                         <!-- col35 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_50),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}               -->
                         <!-- col36 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_51),  -->
@@ -288,11 +288,11 @@
                         <!-- col46 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}     -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}           -->
                         <!-- col47 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}     -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}           -->
                         <!-- col48 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_63),  -->
@@ -333,14 +333,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_72),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col58 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),           -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col59 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),           -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col58 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col59 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col60 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_75),  -->
@@ -381,14 +381,14 @@
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_84),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}      -->
-                        <!-- col70 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),    -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col71 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),    -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col70 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}      -->
+                        <!-- col71 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}      -->
                         <!-- col72 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_87),  -->
@@ -432,11 +432,11 @@
                         <!-- col82 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofweek'}     -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}           -->
                         <!-- col83 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofyear'}     -->
+                        <!--    'column_alias': 'metric_time__extract_doy'}           -->
                         <!-- col84 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
@@ -629,11 +629,11 @@
                             <!-- col25 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!--    'column_alias': 'ds__extract_dow'}               -->
                             <!-- col26 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!--    'column_alias': 'ds__extract_doy'}               -->
                             <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -674,14 +674,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                            <!-- col37 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col38 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col37 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                            <!-- col38 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                             <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -725,11 +725,11 @@
                             <!-- col49 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}          -->
                             <!-- col50 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}          -->
                             <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -774,14 +774,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                            <!-- col62 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                            <!-- col63 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col62 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                            <!-- col63 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                             <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -822,14 +822,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col74 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col75 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col74 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col75 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -870,14 +870,14 @@
                             <!--   {'class': 'SqlSelectColumn',                       -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                            <!-- col86 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col87 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col86 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                            <!-- col87 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                             <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
index deb1256c84..6c3d99f0d6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
@@ -144,11 +144,11 @@
                         <!-- col10 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_25),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
+                        <!--    'column_alias': 'ds__extract_dow'}                    -->
                         <!-- col11 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_26),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
+                        <!--    'column_alias': 'ds__extract_doy'}                    -->
                         <!-- col12 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_27),  -->
@@ -192,11 +192,11 @@
                         <!-- col22 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_37),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}        -->
                         <!-- col23 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_38),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}        -->
                         <!-- col24 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_39),  -->
@@ -240,11 +240,11 @@
                         <!-- col34 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_49),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}               -->
                         <!-- col35 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_50),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}               -->
                         <!-- col36 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_51),  -->
@@ -288,11 +288,11 @@
                         <!-- col46 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}     -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}           -->
                         <!-- col47 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}     -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}           -->
                         <!-- col48 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_63),  -->
@@ -333,14 +333,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_72),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col58 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),           -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col59 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),           -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col58 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col59 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col60 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_75),  -->
@@ -381,14 +381,14 @@
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_84),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}      -->
-                        <!-- col70 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),    -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col71 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),    -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col70 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}      -->
+                        <!-- col71 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}      -->
                         <!-- col72 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_87),  -->
@@ -432,11 +432,11 @@
                         <!-- col82 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofweek'}     -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}           -->
                         <!-- col83 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofyear'}     -->
+                        <!--    'column_alias': 'metric_time__extract_doy'}           -->
                         <!-- col84 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
@@ -629,11 +629,11 @@
                             <!-- col25 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!--    'column_alias': 'ds__extract_dow'}               -->
                             <!-- col26 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!--    'column_alias': 'ds__extract_doy'}               -->
                             <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -674,14 +674,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                            <!-- col37 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col38 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col37 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                            <!-- col38 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                             <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -725,11 +725,11 @@
                             <!-- col49 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}          -->
                             <!-- col50 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}          -->
                             <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -774,14 +774,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                            <!-- col62 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                            <!-- col63 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col62 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                            <!-- col63 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                             <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -822,14 +822,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col74 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col75 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col74 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col75 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -870,14 +870,14 @@
                             <!--   {'class': 'SqlSelectColumn',                       -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                            <!-- col86 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col87 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col86 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                            <!-- col87 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                             <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml
index deb1256c84..6c3d99f0d6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_join_to_time_spine_node_without_offset__plan0.xml
@@ -144,11 +144,11 @@
                         <!-- col10 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_25),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
+                        <!--    'column_alias': 'ds__extract_dow'}                    -->
                         <!-- col11 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_26),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
+                        <!--    'column_alias': 'ds__extract_doy'}                    -->
                         <!-- col12 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_27),  -->
@@ -192,11 +192,11 @@
                         <!-- col22 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_37),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}        -->
                         <!-- col23 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_38),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}        -->
                         <!-- col24 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_39),  -->
@@ -240,11 +240,11 @@
                         <!-- col34 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_49),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}               -->
                         <!-- col35 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_50),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}               -->
                         <!-- col36 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_51),  -->
@@ -288,11 +288,11 @@
                         <!-- col46 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}     -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}           -->
                         <!-- col47 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}     -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}           -->
                         <!-- col48 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_63),  -->
@@ -333,14 +333,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_72),     -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col58 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),           -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col59 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),           -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col58 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col59 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),     -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col60 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_75),  -->
@@ -381,14 +381,14 @@
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_84),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}      -->
-                        <!-- col70 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),    -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col71 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),    -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col70 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}      -->
+                        <!-- col71 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}      -->
                         <!-- col72 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_87),  -->
@@ -432,11 +432,11 @@
                         <!-- col82 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofweek'}     -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}           -->
                         <!-- col83 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofyear'}     -->
+                        <!--    'column_alias': 'metric_time__extract_doy'}           -->
                         <!-- col84 =                                                  -->
                         <!--   {'class': 'SqlSelectColumn',                           -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
@@ -629,11 +629,11 @@
                             <!-- col25 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!--    'column_alias': 'ds__extract_dow'}               -->
                             <!-- col26 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!--    'column_alias': 'ds__extract_doy'}               -->
                             <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -674,14 +674,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                            <!-- col37 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col38 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col37 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                            <!-- col38 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                             <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -725,11 +725,11 @@
                             <!-- col49 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}          -->
                             <!-- col50 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}          -->
                             <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -774,14 +774,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                            <!-- col62 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                            <!-- col63 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col62 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                            <!-- col63 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                             <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -822,14 +822,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col74 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col75 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col74 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col75 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -870,14 +870,14 @@
                             <!--   {'class': 'SqlSelectColumn',                       -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                            <!-- col86 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col87 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col86 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                            <!-- col87 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                             <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml
index 0c0b947455..af7fd91535 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_limit_rows__plan0.xml
@@ -103,11 +103,11 @@
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                        <!--    'column_alias': 'ds__extract_dow'}                     -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                        <!--    'column_alias': 'ds__extract_doy'}                     -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -151,11 +151,11 @@
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -199,11 +199,11 @@
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}                -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}                -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -247,11 +247,11 @@
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -292,14 +292,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col58 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col59 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col58 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col59 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col60 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -340,14 +340,14 @@
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                        <!-- col70 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col71 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col70 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                        <!-- col71 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                         <!-- col72 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -391,11 +391,11 @@
                         <!-- col82 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}            -->
                         <!-- col83 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'metric_time__extract_doy'}            -->
                         <!-- col84 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -588,11 +588,11 @@
                             <!-- col25 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!--    'column_alias': 'ds__extract_dow'}               -->
                             <!-- col26 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!--    'column_alias': 'ds__extract_doy'}               -->
                             <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -633,14 +633,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                            <!-- col37 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col38 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col37 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                            <!-- col38 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                             <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -684,11 +684,11 @@
                             <!-- col49 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}          -->
                             <!-- col50 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}          -->
                             <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -733,14 +733,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                            <!-- col62 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                            <!-- col63 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col62 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                            <!-- col63 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                             <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -781,14 +781,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col74 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col75 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col74 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col75 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -829,14 +829,14 @@
                             <!--   {'class': 'SqlSelectColumn',                       -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                            <!-- col86 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col87 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col86 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                            <!-- col87 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                             <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml
index 90cd7de9ba..e0c553b7cb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_local_dimension_using_local_entity__plan0.xml
@@ -90,11 +90,11 @@
                     <!-- col10 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
-                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                     <!-- col11 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
-                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                     <!-- col12 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
@@ -138,11 +138,11 @@
                     <!-- col22 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
-                    <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
+                    <!--    'column_alias': 'created_at__extract_dow'}             -->
                     <!-- col23 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
-                    <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
+                    <!--    'column_alias': 'created_at__extract_doy'}             -->
                     <!-- col24 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
@@ -186,11 +186,11 @@
                     <!-- col34 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
-                    <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'listing__ds__extract_dow'}            -->
                     <!-- col35 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
-                    <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'listing__ds__extract_doy'}            -->
                     <!-- col36 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
@@ -231,14 +231,14 @@
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
                     <!--    'column_alias': 'listing__created_at__extract_day'}    -->
-                    <!-- col46 =                                                       -->
-                    <!--   {'class': 'SqlSelectColumn',                                -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),      -->
-                    <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                    <!-- col47 =                                                       -->
-                    <!--   {'class': 'SqlSelectColumn',                                -->
-                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),      -->
-                    <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                    <!-- col46 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                    <!--    'column_alias': 'listing__created_at__extract_dow'}    -->
+                    <!-- col47 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                    <!--    'column_alias': 'listing__created_at__extract_doy'}    -->
                     <!-- col48 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
@@ -282,11 +282,11 @@
                     <!-- col58 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                     <!-- col59 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),  -->
-                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                     <!-- col60 =                                                   -->
                     <!--   {'class': 'SqlSelectColumn',                            -->
                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),  -->
@@ -395,11 +395,11 @@
                         <!-- col13 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
                         <!-- col14 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
                         <!-- col15 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -440,14 +440,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                         <!--    'column_alias': 'created_at__extract_day'}       -->
-                        <!-- col25 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                       -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                        <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                        <!-- col26 =                                              -->
-                        <!--   {'class': 'SqlSelectColumn',                       -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                        <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                        <!-- col25 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                        <!--    'column_alias': 'created_at__extract_dow'}       -->
+                        <!-- col26 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                        <!--    'column_alias': 'created_at__extract_doy'}       -->
                         <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -500,14 +500,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                         <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                        <!-- col40 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                        <!-- col41 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                        <!-- col40 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                        <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                        <!-- col41 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                        <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                         <!-- col42 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -548,14 +548,14 @@
                         <!--   {'class': 'SqlSelectColumn',                          -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                         <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                        <!-- col52 =                                                       -->
-                        <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                        <!-- col53 =                                                       -->
-                        <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                        <!-- col52 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                        <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                        <!-- col53 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                        <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                         <!-- col54 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml
index aa58e56a77..9927bd6230 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_aggregation_node__plan0.xml
@@ -149,11 +149,11 @@
                 <!-- col25 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!--    'column_alias': 'ds__extract_dow'}               -->
                 <!-- col26 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!--    'column_alias': 'ds__extract_doy'}               -->
                 <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -194,14 +194,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                <!-- col37 =                                                  -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                <!-- col38 =                                                  -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                <!-- col37 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                <!-- col38 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                 <!-- col39 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -245,11 +245,11 @@
                 <!-- col49 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                 <!-- col50 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                 <!-- col51 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -294,14 +294,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                <!-- col62 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                <!-- col63 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                <!-- col62 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                <!-- col63 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                 <!-- col64 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -342,14 +342,14 @@
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                <!-- col74 =                                                           -->
-                <!--   {'class': 'SqlSelectColumn',                                    -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                <!-- col75 =                                                           -->
-                <!--   {'class': 'SqlSelectColumn',                                    -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                <!-- col74 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                <!-- col75 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                 <!-- col76 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -390,14 +390,14 @@
                 <!--   {'class': 'SqlSelectColumn',                       -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                <!-- col86 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                             -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                <!-- col87 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                             -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                <!-- col86 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                <!-- col87 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                 <!-- col88 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml
index 2d8e684ff8..1b93709a92 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint__plan0.xml
@@ -219,11 +219,11 @@
                                             <!-- col10 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                                             <!-- col11 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                                             <!-- col12 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -267,11 +267,11 @@
                                             <!-- col22 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                             <!-- col23 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                             <!-- col24 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -315,11 +315,11 @@
                                             <!-- col34 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                             <!-- col35 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                             <!-- col36 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -363,11 +363,11 @@
                                             <!-- col46 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                             <!-- col47 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                             <!-- col48 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -408,14 +408,14 @@
                                             <!--   {'class': 'SqlSelectColumn',                              -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                            <!-- col58 =                                                           -->
-                                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                            <!-- col59 =                                                           -->
-                                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                            <!-- col58 =                                                     -->
+                                            <!--   {'class': 'SqlSelectColumn',                              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                            <!-- col59 =                                                     -->
+                                            <!--   {'class': 'SqlSelectColumn',                              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                             <!-- col60 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -456,14 +456,14 @@
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                            <!-- col70 =                                                    -->
-                                            <!--   {'class': 'SqlSelectColumn',                             -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                            <!-- col71 =                                                    -->
-                                            <!--   {'class': 'SqlSelectColumn',                             -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                            <!-- col70 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                            <!-- col71 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                             <!-- col72 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -507,11 +507,11 @@
                                             <!-- col82 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                             <!-- col83 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                             <!-- col84 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -704,11 +704,11 @@
                                                 <!-- col25 =                                             -->
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                                 <!-- col26 =                                             -->
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                                 <!-- col27 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -749,14 +749,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                                <!-- col37 =                                                  -->
-                                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                                <!-- col38 =                                                  -->
-                                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                                <!-- col37 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                                <!-- col38 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                                 <!-- col39 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -800,11 +800,11 @@
                                                 <!-- col49 =                                             -->
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                                 <!-- col50 =                                             -->
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                                 <!-- col51 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -849,14 +849,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                                <!-- col62 =                                               -->
-                                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                                <!-- col63 =                                               -->
-                                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                                <!-- col62 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                                <!-- col63 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                                 <!-- col64 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -897,14 +897,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                                <!-- col74 =                                                           -->
-                                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                                <!-- col75 =                                                           -->
-                                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                                <!-- col74 =                                                     -->
+                                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                                <!-- col75 =                                                     -->
+                                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                                 <!-- col76 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -945,14 +945,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                                <!-- col86 =                                                    -->
-                                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                                <!-- col87 =                                                    -->
-                                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                                <!-- col86 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                                <!-- col87 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                                 <!-- col88 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -1048,11 +1048,11 @@
                                             <!-- col10 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
-                                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                                             <!-- col11 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
-                                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                                             <!-- col12 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
@@ -1096,11 +1096,11 @@
                                             <!-- col22 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
-                                            <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
+                                            <!--    'column_alias': 'created_at__extract_dow'}             -->
                                             <!-- col23 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
-                                            <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
+                                            <!--    'column_alias': 'created_at__extract_doy'}             -->
                                             <!-- col24 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
@@ -1144,11 +1144,11 @@
                                             <!-- col34 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
-                                            <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
+                                            <!--    'column_alias': 'listing__ds__extract_dow'}            -->
                                             <!-- col35 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
-                                            <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
+                                            <!--    'column_alias': 'listing__ds__extract_doy'}            -->
                                             <!-- col36 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
@@ -1189,14 +1189,14 @@
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                                             <!--    'column_alias': 'listing__created_at__extract_day'}    -->
-                                            <!-- col46 =                                                       -->
-                                            <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),      -->
-                                            <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                            <!-- col47 =                                                       -->
-                                            <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),      -->
-                                            <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                            <!-- col46 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                                            <!--    'column_alias': 'listing__created_at__extract_dow'}    -->
+                                            <!-- col47 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                                            <!--    'column_alias': 'listing__created_at__extract_doy'}    -->
                                             <!-- col48 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
@@ -1240,11 +1240,11 @@
                                             <!-- col58 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
-                                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                             <!-- col59 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
-                                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                             <!-- col60 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
@@ -1353,11 +1353,11 @@
                                                 <!-- col13 =                                             -->
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                                 <!-- col14 =                                             -->
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                                 <!-- col15 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -1398,14 +1398,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                                                 <!--    'column_alias': 'created_at__extract_day'}       -->
-                                                <!-- col25 =                                              -->
-                                                <!--   {'class': 'SqlSelectColumn',                       -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                                                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                                                <!-- col26 =                                              -->
-                                                <!--   {'class': 'SqlSelectColumn',                       -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                                                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                                <!-- col25 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                                                <!--    'column_alias': 'created_at__extract_dow'}       -->
+                                                <!-- col26 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                                                <!--    'column_alias': 'created_at__extract_doy'}       -->
                                                 <!-- col27 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -1458,14 +1458,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                                                 <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                                                <!-- col40 =                                               -->
-                                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                                                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                                                <!-- col41 =                                               -->
-                                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                                                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                                <!-- col40 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                                                <!-- col41 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                                                 <!-- col42 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -1506,14 +1506,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                                                 <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                                                <!-- col52 =                                                       -->
-                                                <!--   {'class': 'SqlSelectColumn',                                -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                                                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                                <!-- col53 =                                                       -->
-                                                <!--   {'class': 'SqlSelectColumn',                                -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                                                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                                <!-- col52 =                                                 -->
+                                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                                                <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                                                <!-- col53 =                                                 -->
+                                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                                                <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                                                 <!-- col54 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
@@ -1728,11 +1728,11 @@
                                             <!-- col10 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
-                                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                                             <!-- col11 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
-                                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                                             <!-- col12 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
@@ -1776,11 +1776,11 @@
                                             <!-- col22 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
-                                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                             <!-- col23 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
-                                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                             <!-- col24 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
@@ -1824,11 +1824,11 @@
                                             <!-- col34 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
-                                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                             <!-- col35 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
-                                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                             <!-- col36 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
@@ -1872,11 +1872,11 @@
                                             <!-- col46 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
-                                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                             <!-- col47 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
-                                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                             <!-- col48 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
@@ -1917,14 +1917,14 @@
                                             <!--   {'class': 'SqlSelectColumn',                              -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),    -->
                                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                            <!-- col58 =                                                           -->
-                                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),          -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                            <!-- col59 =                                                           -->
-                                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),          -->
-                                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                            <!-- col58 =                                                     -->
+                                            <!--   {'class': 'SqlSelectColumn',                              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),    -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                            <!-- col59 =                                                     -->
+                                            <!--   {'class': 'SqlSelectColumn',                              -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),    -->
+                                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                             <!-- col60 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
@@ -1965,14 +1965,14 @@
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
                                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                            <!-- col70 =                                                    -->
-                                            <!--   {'class': 'SqlSelectColumn',                             -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),   -->
-                                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                            <!-- col71 =                                                    -->
-                                            <!--   {'class': 'SqlSelectColumn',                             -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),   -->
-                                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                            <!-- col70 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                            <!-- col71 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
+                                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                             <!-- col72 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),  -->
@@ -2016,11 +2016,11 @@
                                             <!-- col82 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
-                                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                             <!-- col83 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
-                                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                             <!-- col84 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
@@ -2213,11 +2213,11 @@
                                                 <!-- col25 =                                             -->
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                                 <!-- col26 =                                             -->
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                                 <!-- col27 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -2258,14 +2258,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                                <!-- col37 =                                                  -->
-                                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                                <!-- col38 =                                                  -->
-                                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                                <!-- col37 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                                <!-- col38 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                                 <!-- col39 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -2309,11 +2309,11 @@
                                                 <!-- col49 =                                             -->
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                                 <!-- col50 =                                             -->
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                                 <!-- col51 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -2358,14 +2358,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                                <!-- col62 =                                               -->
-                                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                                <!-- col63 =                                               -->
-                                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                                <!-- col62 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                                <!-- col63 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                                 <!-- col64 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -2406,14 +2406,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                                <!-- col74 =                                                           -->
-                                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                                <!-- col75 =                                                           -->
-                                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                                <!-- col74 =                                                     -->
+                                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                                <!-- col75 =                                                     -->
+                                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                                 <!-- col76 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -2454,14 +2454,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                                <!-- col86 =                                                    -->
-                                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                                <!-- col87 =                                                    -->
-                                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                                <!-- col86 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                                <!-- col87 =                                              -->
+                                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                                 <!-- col88 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -2557,11 +2557,11 @@
                                             <!-- col10 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
-                                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                                             <!-- col11 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
-                                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                                             <!-- col12 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_812),  -->
@@ -2605,11 +2605,11 @@
                                             <!-- col22 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_822),  -->
-                                            <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
+                                            <!--    'column_alias': 'created_at__extract_dow'}             -->
                                             <!-- col23 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_823),  -->
-                                            <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
+                                            <!--    'column_alias': 'created_at__extract_doy'}             -->
                                             <!-- col24 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_824),  -->
@@ -2653,11 +2653,11 @@
                                             <!-- col34 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_834),  -->
-                                            <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
+                                            <!--    'column_alias': 'listing__ds__extract_dow'}            -->
                                             <!-- col35 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_835),  -->
-                                            <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
+                                            <!--    'column_alias': 'listing__ds__extract_doy'}            -->
                                             <!-- col36 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_836),  -->
@@ -2698,14 +2698,14 @@
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_845),  -->
                                             <!--    'column_alias': 'listing__created_at__extract_day'}    -->
-                                            <!-- col46 =                                                       -->
-                                            <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),      -->
-                                            <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                            <!-- col47 =                                                       -->
-                                            <!--   {'class': 'SqlSelectColumn',                                -->
-                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),      -->
-                                            <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                            <!-- col46 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_846),  -->
+                                            <!--    'column_alias': 'listing__created_at__extract_dow'}    -->
+                                            <!-- col47 =                                                   -->
+                                            <!--   {'class': 'SqlSelectColumn',                            -->
+                                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_847),  -->
+                                            <!--    'column_alias': 'listing__created_at__extract_doy'}    -->
                                             <!-- col48 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
@@ -2749,11 +2749,11 @@
                                             <!-- col58 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_858),  -->
-                                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                             <!-- col59 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_859),  -->
-                                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                             <!-- col60 =                                                   -->
                                             <!--   {'class': 'SqlSelectColumn',                            -->
                                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
@@ -2862,11 +2862,11 @@
                                                 <!-- col13 =                                             -->
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                                 <!-- col14 =                                             -->
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                                 <!-- col15 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -2907,14 +2907,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                                                 <!--    'column_alias': 'created_at__extract_day'}       -->
-                                                <!-- col25 =                                              -->
-                                                <!--   {'class': 'SqlSelectColumn',                       -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                                                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                                                <!-- col26 =                                              -->
-                                                <!--   {'class': 'SqlSelectColumn',                       -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                                                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                                <!-- col25 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                                                <!--    'column_alias': 'created_at__extract_dow'}       -->
+                                                <!-- col26 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                                                <!--    'column_alias': 'created_at__extract_doy'}       -->
                                                 <!-- col27 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -2967,14 +2967,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                                                 <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                                                <!-- col40 =                                               -->
-                                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                                                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                                                <!-- col41 =                                               -->
-                                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                                                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                                <!-- col40 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                                                <!-- col41 =                                             -->
+                                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                                                <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                                                 <!-- col42 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -3015,14 +3015,14 @@
                                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                                 <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                                                 <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                                                <!-- col52 =                                                       -->
-                                                <!--   {'class': 'SqlSelectColumn',                                -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                                                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                                <!-- col53 =                                                       -->
-                                                <!--   {'class': 'SqlSelectColumn',                                -->
-                                                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                                                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                                <!-- col52 =                                                 -->
+                                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                                                <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                                                <!-- col53 =                                                 -->
+                                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                                <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                                                <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                                                 <!-- col54 =                                                     -->
                                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
@@ -3154,11 +3154,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_908),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_909),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_910),  -->
@@ -3202,11 +3202,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_920),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_921),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_922),  -->
@@ -3250,11 +3250,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_932),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_933),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_934),  -->
@@ -3298,11 +3298,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_944),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_945),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_946),  -->
@@ -3343,14 +3343,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_955),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_956),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_957),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_956),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_957),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_958),  -->
@@ -3391,14 +3391,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_967),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_968),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_969),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_968),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_969),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_970),  -->
@@ -3442,11 +3442,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_980),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_981),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_982),  -->
@@ -3639,11 +3639,11 @@
                                 <!-- col25 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col26 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -3684,14 +3684,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col37 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col38 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -3735,11 +3735,11 @@
                                 <!-- col49 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col50 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -3784,14 +3784,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col62 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col63 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -3832,14 +3832,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col74 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col75 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -3880,14 +3880,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col86 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col87 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml
index abe224335b..f3d68efd51 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_reused_measure__plan0.xml
@@ -163,11 +163,11 @@
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -211,11 +211,11 @@
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -259,11 +259,11 @@
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -307,11 +307,11 @@
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -352,14 +352,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col58 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col59 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col58 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col59 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -400,14 +400,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                    <!-- col70 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col71 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col70 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                    <!-- col71 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -451,11 +451,11 @@
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -648,11 +648,11 @@
                                         <!-- col25 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!--    'column_alias': 'ds__extract_dow'}               -->
                                         <!-- col26 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!--    'column_alias': 'ds__extract_doy'}               -->
                                         <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -693,14 +693,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                         <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                        <!-- col37 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col38 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col37 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                        <!-- col38 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                         <!-- col39 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -744,11 +744,11 @@
                                         <!-- col49 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                         <!-- col50 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                         <!-- col51 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -793,14 +793,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                         <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                        <!-- col62 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                        <!-- col63 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col62 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                        <!-- col63 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                         <!-- col64 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -841,14 +841,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                        <!-- col74 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col75 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col74 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                        <!-- col75 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                         <!-- col76 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -889,14 +889,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                       -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                         <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                        <!-- col86 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                        <!-- col87 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col86 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                        <!-- col87 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                         <!-- col88 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -1026,11 +1026,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
@@ -1074,11 +1074,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
@@ -1122,11 +1122,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
@@ -1170,11 +1170,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),  -->
@@ -1215,14 +1215,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
@@ -1263,14 +1263,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
@@ -1314,11 +1314,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
@@ -1511,11 +1511,11 @@
                                 <!-- col25 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col26 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1556,14 +1556,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col37 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col38 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1607,11 +1607,11 @@
                                 <!-- col49 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col50 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -1656,14 +1656,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col62 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col63 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -1704,14 +1704,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col74 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col75 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -1752,14 +1752,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col86 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col87 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml
index 05c1e14185..7380884768 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_measure_constraint_with_single_expr_and_alias__plan0.xml
@@ -140,11 +140,11 @@
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                <!--    'column_alias': 'ds__extract_dow'}                     -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                <!--    'column_alias': 'ds__extract_doy'}                     -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -188,11 +188,11 @@
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -236,11 +236,11 @@
                                 <!-- col34 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                 <!-- col35 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -284,11 +284,11 @@
                                 <!-- col46 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                 <!-- col47 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -329,14 +329,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col58 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col59 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col58 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col59 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col60 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -377,14 +377,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                <!-- col70 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col71 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col70 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                <!-- col71 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                 <!-- col72 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -428,11 +428,11 @@
                                 <!-- col82 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                 <!-- col83 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                                <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                 <!-- col84 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -625,11 +625,11 @@
                                     <!-- col25 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!--    'column_alias': 'ds__extract_dow'}               -->
                                     <!-- col26 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!--    'column_alias': 'ds__extract_doy'}               -->
                                     <!-- col27 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -670,14 +670,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                    <!-- col37 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col38 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col37 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                    <!-- col38 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                     <!-- col39 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -721,11 +721,11 @@
                                     <!-- col49 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                     <!-- col50 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                     <!-- col51 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -770,14 +770,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                     <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                    <!-- col62 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                    <!-- col63 =                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                    <!-- col62 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                    <!-- col63 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                     <!-- col64 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -818,14 +818,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col74 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col75 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col74 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col75 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col76 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -866,14 +866,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                       -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                    <!-- col86 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col87 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col86 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                    <!-- col87 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                     <!-- col88 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml
index ea838d4c06..7b5ea95fa3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.xml
@@ -102,11 +102,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -150,11 +150,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -198,11 +198,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -246,11 +246,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -291,14 +291,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -339,14 +339,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -390,11 +390,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -587,11 +587,11 @@
                                 <!-- col25 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col26 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -632,14 +632,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col37 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col38 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -683,11 +683,11 @@
                                 <!-- col49 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col50 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -732,14 +732,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col62 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col63 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -780,14 +780,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col74 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col75 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -828,14 +828,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col86 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col87 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -947,11 +947,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
@@ -995,11 +995,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
-                            <!--    'column_alias': 'created_at__extract_dayofweek'}       -->
+                            <!--    'column_alias': 'created_at__extract_dow'}             -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
-                            <!--    'column_alias': 'created_at__extract_dayofyear'}       -->
+                            <!--    'column_alias': 'created_at__extract_doy'}             -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
@@ -1043,11 +1043,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
-                            <!--    'column_alias': 'listing__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'listing__ds__extract_dow'}            -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
-                            <!--    'column_alias': 'listing__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'listing__ds__extract_doy'}            -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
@@ -1088,14 +1088,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
                             <!--    'column_alias': 'listing__created_at__extract_day'}    -->
-                            <!-- col46 =                                                       -->
-                            <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),      -->
-                            <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                            <!-- col47 =                                                       -->
-                            <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),      -->
-                            <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                            <!-- col46 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                            <!--    'column_alias': 'listing__created_at__extract_dow'}    -->
+                            <!-- col47 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                            <!--    'column_alias': 'listing__created_at__extract_doy'}    -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
@@ -1139,11 +1139,11 @@
                             <!-- col58 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col59 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
@@ -1252,11 +1252,11 @@
                                 <!-- col13 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col14 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -1297,14 +1297,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                                 <!--    'column_alias': 'created_at__extract_day'}       -->
-                                <!-- col25 =                                              -->
-                                <!--   {'class': 'SqlSelectColumn',                       -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                                <!-- col26 =                                              -->
-                                <!--   {'class': 'SqlSelectColumn',                       -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                                <!--    'column_alias': 'created_at__extract_dow'}       -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                                <!--    'column_alias': 'created_at__extract_doy'}       -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -1357,14 +1357,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                                 <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                                <!-- col40 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                                <!-- col41 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                <!-- col40 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                                <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                                <!-- col41 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                                <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                                 <!-- col42 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -1405,14 +1405,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                                 <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                                <!-- col52 =                                                       -->
-                                <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                <!-- col53 =                                                       -->
-                                <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                <!-- col52 =                                                 -->
+                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                                <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                                <!-- col53 =                                                 -->
+                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                                <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                                 <!-- col54 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
index 0f3e05153d..63e2148484 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
@@ -160,11 +160,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
@@ -208,11 +208,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_795),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
@@ -256,11 +256,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_806),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_807),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
@@ -304,11 +304,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_818),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_819),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_820),  -->
@@ -349,14 +349,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_829),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_830),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_831),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_832),  -->
@@ -397,14 +397,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_841),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_842),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_843),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_844),  -->
@@ -448,11 +448,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_854),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_855),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_856),  -->
@@ -589,11 +589,11 @@
                                 <!-- col17 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10271),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col18 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10272),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col19 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10133),  -->
@@ -634,14 +634,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10277),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col29 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10278),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col30 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10279),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col29 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10278),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col30 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10279),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col31 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10134),  -->
@@ -685,11 +685,11 @@
                                 <!-- col41 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10285),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col42 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10286),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col43 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10135),  -->
@@ -734,14 +734,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10291),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col54 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10292),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col55 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10293),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col54 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10292),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col55 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10293),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col56 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10137),  -->
@@ -782,14 +782,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10298),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col66 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10299),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col67 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10300),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col66 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10299),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col67 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10300),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col68 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10138),  -->
@@ -830,14 +830,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10305),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col78 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10306),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col79 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10307),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col78 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10306),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col79 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10307),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col80 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10139),  -->
@@ -949,11 +949,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_912),  -->
-                            <!--    'column_alias': 'window_start__extract_dayofweek'}     -->
+                            <!--    'column_alias': 'window_start__extract_dow'}           -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_913),  -->
-                            <!--    'column_alias': 'window_start__extract_dayofyear'}     -->
+                            <!--    'column_alias': 'window_start__extract_doy'}           -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_914),  -->
@@ -997,11 +997,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_924),  -->
-                            <!--    'column_alias': 'window_end__extract_dayofweek'}       -->
+                            <!--    'column_alias': 'window_end__extract_dow'}             -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_925),  -->
-                            <!--    'column_alias': 'window_end__extract_dayofyear'}       -->
+                            <!--    'column_alias': 'window_end__extract_doy'}             -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_926),  -->
@@ -1042,14 +1042,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_935),  -->
                             <!--    'column_alias': 'listing__window_start__extract_day'}  -->
-                            <!-- col34 =                                                         -->
-                            <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_936),        -->
-                            <!--    'column_alias': 'listing__window_start__extract_dayofweek'}  -->
-                            <!-- col35 =                                                         -->
-                            <!--   {'class': 'SqlSelectColumn',                                  -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_937),        -->
-                            <!--    'column_alias': 'listing__window_start__extract_dayofyear'}  -->
+                            <!-- col34 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_936),  -->
+                            <!--    'column_alias': 'listing__window_start__extract_dow'}  -->
+                            <!-- col35 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_937),  -->
+                            <!--    'column_alias': 'listing__window_start__extract_doy'}  -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_938),  -->
@@ -1090,14 +1090,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_947),  -->
                             <!--    'column_alias': 'listing__window_end__extract_day'}    -->
-                            <!-- col46 =                                                       -->
-                            <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_948),      -->
-                            <!--    'column_alias': 'listing__window_end__extract_dayofweek'}  -->
-                            <!-- col47 =                                                       -->
-                            <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_949),      -->
-                            <!--    'column_alias': 'listing__window_end__extract_dayofyear'}  -->
+                            <!-- col46 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_948),  -->
+                            <!--    'column_alias': 'listing__window_end__extract_dow'}    -->
+                            <!-- col47 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_949),  -->
+                            <!--    'column_alias': 'listing__window_end__extract_doy'}    -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_954),  -->
@@ -1141,11 +1141,11 @@
                             <!-- col58 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_964),  -->
-                            <!--    'column_alias': 'user__ds__extract_dayofweek'}         -->
+                            <!--    'column_alias': 'user__ds__extract_dow'}               -->
                             <!-- col59 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_965),  -->
-                            <!--    'column_alias': 'user__ds__extract_dayofyear'}         -->
+                            <!--    'column_alias': 'user__ds__extract_doy'}               -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_950),  -->
@@ -1237,14 +1237,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10312),  -->
                                 <!--    'column_alias': 'window_start__extract_day'}     -->
-                                <!-- col10 =                                                -->
-                                <!--   {'class': 'SqlSelectColumn',                         -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10313),     -->
-                                <!--    'column_alias': 'window_start__extract_dayofweek'}  -->
-                                <!-- col11 =                                                -->
-                                <!--   {'class': 'SqlSelectColumn',                         -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10314),     -->
-                                <!--    'column_alias': 'window_start__extract_dayofyear'}  -->
+                                <!-- col10 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10313),  -->
+                                <!--    'column_alias': 'window_start__extract_dow'}     -->
+                                <!-- col11 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10314),  -->
+                                <!--    'column_alias': 'window_start__extract_doy'}     -->
                                 <!-- col12 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10155),  -->
@@ -1285,14 +1285,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10319),  -->
                                 <!--    'column_alias': 'window_end__extract_day'}       -->
-                                <!-- col22 =                                              -->
-                                <!--   {'class': 'SqlSelectColumn',                       -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10320),   -->
-                                <!--    'column_alias': 'window_end__extract_dayofweek'}  -->
-                                <!-- col23 =                                              -->
-                                <!--   {'class': 'SqlSelectColumn',                       -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10321),   -->
-                                <!--    'column_alias': 'window_end__extract_dayofyear'}  -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10320),  -->
+                                <!--    'column_alias': 'window_end__extract_dow'}       -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10321),  -->
+                                <!--    'column_alias': 'window_end__extract_doy'}       -->
                                 <!-- col24 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10156),  -->
@@ -1345,14 +1345,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10326),        -->
                                 <!--    'column_alias': 'listing__window_start__extract_day'}  -->
-                                <!-- col37 =                                                         -->
-                                <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10327),              -->
-                                <!--    'column_alias': 'listing__window_start__extract_dayofweek'}  -->
-                                <!-- col38 =                                                         -->
-                                <!--   {'class': 'SqlSelectColumn',                                  -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10328),              -->
-                                <!--    'column_alias': 'listing__window_start__extract_dayofyear'}  -->
+                                <!-- col37 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10327),        -->
+                                <!--    'column_alias': 'listing__window_start__extract_dow'}  -->
+                                <!-- col38 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10328),        -->
+                                <!--    'column_alias': 'listing__window_start__extract_doy'}  -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10160),  -->
@@ -1393,14 +1393,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10333),      -->
                                 <!--    'column_alias': 'listing__window_end__extract_day'}  -->
-                                <!-- col49 =                                                       -->
-                                <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10334),            -->
-                                <!--    'column_alias': 'listing__window_end__extract_dayofweek'}  -->
-                                <!-- col50 =                                                       -->
-                                <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10335),            -->
-                                <!--    'column_alias': 'listing__window_end__extract_dayofyear'}  -->
+                                <!-- col49 =                                                 -->
+                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10334),      -->
+                                <!--    'column_alias': 'listing__window_end__extract_dow'}  -->
+                                <!-- col50 =                                                 -->
+                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10335),      -->
+                                <!--    'column_alias': 'listing__window_end__extract_doy'}  -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10161),  -->
@@ -1507,11 +1507,11 @@
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_879),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                <!--    'column_alias': 'ds__extract_dow'}                     -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_880),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                <!--    'column_alias': 'ds__extract_doy'}                     -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_881),  -->
@@ -1555,11 +1555,11 @@
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_891),  -->
-                                <!--    'column_alias': 'user__ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'user__ds__extract_dow'}               -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_892),  -->
-                                <!--    'column_alias': 'user__ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'user__ds__extract_doy'}               -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_893),  -->
@@ -1620,11 +1620,11 @@
                                     <!-- col10 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10397),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                    <!--    'column_alias': 'ds__extract_dow'}               -->
                                     <!-- col11 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10398),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                    <!--    'column_alias': 'ds__extract_doy'}               -->
                                     <!-- col12 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10185),  -->
@@ -1672,11 +1672,11 @@
                                     <!-- col23 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10404),  -->
-                                    <!--    'column_alias': 'user__ds__extract_dayofweek'}   -->
+                                    <!--    'column_alias': 'user__ds__extract_dow'}         -->
                                     <!-- col24 =                                             -->
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10405),  -->
-                                    <!--    'column_alias': 'user__ds__extract_dayofyear'}   -->
+                                    <!--    'column_alias': 'user__ds__extract_doy'}         -->
                                     <!-- col25 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10187),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
index d506931ba5..a013e8d8c1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
@@ -160,11 +160,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_292),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_293),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_294),  -->
@@ -208,11 +208,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_304),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_305),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_306),  -->
@@ -256,11 +256,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_316),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_317),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_318),  -->
@@ -304,11 +304,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_328),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_329),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_330),  -->
@@ -349,14 +349,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_339),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_340),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_341),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_342),  -->
@@ -397,14 +397,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_351),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_352),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_353),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_354),  -->
@@ -448,11 +448,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_364),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_365),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_366),  -->
@@ -589,11 +589,11 @@
                                 <!-- col17 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10271),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col18 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10272),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col19 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10133),  -->
@@ -634,14 +634,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10277),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col29 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10278),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col30 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10279),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col29 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10278),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col30 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10279),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col31 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10134),  -->
@@ -685,11 +685,11 @@
                                 <!-- col41 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10285),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col42 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10286),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col43 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10135),  -->
@@ -734,14 +734,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10291),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col54 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10292),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col55 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10293),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col54 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10292),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col55 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10293),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col56 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10137),  -->
@@ -782,14 +782,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10298),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col66 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10299),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col67 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10300),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col66 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10299),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col67 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10300),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col68 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10138),  -->
@@ -830,14 +830,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10305),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col78 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10306),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col79 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10307),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col78 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10306),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col79 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10307),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col80 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10139),  -->
@@ -949,14 +949,14 @@
                             <!--   {'class': 'SqlSelectColumn',                                -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_443),      -->
                             <!--    'column_alias': 'lux_listing__window_start__extract_day'}  -->
-                            <!-- col10 =                                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                                      -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),            -->
-                            <!--    'column_alias': 'lux_listing__window_start__extract_dayofweek'}  -->
-                            <!-- col11 =                                                             -->
-                            <!--   {'class': 'SqlSelectColumn',                                      -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),            -->
-                            <!--    'column_alias': 'lux_listing__window_start__extract_dayofyear'}  -->
+                            <!-- col10 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_444),      -->
+                            <!--    'column_alias': 'lux_listing__window_start__extract_dow'}  -->
+                            <!-- col11 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_445),      -->
+                            <!--    'column_alias': 'lux_listing__window_start__extract_doy'}  -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_446),  -->
@@ -997,14 +997,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_455),    -->
                             <!--    'column_alias': 'lux_listing__window_end__extract_day'}  -->
-                            <!-- col22 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),          -->
-                            <!--    'column_alias': 'lux_listing__window_end__extract_dayofweek'}  -->
-                            <!-- col23 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),          -->
-                            <!--    'column_alias': 'lux_listing__window_end__extract_dayofyear'}  -->
+                            <!-- col22 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_456),    -->
+                            <!--    'column_alias': 'lux_listing__window_end__extract_dow'}  -->
+                            <!-- col23 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_457),    -->
+                            <!--    'column_alias': 'lux_listing__window_end__extract_doy'}  -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_430),  -->
@@ -1151,11 +1151,11 @@
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_389),  -->
-                                <!--    'column_alias': 'window_start__extract_dayofweek'}     -->
+                                <!--    'column_alias': 'window_start__extract_dow'}           -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_390),  -->
-                                <!--    'column_alias': 'window_start__extract_dayofyear'}     -->
+                                <!--    'column_alias': 'window_start__extract_doy'}           -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_391),  -->
@@ -1199,11 +1199,11 @@
                                 <!-- col22 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_401),  -->
-                                <!--    'column_alias': 'window_end__extract_dayofweek'}       -->
+                                <!--    'column_alias': 'window_end__extract_dow'}             -->
                                 <!-- col23 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_402),  -->
-                                <!--    'column_alias': 'window_end__extract_dayofyear'}       -->
+                                <!--    'column_alias': 'window_end__extract_doy'}             -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_403),  -->
@@ -1244,14 +1244,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                                -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_412),      -->
                                 <!--    'column_alias': 'lux_listing__window_start__extract_day'}  -->
-                                <!-- col34 =                                                             -->
-                                <!--   {'class': 'SqlSelectColumn',                                      -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_413),            -->
-                                <!--    'column_alias': 'lux_listing__window_start__extract_dayofweek'}  -->
-                                <!-- col35 =                                                             -->
-                                <!--   {'class': 'SqlSelectColumn',                                      -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),            -->
-                                <!--    'column_alias': 'lux_listing__window_start__extract_dayofyear'}  -->
+                                <!-- col34 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_413),      -->
+                                <!--    'column_alias': 'lux_listing__window_start__extract_dow'}  -->
+                                <!-- col35 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_414),      -->
+                                <!--    'column_alias': 'lux_listing__window_start__extract_doy'}  -->
                                 <!-- col36 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_415),  -->
@@ -1292,14 +1292,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_424),    -->
                                 <!--    'column_alias': 'lux_listing__window_end__extract_day'}  -->
-                                <!-- col46 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_425),          -->
-                                <!--    'column_alias': 'lux_listing__window_end__extract_dayofweek'}  -->
-                                <!-- col47 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_426),          -->
-                                <!--    'column_alias': 'lux_listing__window_end__extract_dayofyear'}  -->
+                                <!-- col46 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_425),    -->
+                                <!--    'column_alias': 'lux_listing__window_end__extract_dow'}  -->
+                                <!-- col47 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_426),    -->
+                                <!--    'column_alias': 'lux_listing__window_end__extract_doy'}  -->
                                 <!-- col48 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_427),  -->
@@ -1357,14 +1357,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10340),  -->
                                     <!--    'column_alias': 'window_start__extract_day'}     -->
-                                    <!-- col10 =                                                -->
-                                    <!--   {'class': 'SqlSelectColumn',                         -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10341),     -->
-                                    <!--    'column_alias': 'window_start__extract_dayofweek'}  -->
-                                    <!-- col11 =                                                -->
-                                    <!--   {'class': 'SqlSelectColumn',                         -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10342),     -->
-                                    <!--    'column_alias': 'window_start__extract_dayofyear'}  -->
+                                    <!-- col10 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10341),  -->
+                                    <!--    'column_alias': 'window_start__extract_dow'}     -->
+                                    <!-- col11 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10342),  -->
+                                    <!--    'column_alias': 'window_start__extract_doy'}     -->
                                     <!-- col12 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10171),  -->
@@ -1405,14 +1405,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10347),  -->
                                     <!--    'column_alias': 'window_end__extract_day'}       -->
-                                    <!-- col22 =                                              -->
-                                    <!--   {'class': 'SqlSelectColumn',                       -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10348),   -->
-                                    <!--    'column_alias': 'window_end__extract_dayofweek'}  -->
-                                    <!-- col23 =                                              -->
-                                    <!--   {'class': 'SqlSelectColumn',                       -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10349),   -->
-                                    <!--    'column_alias': 'window_end__extract_dayofyear'}  -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10348),  -->
+                                    <!--    'column_alias': 'window_end__extract_dow'}       -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10349),  -->
+                                    <!--    'column_alias': 'window_end__extract_doy'}       -->
                                     <!-- col24 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10172),  -->
@@ -1457,14 +1457,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                                -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10354),            -->
                                     <!--    'column_alias': 'lux_listing__window_start__extract_day'}  -->
-                                    <!-- col35 =                                                             -->
-                                    <!--   {'class': 'SqlSelectColumn',                                      -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10355),                  -->
-                                    <!--    'column_alias': 'lux_listing__window_start__extract_dayofweek'}  -->
-                                    <!-- col36 =                                                             -->
-                                    <!--   {'class': 'SqlSelectColumn',                                      -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10356),                  -->
-                                    <!--    'column_alias': 'lux_listing__window_start__extract_dayofyear'}  -->
+                                    <!-- col35 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10355),            -->
+                                    <!--    'column_alias': 'lux_listing__window_start__extract_dow'}  -->
+                                    <!-- col36 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10356),            -->
+                                    <!--    'column_alias': 'lux_listing__window_start__extract_doy'}  -->
                                     <!-- col37 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10174),  -->
@@ -1505,14 +1505,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10361),          -->
                                     <!--    'column_alias': 'lux_listing__window_end__extract_day'}  -->
-                                    <!-- col47 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10362),                -->
-                                    <!--    'column_alias': 'lux_listing__window_end__extract_dayofweek'}  -->
-                                    <!-- col48 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10363),                -->
-                                    <!--    'column_alias': 'lux_listing__window_end__extract_dayofyear'}  -->
+                                    <!-- col47 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10362),          -->
+                                    <!--    'column_alias': 'lux_listing__window_end__extract_dow'}  -->
+                                    <!-- col48 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10363),          -->
+                                    <!--    'column_alias': 'lux_listing__window_end__extract_doy'}  -->
                                     <!-- col49 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10175),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml
index 86c66d0258..5fc98dd938 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_join_node__plan0.xml
@@ -153,11 +153,11 @@
                 <!-- col25 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!--    'column_alias': 'ds__extract_dow'}               -->
                 <!-- col26 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!--    'column_alias': 'ds__extract_doy'}               -->
                 <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -198,14 +198,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                <!-- col37 =                                                  -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                <!-- col38 =                                                  -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                <!-- col37 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                <!-- col38 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                 <!-- col39 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -249,11 +249,11 @@
                 <!-- col49 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                 <!-- col50 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                 <!-- col51 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -298,14 +298,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                <!-- col62 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                <!-- col63 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                <!-- col62 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                <!-- col63 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                 <!-- col64 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -346,14 +346,14 @@
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                <!-- col74 =                                                           -->
-                <!--   {'class': 'SqlSelectColumn',                                    -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                <!-- col75 =                                                           -->
-                <!--   {'class': 'SqlSelectColumn',                                    -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                <!-- col74 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                <!-- col75 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                 <!-- col76 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -394,14 +394,14 @@
                 <!--   {'class': 'SqlSelectColumn',                       -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                <!-- col86 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                             -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                <!-- col87 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                             -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                <!-- col86 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                <!-- col87 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                 <!-- col88 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -508,11 +508,11 @@
                 <!-- col13 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!--    'column_alias': 'ds__extract_dow'}               -->
                 <!-- col14 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!--    'column_alias': 'ds__extract_doy'}               -->
                 <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -553,14 +553,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                 <!--    'column_alias': 'created_at__extract_day'}       -->
-                <!-- col25 =                                              -->
-                <!--   {'class': 'SqlSelectColumn',                       -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                <!-- col26 =                                              -->
-                <!--   {'class': 'SqlSelectColumn',                       -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                <!-- col25 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                <!--    'column_alias': 'created_at__extract_dow'}       -->
+                <!-- col26 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                <!--    'column_alias': 'created_at__extract_doy'}       -->
                 <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -613,14 +613,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                 <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                <!-- col40 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                <!-- col41 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                <!-- col40 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                <!-- col41 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                 <!-- col42 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -661,14 +661,14 @@
                 <!--   {'class': 'SqlSelectColumn',                          -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                 <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                <!-- col52 =                                                       -->
-                <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                <!-- col53 =                                                       -->
-                <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                <!-- col52 =                                                 -->
+                <!--   {'class': 'SqlSelectColumn',                          -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                <!-- col53 =                                                 -->
+                <!--   {'class': 'SqlSelectColumn',                          -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                 <!-- col54 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
@@ -775,11 +775,11 @@
                 <!-- col13 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!--    'column_alias': 'ds__extract_dow'}               -->
                 <!-- col14 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!--    'column_alias': 'ds__extract_doy'}               -->
                 <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -820,14 +820,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                 <!--    'column_alias': 'created_at__extract_day'}       -->
-                <!-- col25 =                                              -->
-                <!--   {'class': 'SqlSelectColumn',                       -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                <!-- col26 =                                              -->
-                <!--   {'class': 'SqlSelectColumn',                       -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                <!-- col25 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                <!--    'column_alias': 'created_at__extract_dow'}       -->
+                <!-- col26 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                <!--    'column_alias': 'created_at__extract_doy'}       -->
                 <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -880,14 +880,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                 <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                <!-- col40 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                <!-- col41 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                <!-- col40 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                <!-- col41 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                 <!-- col42 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -928,14 +928,14 @@
                 <!--   {'class': 'SqlSelectColumn',                          -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                 <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                <!-- col52 =                                                       -->
-                <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                <!-- col53 =                                                       -->
-                <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                <!-- col52 =                                                 -->
+                <!--   {'class': 'SqlSelectColumn',                          -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                <!-- col53 =                                                 -->
+                <!--   {'class': 'SqlSelectColumn',                          -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                 <!-- col54 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
index 8646094e2a..4a1df37c68 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
@@ -140,11 +140,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_153),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_154),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_155),  -->
@@ -188,11 +188,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_165),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_166),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_167),  -->
@@ -233,14 +233,14 @@
                             <!--   {'class': 'SqlSelectColumn',                                 -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_176),       -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_day'}  -->
-                            <!-- col34 =                                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                                       -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_177),             -->
-                            <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col35 =                                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                                       -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_178),             -->
-                            <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col34 =                                                        -->
+                            <!--   {'class': 'SqlSelectColumn',                                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_177),       -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_dow'}  -->
+                            <!-- col35 =                                                        -->
+                            <!--   {'class': 'SqlSelectColumn',                                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_178),       -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_doy'}  -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_179),  -->
@@ -284,11 +284,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_189),  -->
-                            <!--    'column_alias': 'account_id__ds__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'account_id__ds__extract_dow'}         -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_190),  -->
-                            <!--    'column_alias': 'account_id__ds__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'account_id__ds__extract_doy'}         -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_191),  -->
@@ -332,11 +332,11 @@
                             <!-- col58 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_201),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col59 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_202),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_203),  -->
@@ -402,14 +402,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10214),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col11 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10215),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col12 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10216),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col11 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10215),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col12 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10216),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col13 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10097),  -->
@@ -453,11 +453,11 @@
                                 <!-- col23 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10222),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col24 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10223),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col25 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10098),  -->
@@ -502,14 +502,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                                 -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10228),             -->
                                 <!--    'column_alias': 'account_id__ds_partitioned__extract_day'}  -->
-                                <!-- col36 =                                                              -->
-                                <!--   {'class': 'SqlSelectColumn',                                       -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10229),                   -->
-                                <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col37 =                                                              -->
-                                <!--   {'class': 'SqlSelectColumn',                                       -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10230),                   -->
-                                <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col36 =                                                        -->
+                                <!--   {'class': 'SqlSelectColumn',                                 -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10229),             -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_dow'}  -->
+                                <!-- col37 =                                                        -->
+                                <!--   {'class': 'SqlSelectColumn',                                 -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10230),             -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_doy'}  -->
                                 <!-- col38 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10100),  -->
@@ -550,14 +550,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10235),  -->
                                 <!--    'column_alias': 'account_id__ds__extract_day'}   -->
-                                <!-- col48 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10236),       -->
-                                <!--    'column_alias': 'account_id__ds__extract_dayofweek'}  -->
-                                <!-- col49 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10237),       -->
-                                <!--    'column_alias': 'account_id__ds__extract_dayofyear'}  -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10236),  -->
+                                <!--    'column_alias': 'account_id__ds__extract_dow'}   -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10237),  -->
+                                <!--    'column_alias': 'account_id__ds__extract_doy'}   -->
                                 <!-- col50 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10101),  -->
@@ -641,11 +641,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_252),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_253),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_254),  -->
@@ -686,14 +686,14 @@
                             <!--   {'class': 'SqlSelectColumn',                                 -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_263),       -->
                             <!--    'column_alias': 'account_id__ds_partitioned__extract_day'}  -->
-                            <!-- col22 =                                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                                       -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),             -->
-                            <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col23 =                                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                                       -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),             -->
-                            <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col22 =                                                        -->
+                            <!--   {'class': 'SqlSelectColumn',                                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_264),       -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_dow'}  -->
+                            <!-- col23 =                                                        -->
+                            <!--   {'class': 'SqlSelectColumn',                                 -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_265),       -->
+                            <!--    'column_alias': 'account_id__ds_partitioned__extract_doy'}  -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_271),  -->
@@ -734,14 +734,14 @@
                             <!--   {'class': 'SqlSelectColumn',                                  -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_280),        -->
                             <!--    'column_alias': 'customer_id__ds_partitioned__extract_day'}  -->
-                            <!-- col34 =                                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                                        -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),              -->
-                            <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col35 =                                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                                        -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),              -->
-                            <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col34 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_281),        -->
+                            <!--    'column_alias': 'customer_id__ds_partitioned__extract_dow'}  -->
+                            <!-- col35 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_282),        -->
+                            <!--    'column_alias': 'customer_id__ds_partitioned__extract_doy'}  -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_266),  -->
@@ -825,14 +825,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10242),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col11 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10243),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col12 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10244),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col11 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10243),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col12 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10244),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col13 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10105),  -->
@@ -877,14 +877,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                                 -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10249),             -->
                                 <!--    'column_alias': 'account_id__ds_partitioned__extract_day'}  -->
-                                <!-- col24 =                                                              -->
-                                <!--   {'class': 'SqlSelectColumn',                                       -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10250),                   -->
-                                <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col25 =                                                              -->
-                                <!--   {'class': 'SqlSelectColumn',                                       -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10251),                   -->
-                                <!--    'column_alias': 'account_id__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col24 =                                                        -->
+                                <!--   {'class': 'SqlSelectColumn',                                 -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10250),             -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_dow'}  -->
+                                <!-- col25 =                                                        -->
+                                <!--   {'class': 'SqlSelectColumn',                                 -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10251),             -->
+                                <!--    'column_alias': 'account_id__ds_partitioned__extract_doy'}  -->
                                 <!-- col26 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10107),  -->
@@ -981,11 +981,11 @@
                                 <!-- col10 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_221),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                 <!-- col11 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_222),  -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                 <!-- col12 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_223),  -->
@@ -1026,14 +1026,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                                  -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_232),        -->
                                 <!--    'column_alias': 'customer_id__ds_partitioned__extract_day'}  -->
-                                <!-- col22 =                                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                                        -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_233),              -->
-                                <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col23 =                                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                                        -->
-                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_234),              -->
-                                <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col22 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_233),        -->
+                                <!--    'column_alias': 'customer_id__ds_partitioned__extract_dow'}  -->
+                                <!-- col23 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_234),        -->
+                                <!--    'column_alias': 'customer_id__ds_partitioned__extract_doy'}  -->
                                 <!-- col24 =                                                   -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_235),  -->
@@ -1107,14 +1107,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                      -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10256),  -->
                                     <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                    <!-- col12 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10257),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col13 =                                                  -->
-                                    <!--   {'class': 'SqlSelectColumn',                           -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10258),       -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col12 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10257),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                    <!-- col13 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10258),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                     <!-- col14 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10120),  -->
@@ -1163,14 +1163,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                                  -->
                                     <!--    'expr': SqlExtractExpression(node_id=ex_10263),              -->
                                     <!--    'column_alias': 'customer_id__ds_partitioned__extract_day'}  -->
-                                    <!-- col26 =                                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10264),                    -->
-                                    <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col27 =                                                               -->
-                                    <!--   {'class': 'SqlSelectColumn',                                        -->
-                                    <!--    'expr': SqlExtractExpression(node_id=ex_10265),                    -->
-                                    <!--    'column_alias': 'customer_id__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col26 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10264),              -->
+                                    <!--    'column_alias': 'customer_id__ds_partitioned__extract_dow'}  -->
+                                    <!-- col27 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10265),              -->
+                                    <!--    'column_alias': 'customer_id__ds_partitioned__extract_doy'}  -->
                                     <!-- col28 =                                                     -->
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10123),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml
index 91382c7f6c..3ad305b7ab 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multiple_metrics_no_dimensions__plan0.xml
@@ -94,11 +94,11 @@
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_970),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                        <!--    'column_alias': 'ds__extract_dow'}                     -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_971),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                        <!--    'column_alias': 'ds__extract_doy'}                     -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_972),  -->
@@ -142,11 +142,11 @@
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_982),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_983),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_984),  -->
@@ -190,11 +190,11 @@
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_994),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}                -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_995),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}                -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_996),  -->
@@ -238,11 +238,11 @@
                         <!-- col46 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1006),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}       -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}             -->
                         <!-- col47 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1007),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}       -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}             -->
                         <!-- col48 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1008),  -->
@@ -283,14 +283,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1017),   -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col58 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1018),         -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col59 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1019),         -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col58 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1018),   -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col59 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1019),   -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col60 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1020),  -->
@@ -334,11 +334,11 @@
                         <!-- col70 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1030),  -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}        -->
                         <!-- col71 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1031),  -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}        -->
                         <!-- col72 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1032),  -->
@@ -382,11 +382,11 @@
                         <!-- col82 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1042),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofweek'}       -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}             -->
                         <!-- col83 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1043),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofyear'}       -->
+                        <!--    'column_alias': 'metric_time__extract_doy'}             -->
                         <!-- col84 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1044),  -->
@@ -519,11 +519,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_864),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_865),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_866),  -->
@@ -567,11 +567,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_876),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_877),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_878),  -->
@@ -615,11 +615,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_888),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_889),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_890),  -->
@@ -663,11 +663,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_900),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_901),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_902),  -->
@@ -708,14 +708,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_911),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_912),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_913),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_912),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_913),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_914),  -->
@@ -756,14 +756,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_923),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_924),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_925),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_924),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_925),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_926),  -->
@@ -807,11 +807,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_936),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_937),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_938),  -->
@@ -1004,11 +1004,11 @@
                                 <!-- col25 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col26 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1049,14 +1049,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col37 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col38 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1100,11 +1100,11 @@
                                 <!-- col49 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col50 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -1149,14 +1149,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col62 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col63 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -1197,14 +1197,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col74 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col75 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -1245,14 +1245,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col86 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col87 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -1366,11 +1366,11 @@
                         <!-- col10 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1145),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}                -->
+                        <!--    'column_alias': 'ds__extract_dow'}                      -->
                         <!-- col11 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1146),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}                -->
+                        <!--    'column_alias': 'ds__extract_doy'}                      -->
                         <!-- col12 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1147),  -->
@@ -1414,11 +1414,11 @@
                         <!-- col22 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1157),  -->
-                        <!--    'column_alias': 'created_at__extract_dayofweek'}        -->
+                        <!--    'column_alias': 'created_at__extract_dow'}              -->
                         <!-- col23 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1158),  -->
-                        <!--    'column_alias': 'created_at__extract_dayofyear'}        -->
+                        <!--    'column_alias': 'created_at__extract_doy'}              -->
                         <!-- col24 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1159),  -->
@@ -1462,11 +1462,11 @@
                         <!-- col34 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1169),  -->
-                        <!--    'column_alias': 'listing__ds__extract_dayofweek'}       -->
+                        <!--    'column_alias': 'listing__ds__extract_dow'}             -->
                         <!-- col35 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1170),  -->
-                        <!--    'column_alias': 'listing__ds__extract_dayofyear'}       -->
+                        <!--    'column_alias': 'listing__ds__extract_doy'}             -->
                         <!-- col36 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1171),  -->
@@ -1507,14 +1507,14 @@
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1180),  -->
                         <!--    'column_alias': 'listing__created_at__extract_day'}     -->
-                        <!-- col46 =                                                       -->
-                        <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1181),     -->
-                        <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                        <!-- col47 =                                                       -->
-                        <!--   {'class': 'SqlSelectColumn',                                -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1182),     -->
-                        <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                        <!-- col46 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1181),  -->
+                        <!--    'column_alias': 'listing__created_at__extract_dow'}     -->
+                        <!-- col47 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                             -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1182),  -->
+                        <!--    'column_alias': 'listing__created_at__extract_doy'}     -->
                         <!-- col48 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1183),  -->
@@ -1558,11 +1558,11 @@
                         <!-- col58 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1193),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofweek'}       -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}             -->
                         <!-- col59 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1194),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofyear'}       -->
+                        <!--    'column_alias': 'metric_time__extract_doy'}             -->
                         <!-- col60 =                                                    -->
                         <!--   {'class': 'SqlSelectColumn',                             -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1195),  -->
@@ -1659,11 +1659,11 @@
                             <!-- col10 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1072),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}                -->
+                            <!--    'column_alias': 'ds__extract_dow'}                      -->
                             <!-- col11 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1073),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}                -->
+                            <!--    'column_alias': 'ds__extract_doy'}                      -->
                             <!-- col12 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1074),  -->
@@ -1707,11 +1707,11 @@
                             <!-- col22 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1084),  -->
-                            <!--    'column_alias': 'created_at__extract_dayofweek'}        -->
+                            <!--    'column_alias': 'created_at__extract_dow'}              -->
                             <!-- col23 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1085),  -->
-                            <!--    'column_alias': 'created_at__extract_dayofyear'}        -->
+                            <!--    'column_alias': 'created_at__extract_doy'}              -->
                             <!-- col24 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1086),  -->
@@ -1755,11 +1755,11 @@
                             <!-- col34 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1096),  -->
-                            <!--    'column_alias': 'listing__ds__extract_dayofweek'}       -->
+                            <!--    'column_alias': 'listing__ds__extract_dow'}             -->
                             <!-- col35 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1097),  -->
-                            <!--    'column_alias': 'listing__ds__extract_dayofyear'}       -->
+                            <!--    'column_alias': 'listing__ds__extract_doy'}             -->
                             <!-- col36 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1098),  -->
@@ -1800,14 +1800,14 @@
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1107),  -->
                             <!--    'column_alias': 'listing__created_at__extract_day'}     -->
-                            <!-- col46 =                                                       -->
-                            <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1108),     -->
-                            <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                            <!-- col47 =                                                       -->
-                            <!--   {'class': 'SqlSelectColumn',                                -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1109),     -->
-                            <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                            <!-- col46 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1108),  -->
+                            <!--    'column_alias': 'listing__created_at__extract_dow'}     -->
+                            <!-- col47 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                             -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1109),  -->
+                            <!--    'column_alias': 'listing__created_at__extract_doy'}     -->
                             <!-- col48 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1110),  -->
@@ -1851,11 +1851,11 @@
                             <!-- col58 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1120),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}       -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}             -->
                             <!-- col59 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1121),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}       -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}             -->
                             <!-- col60 =                                                    -->
                             <!--   {'class': 'SqlSelectColumn',                             -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_1122),  -->
@@ -1964,11 +1964,11 @@
                                 <!-- col13 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col14 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col15 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -2009,14 +2009,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                                 <!--    'column_alias': 'created_at__extract_day'}       -->
-                                <!-- col25 =                                              -->
-                                <!--   {'class': 'SqlSelectColumn',                       -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                                <!-- col26 =                                              -->
-                                <!--   {'class': 'SqlSelectColumn',                       -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                                <!--    'column_alias': 'created_at__extract_dow'}       -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                                <!--    'column_alias': 'created_at__extract_doy'}       -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -2069,14 +2069,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                                 <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                                <!-- col40 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                                <!-- col41 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                                <!-- col40 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                                <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                                <!-- col41 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                                <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                                 <!-- col42 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -2117,14 +2117,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                          -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                                 <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                                <!-- col52 =                                                       -->
-                                <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                                <!-- col53 =                                                       -->
-                                <!--   {'class': 'SqlSelectColumn',                                -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                                <!-- col52 =                                                 -->
+                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                                <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                                <!-- col53 =                                                 -->
+                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                                <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                                 <!-- col54 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml
index dbf66e4cac..5a9299184c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_nested_derived_metric__plan0.xml
@@ -172,11 +172,11 @@
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -220,11 +220,11 @@
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -268,11 +268,11 @@
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -316,11 +316,11 @@
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -361,14 +361,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col58 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col59 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col58 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col59 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -409,14 +409,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                    <!-- col70 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col71 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col70 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                    <!-- col71 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -460,11 +460,11 @@
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -657,11 +657,11 @@
                                         <!-- col25 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!--    'column_alias': 'ds__extract_dow'}               -->
                                         <!-- col26 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!--    'column_alias': 'ds__extract_doy'}               -->
                                         <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -702,14 +702,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                         <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                        <!-- col37 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col38 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col37 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                        <!-- col38 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                         <!-- col39 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -753,11 +753,11 @@
                                         <!-- col49 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                         <!-- col50 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                         <!-- col51 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -802,14 +802,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                         <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                        <!-- col62 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                        <!-- col63 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col62 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                        <!-- col63 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                         <!-- col64 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -850,14 +850,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                        <!-- col74 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col75 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col74 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                        <!-- col75 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                         <!-- col76 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -898,14 +898,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                       -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                         <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                        <!-- col86 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                        <!-- col87 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col86 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                        <!-- col87 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                         <!-- col88 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -1033,11 +1033,11 @@
                                     <!-- col10 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                                    <!--    'column_alias': 'ds__extract_dow'}                     -->
                                     <!-- col11 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
-                                    <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                                    <!--    'column_alias': 'ds__extract_doy'}                     -->
                                     <!-- col12 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
@@ -1081,11 +1081,11 @@
                                     <!-- col22 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                                     <!-- col23 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                                    <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                                     <!-- col24 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
@@ -1129,11 +1129,11 @@
                                     <!-- col34 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}                -->
                                     <!-- col35 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
-                                    <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}                -->
                                     <!-- col36 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
@@ -1177,11 +1177,11 @@
                                     <!-- col46 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                                     <!-- col47 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
-                                    <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                                     <!-- col48 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
@@ -1222,14 +1222,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                              -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
                                     <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                    <!-- col58 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                    <!-- col59 =                                                           -->
-                                    <!--   {'class': 'SqlSelectColumn',                                    -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),          -->
-                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                    <!-- col58 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col59 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                     <!-- col60 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
@@ -1270,14 +1270,14 @@
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
                                     <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                                    <!-- col70 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                    <!-- col71 =                                                    -->
-                                    <!--   {'class': 'SqlSelectColumn',                             -->
-                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),   -->
-                                    <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                    <!-- col70 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                    <!-- col71 =                                                   -->
+                                    <!--   {'class': 'SqlSelectColumn',                            -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                                     <!-- col72 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
@@ -1321,11 +1321,11 @@
                                     <!-- col82 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
                                     <!-- col83 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
-                                    <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
                                     <!-- col84 =                                                   -->
                                     <!--   {'class': 'SqlSelectColumn',                            -->
                                     <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
@@ -1518,11 +1518,11 @@
                                         <!-- col25 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                        <!--    'column_alias': 'ds__extract_dow'}               -->
                                         <!-- col26 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                        <!--    'column_alias': 'ds__extract_doy'}               -->
                                         <!-- col27 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1563,14 +1563,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                         <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                        <!-- col37 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col38 =                                                  -->
-                                        <!--   {'class': 'SqlSelectColumn',                           -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col37 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                        <!-- col38 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                         <!-- col39 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1614,11 +1614,11 @@
                                         <!-- col49 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                         <!-- col50 =                                             -->
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                        <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                         <!-- col51 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -1663,14 +1663,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                      -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                         <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                        <!-- col62 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                        <!-- col63 =                                               -->
-                                        <!--   {'class': 'SqlSelectColumn',                        -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                        <!-- col62 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                        <!-- col63 =                                             -->
+                                        <!--   {'class': 'SqlSelectColumn',                      -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                         <!-- col64 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -1711,14 +1711,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                        <!-- col74 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                        <!-- col75 =                                                           -->
-                                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                        <!-- col74 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                        <!-- col75 =                                                     -->
+                                        <!--   {'class': 'SqlSelectColumn',                              -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                         <!-- col76 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -1759,14 +1759,14 @@
                                         <!--   {'class': 'SqlSelectColumn',                       -->
                                         <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                         <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                        <!-- col86 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                        <!-- col87 =                                                    -->
-                                        <!--   {'class': 'SqlSelectColumn',                             -->
-                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                        <!-- col86 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                        <!-- col87 =                                              -->
+                                        <!--   {'class': 'SqlSelectColumn',                       -->
+                                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                         <!-- col88 =                                                     -->
                                         <!--   {'class': 'SqlSelectColumn',                              -->
                                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -1896,11 +1896,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
@@ -1944,11 +1944,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
@@ -1992,11 +1992,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
@@ -2040,11 +2040,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),  -->
@@ -2085,14 +2085,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
@@ -2133,14 +2133,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_798),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
@@ -2184,11 +2184,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_809),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_810),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_811),  -->
@@ -2381,11 +2381,11 @@
                                 <!-- col25 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col26 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -2426,14 +2426,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col37 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col38 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -2477,11 +2477,11 @@
                                 <!-- col49 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col50 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -2526,14 +2526,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col62 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col63 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -2574,14 +2574,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col74 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col75 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -2622,14 +2622,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col86 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col87 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -2757,11 +2757,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_848),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_849),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_850),  -->
@@ -2805,11 +2805,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_860),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_861),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_862),  -->
@@ -2853,11 +2853,11 @@
                             <!-- col34 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_872),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
                             <!-- col35 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_873),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_874),  -->
@@ -2901,11 +2901,11 @@
                             <!-- col46 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_884),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                             <!-- col47 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_885),  -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_886),  -->
@@ -2946,14 +2946,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_895),    -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col58 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col59 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),          -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_896),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_897),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_898),  -->
@@ -2994,14 +2994,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_907),  -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                            <!-- col70 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_908),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col71 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_909),   -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_908),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_909),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                             <!-- col72 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_910),  -->
@@ -3045,11 +3045,11 @@
                             <!-- col82 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_920),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col83 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_921),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col84 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_922),  -->
@@ -3242,11 +3242,11 @@
                                 <!-- col25 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col26 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col27 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -3287,14 +3287,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col37 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col38 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col39 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -3338,11 +3338,11 @@
                                 <!-- col49 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                                 <!-- col50 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                                 <!-- col51 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -3387,14 +3387,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                                <!-- col62 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                                <!-- col63 =                                               -->
-                                <!--   {'class': 'SqlSelectColumn',                        -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                                 <!-- col64 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -3435,14 +3435,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                                <!-- col74 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col75 =                                                           -->
-                                <!--   {'class': 'SqlSelectColumn',                                    -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                                 <!-- col76 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -3483,14 +3483,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                                <!-- col86 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                                <!-- col87 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                                 <!-- col88 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml
index dd1374fbd4..0069ee8ee7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_order_by_node__plan0.xml
@@ -191,11 +191,11 @@
                         <!-- col25 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
                         <!-- col26 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
                         <!-- col27 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -236,14 +236,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                         <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                        <!-- col37 =                                                  -->
-                        <!--   {'class': 'SqlSelectColumn',                           -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col38 =                                                  -->
-                        <!--   {'class': 'SqlSelectColumn',                           -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col37 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                        <!-- col38 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                         <!-- col39 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -287,11 +287,11 @@
                         <!-- col49 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}          -->
                         <!-- col50 =                                             -->
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}          -->
                         <!-- col51 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -336,14 +336,14 @@
                         <!--   {'class': 'SqlSelectColumn',                      -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                         <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                        <!-- col62 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                        <!-- col63 =                                               -->
-                        <!--   {'class': 'SqlSelectColumn',                        -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                        <!-- col62 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                        <!-- col63 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                         <!-- col64 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -384,14 +384,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col74 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col75 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col74 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col75 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col76 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -432,14 +432,14 @@
                         <!--   {'class': 'SqlSelectColumn',                       -->
                         <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                        <!-- col86 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col87 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col86 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                        <!-- col87 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                         <!-- col88 =                                                     -->
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml
index 8b5700c40e..6fbc2644c7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_partitioned_join__plan0.xml
@@ -140,11 +140,11 @@
                             <!-- col10 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
                             <!-- col11 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
                             <!-- col12 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
@@ -188,11 +188,11 @@
                             <!-- col22 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                             <!-- col23 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                             <!-- col24 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -233,14 +233,14 @@
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
                             <!--    'column_alias': 'verification__ds__extract_day'}       -->
-                            <!-- col34 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),   -->
-                            <!--    'column_alias': 'verification__ds__extract_dayofweek'}  -->
-                            <!-- col35 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),   -->
-                            <!--    'column_alias': 'verification__ds__extract_dayofyear'}  -->
+                            <!-- col34 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
+                            <!--    'column_alias': 'verification__ds__extract_dow'}       -->
+                            <!-- col35 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'column_alias': 'verification__ds__extract_doy'}       -->
                             <!-- col36 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -281,14 +281,14 @@
                             <!--   {'class': 'SqlSelectColumn',                                   -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),         -->
                             <!--    'column_alias': 'verification__ds_partitioned__extract_day'}  -->
-                            <!-- col46 =                                                                -->
-                            <!--   {'class': 'SqlSelectColumn',                                         -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),               -->
-                            <!--    'column_alias': 'verification__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col47 =                                                                -->
-                            <!--   {'class': 'SqlSelectColumn',                                         -->
-                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),               -->
-                            <!--    'column_alias': 'verification__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col46 =                                                          -->
+                            <!--   {'class': 'SqlSelectColumn',                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),         -->
+                            <!--    'column_alias': 'verification__ds_partitioned__extract_dow'}  -->
+                            <!-- col47 =                                                          -->
+                            <!--   {'class': 'SqlSelectColumn',                                   -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),         -->
+                            <!--    'column_alias': 'verification__ds_partitioned__extract_doy'}  -->
                             <!-- col48 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -332,11 +332,11 @@
                             <!-- col58 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
                             <!-- col59 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                            <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
                             <!-- col60 =                                                   -->
                             <!--   {'class': 'SqlSelectColumn',                            -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -413,11 +413,11 @@
                                 <!-- col11 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10061),  -->
-                                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
                                 <!-- col12 =                                             -->
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10062),  -->
-                                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
                                 <!-- col13 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10042),  -->
@@ -458,14 +458,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                      -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10067),  -->
                                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                                <!-- col23 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10068),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col24 =                                                  -->
-                                <!--   {'class': 'SqlSelectColumn',                           -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10069),       -->
-                                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10068),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10069),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                                 <!-- col25 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10043),  -->
@@ -510,14 +510,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                       -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10074),   -->
                                 <!--    'column_alias': 'verification__ds__extract_day'}  -->
-                                <!-- col36 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10075),         -->
-                                <!--    'column_alias': 'verification__ds__extract_dayofweek'}  -->
-                                <!-- col37 =                                                    -->
-                                <!--   {'class': 'SqlSelectColumn',                             -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10076),         -->
-                                <!--    'column_alias': 'verification__ds__extract_dayofyear'}  -->
+                                <!-- col36 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10075),   -->
+                                <!--    'column_alias': 'verification__ds__extract_dow'}  -->
+                                <!-- col37 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10076),   -->
+                                <!--    'column_alias': 'verification__ds__extract_doy'}  -->
                                 <!-- col38 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10045),  -->
@@ -558,14 +558,14 @@
                                 <!--   {'class': 'SqlSelectColumn',                                   -->
                                 <!--    'expr': SqlExtractExpression(node_id=ex_10081),               -->
                                 <!--    'column_alias': 'verification__ds_partitioned__extract_day'}  -->
-                                <!-- col48 =                                                                -->
-                                <!--   {'class': 'SqlSelectColumn',                                         -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10082),                     -->
-                                <!--    'column_alias': 'verification__ds_partitioned__extract_dayofweek'}  -->
-                                <!-- col49 =                                                                -->
-                                <!--   {'class': 'SqlSelectColumn',                                         -->
-                                <!--    'expr': SqlExtractExpression(node_id=ex_10083),                     -->
-                                <!--    'column_alias': 'verification__ds_partitioned__extract_dayofyear'}  -->
+                                <!-- col48 =                                                          -->
+                                <!--   {'class': 'SqlSelectColumn',                                   -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10082),               -->
+                                <!--    'column_alias': 'verification__ds_partitioned__extract_dow'}  -->
+                                <!-- col49 =                                                          -->
+                                <!--   {'class': 'SqlSelectColumn',                                   -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10083),               -->
+                                <!--    'column_alias': 'verification__ds_partitioned__extract_doy'}  -->
                                 <!-- col50 =                                                     -->
                                 <!--   {'class': 'SqlSelectColumn',                              -->
                                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10046),  -->
@@ -657,11 +657,11 @@
                             <!-- col10 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10131),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!--    'column_alias': 'ds__extract_dow'}               -->
                             <!-- col11 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10132),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!--    'column_alias': 'ds__extract_doy'}               -->
                             <!-- col12 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10074),  -->
@@ -702,14 +702,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10137),  -->
                             <!--    'column_alias': 'created_at__extract_day'}       -->
-                            <!-- col22 =                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                       -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10138),   -->
-                            <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                            <!-- col23 =                                              -->
-                            <!--   {'class': 'SqlSelectColumn',                       -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10139),   -->
-                            <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                            <!-- col22 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10138),  -->
+                            <!--    'column_alias': 'created_at__extract_dow'}       -->
+                            <!-- col23 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10139),  -->
+                            <!--    'column_alias': 'created_at__extract_doy'}       -->
                             <!-- col24 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10075),  -->
@@ -750,14 +750,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10144),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                            <!-- col34 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10145),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col35 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10146),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col34 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10145),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                            <!-- col35 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10146),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                             <!-- col36 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10076),  -->
@@ -805,11 +805,11 @@
                             <!-- col47 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10152),  -->
-                            <!--    'column_alias': 'user__ds__extract_dayofweek'}   -->
+                            <!--    'column_alias': 'user__ds__extract_dow'}         -->
                             <!-- col48 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10153),  -->
-                            <!--    'column_alias': 'user__ds__extract_dayofyear'}   -->
+                            <!--    'column_alias': 'user__ds__extract_doy'}         -->
                             <!-- col49 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10078),  -->
@@ -850,14 +850,14 @@
                             <!--   {'class': 'SqlSelectColumn',                       -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10158),   -->
                             <!--    'column_alias': 'user__created_at__extract_day'}  -->
-                            <!-- col59 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10159),         -->
-                            <!--    'column_alias': 'user__created_at__extract_dayofweek'}  -->
-                            <!-- col60 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10160),         -->
-                            <!--    'column_alias': 'user__created_at__extract_dayofyear'}  -->
+                            <!-- col59 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10159),   -->
+                            <!--    'column_alias': 'user__created_at__extract_dow'}  -->
+                            <!-- col60 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10160),   -->
+                            <!--    'column_alias': 'user__created_at__extract_doy'}  -->
                             <!-- col61 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10079),  -->
@@ -898,14 +898,14 @@
                             <!--   {'class': 'SqlSelectColumn',                           -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10165),       -->
                             <!--    'column_alias': 'user__ds_partitioned__extract_day'}  -->
-                            <!-- col71 =                                                        -->
-                            <!--   {'class': 'SqlSelectColumn',                                 -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10166),             -->
-                            <!--    'column_alias': 'user__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col72 =                                                        -->
-                            <!--   {'class': 'SqlSelectColumn',                                 -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10167),             -->
-                            <!--    'column_alias': 'user__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col71 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10166),       -->
+                            <!--    'column_alias': 'user__ds_partitioned__extract_dow'}  -->
+                            <!-- col72 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                           -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10167),       -->
+                            <!--    'column_alias': 'user__ds_partitioned__extract_doy'}  -->
                             <!-- col73 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10080),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml
index 132ec029e6..f6a1229769 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node__plan0.xml
@@ -45,11 +45,11 @@
         <!-- col10 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_18),  -->
-        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
+        <!--    'column_alias': 'ds__extract_dow'}                    -->
         <!-- col11 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_19),  -->
-        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
+        <!--    'column_alias': 'ds__extract_doy'}                    -->
         <!-- col12 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_20),  -->
@@ -93,11 +93,11 @@
         <!-- col22 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_30),  -->
-        <!--    'column_alias': 'account__ds__extract_dayofweek'}     -->
+        <!--    'column_alias': 'account__ds__extract_dow'}           -->
         <!-- col23 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_31),  -->
-        <!--    'column_alias': 'account__ds__extract_dayofyear'}     -->
+        <!--    'column_alias': 'account__ds__extract_doy'}           -->
         <!-- col24 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_32),  -->
@@ -192,11 +192,11 @@
             <!-- col13 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10005),  -->
-            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+            <!--    'column_alias': 'ds__extract_dow'}               -->
             <!-- col14 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10006),  -->
-            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+            <!--    'column_alias': 'ds__extract_doy'}               -->
             <!-- col15 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10004),  -->
@@ -241,14 +241,14 @@
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10011),  -->
             <!--    'column_alias': 'account__ds__extract_day'}      -->
-            <!-- col26 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                        -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10012),    -->
-            <!--    'column_alias': 'account__ds__extract_dayofweek'}  -->
-            <!-- col27 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                        -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10013),    -->
-            <!--    'column_alias': 'account__ds__extract_dayofyear'}  -->
+            <!-- col26 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10012),  -->
+            <!--    'column_alias': 'account__ds__extract_dow'}      -->
+            <!-- col27 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10013),  -->
+            <!--    'column_alias': 'account__ds__extract_doy'}      -->
             <!-- col28 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10006),  -->
@@ -336,11 +336,11 @@
                 <!-- col13 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10005),  -->
-                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!--    'column_alias': 'ds__extract_dow'}               -->
                 <!-- col14 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10006),  -->
-                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!--    'column_alias': 'ds__extract_doy'}               -->
                 <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10004),  -->
@@ -385,14 +385,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10011),  -->
                 <!--    'column_alias': 'account__ds__extract_day'}      -->
-                <!-- col26 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10012),    -->
-                <!--    'column_alias': 'account__ds__extract_dayofweek'}  -->
-                <!-- col27 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10013),    -->
-                <!--    'column_alias': 'account__ds__extract_dayofyear'}  -->
+                <!-- col26 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10012),  -->
+                <!--    'column_alias': 'account__ds__extract_dow'}      -->
+                <!-- col27 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10013),  -->
+                <!--    'column_alias': 'account__ds__extract_doy'}      -->
                 <!-- col28 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10006),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml
index cceeec487f..f8ed520f2f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_grouping__plan0.xml
@@ -45,11 +45,11 @@
         <!-- col10 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_21),  -->
-        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
+        <!--    'column_alias': 'ds__extract_dow'}                    -->
         <!-- col11 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_22),  -->
-        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
+        <!--    'column_alias': 'ds__extract_doy'}                    -->
         <!-- col12 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_23),  -->
@@ -93,11 +93,11 @@
         <!-- col22 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_33),  -->
-        <!--    'column_alias': 'account__ds__extract_dayofweek'}     -->
+        <!--    'column_alias': 'account__ds__extract_dow'}           -->
         <!-- col23 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_34),  -->
-        <!--    'column_alias': 'account__ds__extract_dayofyear'}     -->
+        <!--    'column_alias': 'account__ds__extract_doy'}           -->
         <!-- col24 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_35),  -->
@@ -192,11 +192,11 @@
             <!-- col13 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10005),  -->
-            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+            <!--    'column_alias': 'ds__extract_dow'}               -->
             <!-- col14 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10006),  -->
-            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+            <!--    'column_alias': 'ds__extract_doy'}               -->
             <!-- col15 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10004),  -->
@@ -241,14 +241,14 @@
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10011),  -->
             <!--    'column_alias': 'account__ds__extract_day'}      -->
-            <!-- col26 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                        -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10012),    -->
-            <!--    'column_alias': 'account__ds__extract_dayofweek'}  -->
-            <!-- col27 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                        -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10013),    -->
-            <!--    'column_alias': 'account__ds__extract_dayofyear'}  -->
+            <!-- col26 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10012),  -->
+            <!--    'column_alias': 'account__ds__extract_dow'}      -->
+            <!-- col27 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10013),  -->
+            <!--    'column_alias': 'account__ds__extract_doy'}      -->
             <!-- col28 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10006),  -->
@@ -344,11 +344,11 @@
                 <!-- col13 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10005),  -->
-                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!--    'column_alias': 'ds__extract_dow'}               -->
                 <!-- col14 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10006),  -->
-                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!--    'column_alias': 'ds__extract_doy'}               -->
                 <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10004),  -->
@@ -393,14 +393,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10011),  -->
                 <!--    'column_alias': 'account__ds__extract_day'}      -->
-                <!-- col26 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10012),    -->
-                <!--    'column_alias': 'account__ds__extract_dayofweek'}  -->
-                <!-- col27 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10013),    -->
-                <!--    'column_alias': 'account__ds__extract_dayofyear'}  -->
+                <!-- col26 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10012),  -->
+                <!--    'column_alias': 'account__ds__extract_dow'}      -->
+                <!-- col27 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10013),  -->
+                <!--    'column_alias': 'account__ds__extract_doy'}      -->
                 <!-- col28 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10006),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
index f030246e44..ed70382110 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_semi_additive_join_node_with_queried_group_by__plan0.xml
@@ -45,11 +45,11 @@
         <!-- col10 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_19),  -->
-        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
+        <!--    'column_alias': 'ds__extract_dow'}                    -->
         <!-- col11 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_20),  -->
-        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
+        <!--    'column_alias': 'ds__extract_doy'}                    -->
         <!-- col12 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_21),  -->
@@ -93,11 +93,11 @@
         <!-- col22 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_31),  -->
-        <!--    'column_alias': 'account__ds__extract_dayofweek'}     -->
+        <!--    'column_alias': 'account__ds__extract_dow'}           -->
         <!-- col23 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_32),  -->
-        <!--    'column_alias': 'account__ds__extract_dayofyear'}     -->
+        <!--    'column_alias': 'account__ds__extract_doy'}           -->
         <!-- col24 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_33),  -->
@@ -192,11 +192,11 @@
             <!-- col13 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10005),  -->
-            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+            <!--    'column_alias': 'ds__extract_dow'}               -->
             <!-- col14 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10006),  -->
-            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+            <!--    'column_alias': 'ds__extract_doy'}               -->
             <!-- col15 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10004),  -->
@@ -241,14 +241,14 @@
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10011),  -->
             <!--    'column_alias': 'account__ds__extract_day'}      -->
-            <!-- col26 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                        -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10012),    -->
-            <!--    'column_alias': 'account__ds__extract_dayofweek'}  -->
-            <!-- col27 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                        -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10013),    -->
-            <!--    'column_alias': 'account__ds__extract_dayofyear'}  -->
+            <!-- col26 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10012),  -->
+            <!--    'column_alias': 'account__ds__extract_dow'}      -->
+            <!-- col27 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10013),  -->
+            <!--    'column_alias': 'account__ds__extract_doy'}      -->
             <!-- col28 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10006),  -->
@@ -344,11 +344,11 @@
                 <!-- col13 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10005),  -->
-                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!--    'column_alias': 'ds__extract_dow'}               -->
                 <!-- col14 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10006),  -->
-                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!--    'column_alias': 'ds__extract_doy'}               -->
                 <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10004),  -->
@@ -393,14 +393,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10011),  -->
                 <!--    'column_alias': 'account__ds__extract_day'}      -->
-                <!-- col26 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10012),    -->
-                <!--    'column_alias': 'account__ds__extract_dayofweek'}  -->
-                <!-- col27 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10013),    -->
-                <!--    'column_alias': 'account__ds__extract_dayofyear'}  -->
+                <!-- col26 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10012),  -->
+                <!--    'column_alias': 'account__ds__extract_dow'}      -->
+                <!-- col27 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10013),  -->
+                <!--    'column_alias': 'account__ds__extract_doy'}      -->
                 <!-- col28 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10006),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml
index e1cc885427..d6e800bd30 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_single_join_node__plan0.xml
@@ -139,11 +139,11 @@
                 <!-- col25 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!--    'column_alias': 'ds__extract_dow'}               -->
                 <!-- col26 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!--    'column_alias': 'ds__extract_doy'}               -->
                 <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -184,14 +184,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                 <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                <!-- col37 =                                                  -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                <!-- col38 =                                                  -->
-                <!--   {'class': 'SqlSelectColumn',                           -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                <!-- col37 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                <!-- col38 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                 <!-- col39 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -235,11 +235,11 @@
                 <!-- col49 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                <!--    'column_alias': 'paid_at__extract_dow'}          -->
                 <!-- col50 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                <!--    'column_alias': 'paid_at__extract_doy'}          -->
                 <!-- col51 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -284,14 +284,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                 <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                <!-- col62 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                <!-- col63 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                <!-- col62 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                <!-- col63 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                 <!-- col64 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -332,14 +332,14 @@
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                 <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                <!-- col74 =                                                           -->
-                <!--   {'class': 'SqlSelectColumn',                                    -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                <!-- col75 =                                                           -->
-                <!--   {'class': 'SqlSelectColumn',                                    -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                <!-- col74 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                <!-- col75 =                                                     -->
+                <!--   {'class': 'SqlSelectColumn',                              -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                 <!-- col76 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -380,14 +380,14 @@
                 <!--   {'class': 'SqlSelectColumn',                       -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                 <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                <!-- col86 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                             -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                <!-- col87 =                                                    -->
-                <!--   {'class': 'SqlSelectColumn',                             -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                <!-- col86 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                <!-- col87 =                                              -->
+                <!--   {'class': 'SqlSelectColumn',                       -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                 <!-- col88 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -494,11 +494,11 @@
                 <!-- col13 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10089),  -->
-                <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                <!--    'column_alias': 'ds__extract_dow'}               -->
                 <!-- col14 =                                             -->
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10090),  -->
-                <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                <!--    'column_alias': 'ds__extract_doy'}               -->
                 <!-- col15 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10053),  -->
@@ -539,14 +539,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10095),  -->
                 <!--    'column_alias': 'created_at__extract_day'}       -->
-                <!-- col25 =                                              -->
-                <!--   {'class': 'SqlSelectColumn',                       -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10096),   -->
-                <!--    'column_alias': 'created_at__extract_dayofweek'}  -->
-                <!-- col26 =                                              -->
-                <!--   {'class': 'SqlSelectColumn',                       -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10097),   -->
-                <!--    'column_alias': 'created_at__extract_dayofyear'}  -->
+                <!-- col25 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10096),  -->
+                <!--    'column_alias': 'created_at__extract_dow'}       -->
+                <!-- col26 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10097),  -->
+                <!--    'column_alias': 'created_at__extract_doy'}       -->
                 <!-- col27 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10054),  -->
@@ -599,14 +599,14 @@
                 <!--   {'class': 'SqlSelectColumn',                      -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10102),  -->
                 <!--    'column_alias': 'listing__ds__extract_day'}      -->
-                <!-- col40 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10103),    -->
-                <!--    'column_alias': 'listing__ds__extract_dayofweek'}  -->
-                <!-- col41 =                                               -->
-                <!--   {'class': 'SqlSelectColumn',                        -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10104),    -->
-                <!--    'column_alias': 'listing__ds__extract_dayofyear'}  -->
+                <!-- col40 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10103),  -->
+                <!--    'column_alias': 'listing__ds__extract_dow'}      -->
+                <!-- col41 =                                             -->
+                <!--   {'class': 'SqlSelectColumn',                      -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10104),  -->
+                <!--    'column_alias': 'listing__ds__extract_doy'}      -->
                 <!-- col42 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10058),  -->
@@ -647,14 +647,14 @@
                 <!--   {'class': 'SqlSelectColumn',                          -->
                 <!--    'expr': SqlExtractExpression(node_id=ex_10109),      -->
                 <!--    'column_alias': 'listing__created_at__extract_day'}  -->
-                <!-- col52 =                                                       -->
-                <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10110),            -->
-                <!--    'column_alias': 'listing__created_at__extract_dayofweek'}  -->
-                <!-- col53 =                                                       -->
-                <!--   {'class': 'SqlSelectColumn',                                -->
-                <!--    'expr': SqlExtractExpression(node_id=ex_10111),            -->
-                <!--    'column_alias': 'listing__created_at__extract_dayofyear'}  -->
+                <!-- col52 =                                                 -->
+                <!--   {'class': 'SqlSelectColumn',                          -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10110),      -->
+                <!--    'column_alias': 'listing__created_at__extract_dow'}  -->
+                <!-- col53 =                                                 -->
+                <!--   {'class': 'SqlSelectColumn',                          -->
+                <!--    'expr': SqlExtractExpression(node_id=ex_10111),      -->
+                <!--    'column_alias': 'listing__created_at__extract_doy'}  -->
                 <!-- col54 =                                                     -->
                 <!--   {'class': 'SqlSelectColumn',                              -->
                 <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10059),  -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml
index c497bc5f85..75df770af7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_source_node__plan0.xml
@@ -105,11 +105,11 @@
         <!-- col25 =                                             -->
         <!--   {'class': 'SqlSelectColumn',                      -->
         <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-        <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+        <!--    'column_alias': 'ds__extract_dow'}               -->
         <!-- col26 =                                             -->
         <!--   {'class': 'SqlSelectColumn',                      -->
         <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-        <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+        <!--    'column_alias': 'ds__extract_doy'}               -->
         <!-- col27 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -150,14 +150,14 @@
         <!--   {'class': 'SqlSelectColumn',                      -->
         <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
         <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-        <!-- col37 =                                                  -->
-        <!--   {'class': 'SqlSelectColumn',                           -->
-        <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-        <!-- col38 =                                                  -->
-        <!--   {'class': 'SqlSelectColumn',                           -->
-        <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+        <!-- col37 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+        <!-- col38 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
         <!-- col39 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -201,11 +201,11 @@
         <!-- col49 =                                             -->
         <!--   {'class': 'SqlSelectColumn',                      -->
         <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-        <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+        <!--    'column_alias': 'paid_at__extract_dow'}          -->
         <!-- col50 =                                             -->
         <!--   {'class': 'SqlSelectColumn',                      -->
         <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-        <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+        <!--    'column_alias': 'paid_at__extract_doy'}          -->
         <!-- col51 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -250,14 +250,14 @@
         <!--   {'class': 'SqlSelectColumn',                      -->
         <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
         <!--    'column_alias': 'booking__ds__extract_day'}      -->
-        <!-- col62 =                                               -->
-        <!--   {'class': 'SqlSelectColumn',                        -->
-        <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-        <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-        <!-- col63 =                                               -->
-        <!--   {'class': 'SqlSelectColumn',                        -->
-        <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-        <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+        <!-- col62 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+        <!-- col63 =                                             -->
+        <!--   {'class': 'SqlSelectColumn',                      -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
         <!-- col64 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -298,14 +298,14 @@
         <!--   {'class': 'SqlSelectColumn',                              -->
         <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-        <!-- col74 =                                                           -->
-        <!--   {'class': 'SqlSelectColumn',                                    -->
-        <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-        <!-- col75 =                                                           -->
-        <!--   {'class': 'SqlSelectColumn',                                    -->
-        <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+        <!-- col74 =                                                     -->
+        <!--   {'class': 'SqlSelectColumn',                              -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+        <!-- col75 =                                                     -->
+        <!--   {'class': 'SqlSelectColumn',                              -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
         <!-- col76 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -346,14 +346,14 @@
         <!--   {'class': 'SqlSelectColumn',                       -->
         <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
         <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-        <!-- col86 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                             -->
-        <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-        <!-- col87 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                             -->
-        <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+        <!-- col86 =                                              -->
+        <!--   {'class': 'SqlSelectColumn',                       -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+        <!-- col87 =                                              -->
+        <!--   {'class': 'SqlSelectColumn',                       -->
+        <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
         <!-- col88 =                                                     -->
         <!--   {'class': 'SqlSelectColumn',                              -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index b9c1d34bad..c1a2ea132e 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month
   , subq_0.ds__extract_week
   , subq_0.ds__extract_day
-  , subq_0.ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear
+  , subq_0.ds__extract_dow
+  , subq_0.ds__extract_doy
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.ds_partitioned__extract_month
   , subq_0.ds_partitioned__extract_week
   , subq_0.ds_partitioned__extract_day
-  , subq_0.ds_partitioned__extract_dayofweek
-  , subq_0.ds_partitioned__extract_dayofyear
+  , subq_0.ds_partitioned__extract_dow
+  , subq_0.ds_partitioned__extract_doy
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
@@ -34,8 +34,8 @@ SELECT
   , subq_0.paid_at__extract_month
   , subq_0.paid_at__extract_week
   , subq_0.paid_at__extract_day
-  , subq_0.paid_at__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear
+  , subq_0.paid_at__extract_dow
+  , subq_0.paid_at__extract_doy
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
@@ -46,8 +46,8 @@ SELECT
   , subq_0.booking__ds__extract_month
   , subq_0.booking__ds__extract_week
   , subq_0.booking__ds__extract_day
-  , subq_0.booking__ds__extract_dayofweek
-  , subq_0.booking__ds__extract_dayofyear
+  , subq_0.booking__ds__extract_dow
+  , subq_0.booking__ds__extract_doy
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
@@ -58,8 +58,8 @@ SELECT
   , subq_0.booking__ds_partitioned__extract_month
   , subq_0.booking__ds_partitioned__extract_week
   , subq_0.booking__ds_partitioned__extract_day
-  , subq_0.booking__ds_partitioned__extract_dayofweek
-  , subq_0.booking__ds_partitioned__extract_dayofyear
+  , subq_0.booking__ds_partitioned__extract_dow
+  , subq_0.booking__ds_partitioned__extract_doy
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
@@ -70,8 +70,8 @@ SELECT
   , subq_0.booking__paid_at__extract_month
   , subq_0.booking__paid_at__extract_week
   , subq_0.booking__paid_at__extract_day
-  , subq_0.booking__paid_at__extract_dayofweek
-  , subq_0.booking__paid_at__extract_dayofyear
+  , subq_0.booking__paid_at__extract_dow
+  , subq_0.booking__paid_at__extract_doy
   , subq_0.paid_at__day AS metric_time__day
   , subq_0.paid_at__week AS metric_time__week
   , subq_0.paid_at__month AS metric_time__month
@@ -82,8 +82,8 @@ SELECT
   , subq_0.paid_at__extract_month AS metric_time__extract_month
   , subq_0.paid_at__extract_week AS metric_time__extract_week
   , subq_0.paid_at__extract_day AS metric_time__extract_day
-  , subq_0.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
+  , subq_0.paid_at__extract_dow AS metric_time__extract_dow
+  , subq_0.paid_at__extract_doy AS metric_time__extract_doy
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
@@ -121,8 +121,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -133,8 +133,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -145,8 +145,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -158,8 +158,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -170,8 +170,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -182,8 +182,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 9326cd820a..5b9d645f22 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -11,8 +11,8 @@ SELECT
   , EXTRACT(MONTH FROM ds) AS ds__extract_month
   , EXTRACT(WEEK FROM ds) AS ds__extract_week
   , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
@@ -23,8 +23,8 @@ SELECT
   , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
   , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
   , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
@@ -35,8 +35,8 @@ SELECT
   , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
   , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
   , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
@@ -47,8 +47,8 @@ SELECT
   , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
   , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
   , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
@@ -59,8 +59,8 @@ SELECT
   , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
   , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
   , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
@@ -71,8 +71,8 @@ SELECT
   , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
   , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
   , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_doy
   , paid_at AS metric_time__day
   , DATE_TRUNC('week', paid_at) AS metric_time__week
   , DATE_TRUNC('month', paid_at) AS metric_time__month
@@ -83,8 +83,8 @@ SELECT
   , EXTRACT(MONTH FROM paid_at) AS metric_time__extract_month
   , EXTRACT(WEEK FROM paid_at) AS metric_time__extract_week
   , EXTRACT(DAY FROM paid_at) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index a2a9795f0c..e5d56619ca 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month
   , subq_0.ds__extract_week
   , subq_0.ds__extract_day
-  , subq_0.ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear
+  , subq_0.ds__extract_dow
+  , subq_0.ds__extract_doy
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.ds_partitioned__extract_month
   , subq_0.ds_partitioned__extract_week
   , subq_0.ds_partitioned__extract_day
-  , subq_0.ds_partitioned__extract_dayofweek
-  , subq_0.ds_partitioned__extract_dayofyear
+  , subq_0.ds_partitioned__extract_dow
+  , subq_0.ds_partitioned__extract_doy
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
@@ -34,8 +34,8 @@ SELECT
   , subq_0.paid_at__extract_month
   , subq_0.paid_at__extract_week
   , subq_0.paid_at__extract_day
-  , subq_0.paid_at__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear
+  , subq_0.paid_at__extract_dow
+  , subq_0.paid_at__extract_doy
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
@@ -46,8 +46,8 @@ SELECT
   , subq_0.booking__ds__extract_month
   , subq_0.booking__ds__extract_week
   , subq_0.booking__ds__extract_day
-  , subq_0.booking__ds__extract_dayofweek
-  , subq_0.booking__ds__extract_dayofyear
+  , subq_0.booking__ds__extract_dow
+  , subq_0.booking__ds__extract_doy
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
@@ -58,8 +58,8 @@ SELECT
   , subq_0.booking__ds_partitioned__extract_month
   , subq_0.booking__ds_partitioned__extract_week
   , subq_0.booking__ds_partitioned__extract_day
-  , subq_0.booking__ds_partitioned__extract_dayofweek
-  , subq_0.booking__ds_partitioned__extract_dayofyear
+  , subq_0.booking__ds_partitioned__extract_dow
+  , subq_0.booking__ds_partitioned__extract_doy
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
@@ -70,8 +70,8 @@ SELECT
   , subq_0.booking__paid_at__extract_month
   , subq_0.booking__paid_at__extract_week
   , subq_0.booking__paid_at__extract_day
-  , subq_0.booking__paid_at__extract_dayofweek
-  , subq_0.booking__paid_at__extract_dayofyear
+  , subq_0.booking__paid_at__extract_dow
+  , subq_0.booking__paid_at__extract_doy
   , subq_0.ds__day AS metric_time__day
   , subq_0.ds__week AS metric_time__week
   , subq_0.ds__month AS metric_time__month
@@ -82,8 +82,8 @@ SELECT
   , subq_0.ds__extract_month AS metric_time__extract_month
   , subq_0.ds__extract_week AS metric_time__extract_week
   , subq_0.ds__extract_day AS metric_time__extract_day
-  , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+  , subq_0.ds__extract_dow AS metric_time__extract_dow
+  , subq_0.ds__extract_doy AS metric_time__extract_doy
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
@@ -133,8 +133,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -145,8 +145,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -157,8 +157,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -170,8 +170,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -182,8 +182,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -194,8 +194,8 @@ FROM (
     , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
     , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
     , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 30a42573dd..72985c569e 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -11,8 +11,8 @@ SELECT
   , EXTRACT(MONTH FROM ds) AS ds__extract_month
   , EXTRACT(WEEK FROM ds) AS ds__extract_week
   , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
@@ -23,8 +23,8 @@ SELECT
   , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
   , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
   , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
@@ -35,8 +35,8 @@ SELECT
   , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
   , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
   , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
@@ -47,8 +47,8 @@ SELECT
   , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
   , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
   , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
@@ -59,8 +59,8 @@ SELECT
   , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
   , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
   , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
@@ -71,8 +71,8 @@ SELECT
   , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
   , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
   , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_doy
   , ds AS metric_time__day
   , DATE_TRUNC('week', ds) AS metric_time__week
   , DATE_TRUNC('month', ds) AS metric_time__month
@@ -83,8 +83,8 @@ SELECT
   , EXTRACT(MONTH FROM ds) AS metric_time__extract_month
   , EXTRACT(WEEK FROM ds) AS metric_time__extract_week
   , EXTRACT(DAY FROM ds) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_dayofyear
+  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
index 4b399298d5..08c1707601 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -155,8 +155,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -167,8 +167,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -179,8 +179,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -192,8 +192,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -204,8 +204,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -216,8 +216,8 @@ FROM (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -261,8 +261,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month
           , subq_5.ds__extract_week
           , subq_5.ds__extract_day
-          , subq_5.ds__extract_dayofweek
-          , subq_5.ds__extract_dayofyear
+          , subq_5.ds__extract_dow
+          , subq_5.ds__extract_doy
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
@@ -273,8 +273,8 @@ FULL OUTER JOIN (
           , subq_5.ds_partitioned__extract_month
           , subq_5.ds_partitioned__extract_week
           , subq_5.ds_partitioned__extract_day
-          , subq_5.ds_partitioned__extract_dayofweek
-          , subq_5.ds_partitioned__extract_dayofyear
+          , subq_5.ds_partitioned__extract_dow
+          , subq_5.ds_partitioned__extract_doy
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
@@ -285,8 +285,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month
           , subq_5.paid_at__extract_week
           , subq_5.paid_at__extract_day
-          , subq_5.paid_at__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear
+          , subq_5.paid_at__extract_dow
+          , subq_5.paid_at__extract_doy
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
@@ -297,8 +297,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds__extract_month
           , subq_5.booking__ds__extract_week
           , subq_5.booking__ds__extract_day
-          , subq_5.booking__ds__extract_dayofweek
-          , subq_5.booking__ds__extract_dayofyear
+          , subq_5.booking__ds__extract_dow
+          , subq_5.booking__ds__extract_doy
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
@@ -309,8 +309,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds_partitioned__extract_month
           , subq_5.booking__ds_partitioned__extract_week
           , subq_5.booking__ds_partitioned__extract_day
-          , subq_5.booking__ds_partitioned__extract_dayofweek
-          , subq_5.booking__ds_partitioned__extract_dayofyear
+          , subq_5.booking__ds_partitioned__extract_dow
+          , subq_5.booking__ds_partitioned__extract_doy
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
@@ -321,8 +321,8 @@ FULL OUTER JOIN (
           , subq_5.booking__paid_at__extract_month
           , subq_5.booking__paid_at__extract_week
           , subq_5.booking__paid_at__extract_day
-          , subq_5.booking__paid_at__extract_dayofweek
-          , subq_5.booking__paid_at__extract_dayofyear
+          , subq_5.booking__paid_at__extract_dow
+          , subq_5.booking__paid_at__extract_doy
           , subq_5.paid_at__day AS metric_time__day
           , subq_5.paid_at__week AS metric_time__week
           , subq_5.paid_at__month AS metric_time__month
@@ -333,8 +333,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month AS metric_time__extract_month
           , subq_5.paid_at__extract_week AS metric_time__extract_week
           , subq_5.paid_at__extract_day AS metric_time__extract_day
-          , subq_5.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_5.paid_at__extract_dow AS metric_time__extract_dow
+          , subq_5.paid_at__extract_doy AS metric_time__extract_doy
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
@@ -372,8 +372,8 @@ FULL OUTER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
@@ -384,8 +384,8 @@ FULL OUTER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
@@ -396,8 +396,8 @@ FULL OUTER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
@@ -409,8 +409,8 @@ FULL OUTER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
@@ -421,8 +421,8 @@ FULL OUTER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
@@ -433,8 +433,8 @@ FULL OUTER JOIN (
             , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
             , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
index b7325320f3..84429ca4f1 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.xml
@@ -45,11 +45,11 @@
         <!-- col10 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_13),  -->
-        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
+        <!--    'column_alias': 'ds__extract_dow'}                    -->
         <!-- col11 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_14),  -->
-        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
+        <!--    'column_alias': 'ds__extract_doy'}                    -->
         <!-- col12 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_15),  -->
@@ -93,11 +93,11 @@
         <!-- col22 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_25),  -->
-        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+        <!--    'column_alias': 'ds_partitioned__extract_dow'}        -->
         <!-- col23 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_26),  -->
-        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+        <!--    'column_alias': 'ds_partitioned__extract_doy'}        -->
         <!-- col24 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_27),  -->
@@ -141,11 +141,11 @@
         <!-- col34 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_37),  -->
-        <!--    'column_alias': 'paid_at__extract_dayofweek'}         -->
+        <!--    'column_alias': 'paid_at__extract_dow'}               -->
         <!-- col35 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_38),  -->
-        <!--    'column_alias': 'paid_at__extract_dayofyear'}         -->
+        <!--    'column_alias': 'paid_at__extract_doy'}               -->
         <!-- col36 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_39),  -->
@@ -189,11 +189,11 @@
         <!-- col46 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_49),  -->
-        <!--    'column_alias': 'booking__ds__extract_dayofweek'}     -->
+        <!--    'column_alias': 'booking__ds__extract_dow'}           -->
         <!-- col47 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_50),  -->
-        <!--    'column_alias': 'booking__ds__extract_dayofyear'}     -->
+        <!--    'column_alias': 'booking__ds__extract_doy'}           -->
         <!-- col48 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_51),  -->
@@ -234,14 +234,14 @@
         <!--   {'class': 'SqlSelectColumn',                              -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_60),     -->
         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-        <!-- col58 =                                                           -->
-        <!--   {'class': 'SqlSelectColumn',                                    -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),           -->
-        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-        <!-- col59 =                                                           -->
-        <!--   {'class': 'SqlSelectColumn',                                    -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),           -->
-        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+        <!-- col58 =                                                     -->
+        <!--   {'class': 'SqlSelectColumn',                              -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),     -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+        <!-- col59 =                                                     -->
+        <!--   {'class': 'SqlSelectColumn',                              -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),     -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
         <!-- col60 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_63),  -->
@@ -282,14 +282,14 @@
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_72),  -->
         <!--    'column_alias': 'booking__paid_at__extract_day'}      -->
-        <!-- col70 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                             -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),    -->
-        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-        <!-- col71 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                             -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),    -->
-        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+        <!-- col70 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_dow'}      -->
+        <!-- col71 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_doy'}      -->
         <!-- col72 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_75),  -->
@@ -333,11 +333,11 @@
         <!-- col82 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),  -->
-        <!--    'column_alias': 'metric_time__extract_dayofweek'}     -->
+        <!--    'column_alias': 'metric_time__extract_dow'}           -->
         <!-- col83 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),  -->
-        <!--    'column_alias': 'metric_time__extract_dayofyear'}     -->
+        <!--    'column_alias': 'metric_time__extract_doy'}           -->
         <!-- col84 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_87),  -->
@@ -482,11 +482,11 @@
             <!-- col25 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+            <!--    'column_alias': 'ds__extract_dow'}               -->
             <!-- col26 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+            <!--    'column_alias': 'ds__extract_doy'}               -->
             <!-- col27 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -527,14 +527,14 @@
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
             <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-            <!-- col37 =                                                  -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-            <!-- col38 =                                                  -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+            <!-- col37 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+            <!-- col38 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
             <!-- col39 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -578,11 +578,11 @@
             <!-- col49 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+            <!--    'column_alias': 'paid_at__extract_dow'}          -->
             <!-- col50 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+            <!--    'column_alias': 'paid_at__extract_doy'}          -->
             <!-- col51 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -627,14 +627,14 @@
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
             <!--    'column_alias': 'booking__ds__extract_day'}      -->
-            <!-- col62 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                        -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-            <!-- col63 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                        -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+            <!-- col62 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+            <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+            <!-- col63 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+            <!--    'column_alias': 'booking__ds__extract_doy'}      -->
             <!-- col64 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -675,14 +675,14 @@
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-            <!-- col74 =                                                           -->
-            <!--   {'class': 'SqlSelectColumn',                                    -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-            <!-- col75 =                                                           -->
-            <!--   {'class': 'SqlSelectColumn',                                    -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+            <!-- col74 =                                                     -->
+            <!--   {'class': 'SqlSelectColumn',                              -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+            <!-- col75 =                                                     -->
+            <!--   {'class': 'SqlSelectColumn',                              -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
             <!-- col76 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -723,14 +723,14 @@
             <!--   {'class': 'SqlSelectColumn',                       -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
             <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-            <!-- col86 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                             -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-            <!-- col87 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                             -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+            <!-- col86 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                       -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+            <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+            <!-- col87 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                       -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+            <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
             <!-- col88 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
index bedd5ead3d..f20c045afe 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_metric_time_dimension_transform_node_using_primary_time__plan0.xml
@@ -45,11 +45,11 @@
         <!-- col10 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_25),  -->
-        <!--    'column_alias': 'ds__extract_dayofweek'}              -->
+        <!--    'column_alias': 'ds__extract_dow'}                    -->
         <!-- col11 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_26),  -->
-        <!--    'column_alias': 'ds__extract_dayofyear'}              -->
+        <!--    'column_alias': 'ds__extract_doy'}                    -->
         <!-- col12 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_27),  -->
@@ -93,11 +93,11 @@
         <!-- col22 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_37),  -->
-        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
+        <!--    'column_alias': 'ds_partitioned__extract_dow'}        -->
         <!-- col23 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_38),  -->
-        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+        <!--    'column_alias': 'ds_partitioned__extract_doy'}        -->
         <!-- col24 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_39),  -->
@@ -141,11 +141,11 @@
         <!-- col34 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_49),  -->
-        <!--    'column_alias': 'paid_at__extract_dayofweek'}         -->
+        <!--    'column_alias': 'paid_at__extract_dow'}               -->
         <!-- col35 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_50),  -->
-        <!--    'column_alias': 'paid_at__extract_dayofyear'}         -->
+        <!--    'column_alias': 'paid_at__extract_doy'}               -->
         <!-- col36 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_51),  -->
@@ -189,11 +189,11 @@
         <!-- col46 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_61),  -->
-        <!--    'column_alias': 'booking__ds__extract_dayofweek'}     -->
+        <!--    'column_alias': 'booking__ds__extract_dow'}           -->
         <!-- col47 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_62),  -->
-        <!--    'column_alias': 'booking__ds__extract_dayofyear'}     -->
+        <!--    'column_alias': 'booking__ds__extract_doy'}           -->
         <!-- col48 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_63),  -->
@@ -234,14 +234,14 @@
         <!--   {'class': 'SqlSelectColumn',                              -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_72),     -->
         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-        <!-- col58 =                                                           -->
-        <!--   {'class': 'SqlSelectColumn',                                    -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),           -->
-        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-        <!-- col59 =                                                           -->
-        <!--   {'class': 'SqlSelectColumn',                                    -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),           -->
-        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+        <!-- col58 =                                                     -->
+        <!--   {'class': 'SqlSelectColumn',                              -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_73),     -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+        <!-- col59 =                                                     -->
+        <!--   {'class': 'SqlSelectColumn',                              -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_74),     -->
+        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
         <!-- col60 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_75),  -->
@@ -282,14 +282,14 @@
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_84),  -->
         <!--    'column_alias': 'booking__paid_at__extract_day'}      -->
-        <!-- col70 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                             -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),    -->
-        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-        <!-- col71 =                                                    -->
-        <!--   {'class': 'SqlSelectColumn',                             -->
-        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),    -->
-        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+        <!-- col70 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_85),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_dow'}      -->
+        <!-- col71 =                                                  -->
+        <!--   {'class': 'SqlSelectColumn',                           -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_86),  -->
+        <!--    'column_alias': 'booking__paid_at__extract_doy'}      -->
         <!-- col72 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_87),  -->
@@ -333,11 +333,11 @@
         <!-- col82 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_97),  -->
-        <!--    'column_alias': 'metric_time__extract_dayofweek'}     -->
+        <!--    'column_alias': 'metric_time__extract_dow'}           -->
         <!-- col83 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_98),  -->
-        <!--    'column_alias': 'metric_time__extract_dayofyear'}     -->
+        <!--    'column_alias': 'metric_time__extract_doy'}           -->
         <!-- col84 =                                                  -->
         <!--   {'class': 'SqlSelectColumn',                           -->
         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_99),  -->
@@ -530,11 +530,11 @@
             <!-- col25 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+            <!--    'column_alias': 'ds__extract_dow'}               -->
             <!-- col26 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+            <!--    'column_alias': 'ds__extract_doy'}               -->
             <!-- col27 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -575,14 +575,14 @@
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
             <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-            <!-- col37 =                                                  -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-            <!-- col38 =                                                  -->
-            <!--   {'class': 'SqlSelectColumn',                           -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+            <!-- col37 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+            <!-- col38 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+            <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
             <!-- col39 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -626,11 +626,11 @@
             <!-- col49 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+            <!--    'column_alias': 'paid_at__extract_dow'}          -->
             <!-- col50 =                                             -->
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+            <!--    'column_alias': 'paid_at__extract_doy'}          -->
             <!-- col51 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -675,14 +675,14 @@
             <!--   {'class': 'SqlSelectColumn',                      -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
             <!--    'column_alias': 'booking__ds__extract_day'}      -->
-            <!-- col62 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                        -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-            <!-- col63 =                                               -->
-            <!--   {'class': 'SqlSelectColumn',                        -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+            <!-- col62 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+            <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+            <!-- col63 =                                             -->
+            <!--   {'class': 'SqlSelectColumn',                      -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+            <!--    'column_alias': 'booking__ds__extract_doy'}      -->
             <!-- col64 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -723,14 +723,14 @@
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-            <!-- col74 =                                                           -->
-            <!--   {'class': 'SqlSelectColumn',                                    -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-            <!-- col75 =                                                           -->
-            <!--   {'class': 'SqlSelectColumn',                                    -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+            <!-- col74 =                                                     -->
+            <!--   {'class': 'SqlSelectColumn',                              -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+            <!-- col75 =                                                     -->
+            <!--   {'class': 'SqlSelectColumn',                              -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
             <!-- col76 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -771,14 +771,14 @@
             <!--   {'class': 'SqlSelectColumn',                       -->
             <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
             <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-            <!-- col86 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                             -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-            <!-- col87 =                                                    -->
-            <!--   {'class': 'SqlSelectColumn',                             -->
-            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+            <!-- col86 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                       -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+            <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+            <!-- col87 =                                              -->
+            <!--   {'class': 'SqlSelectColumn',                       -->
+            <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+            <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
             <!-- col88 =                                                     -->
             <!--   {'class': 'SqlSelectColumn',                              -->
             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
index be05efe8ce..66d7813741 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/test_simple_query_with_metric_time_dimension__plan0.xml
@@ -117,11 +117,11 @@
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                        <!--    'column_alias': 'ds__extract_dow'}                     -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                        <!--    'column_alias': 'ds__extract_doy'}                     -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
@@ -165,11 +165,11 @@
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
@@ -213,11 +213,11 @@
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}                -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}                -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
@@ -261,11 +261,11 @@
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
@@ -306,14 +306,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col58 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col59 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col58 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col59 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col60 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
@@ -354,14 +354,14 @@
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                        <!-- col70 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col71 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col70 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                        <!-- col71 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                         <!-- col72 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
@@ -405,11 +405,11 @@
                         <!-- col82 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}            -->
                         <!-- col83 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'metric_time__extract_doy'}            -->
                         <!-- col84 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
@@ -602,11 +602,11 @@
                             <!-- col25 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!--    'column_alias': 'ds__extract_dow'}               -->
                             <!-- col26 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!--    'column_alias': 'ds__extract_doy'}               -->
                             <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -647,14 +647,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                            <!-- col37 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col38 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col37 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                            <!-- col38 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                             <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -698,11 +698,11 @@
                             <!-- col49 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}          -->
                             <!-- col50 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}          -->
                             <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -747,14 +747,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                            <!-- col62 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                            <!-- col63 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col62 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                            <!-- col63 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                             <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -795,14 +795,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col74 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col75 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col74 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col75 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -843,14 +843,14 @@
                             <!--   {'class': 'SqlSelectColumn',                       -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                            <!-- col86 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col87 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col86 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                            <!-- col87 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                             <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
@@ -978,11 +978,11 @@
                         <!-- col10 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
-                        <!--    'column_alias': 'ds__extract_dayofweek'}               -->
+                        <!--    'column_alias': 'ds__extract_dow'}                     -->
                         <!-- col11 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
-                        <!--    'column_alias': 'ds__extract_dayofyear'}               -->
+                        <!--    'column_alias': 'ds__extract_doy'}                     -->
                         <!-- col12 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
@@ -1026,11 +1026,11 @@
                         <!-- col22 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
                         <!-- col23 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
-                        <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
                         <!-- col24 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
@@ -1074,11 +1074,11 @@
                         <!-- col34 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofweek'}          -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}                -->
                         <!-- col35 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
-                        <!--    'column_alias': 'paid_at__extract_dayofyear'}          -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}                -->
                         <!-- col36 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
@@ -1122,11 +1122,11 @@
                         <!-- col46 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}            -->
                         <!-- col47 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
-                        <!--    'column_alias': 'booking__ds__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}            -->
                         <!-- col48 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
@@ -1167,14 +1167,14 @@
                         <!--   {'class': 'SqlSelectColumn',                              -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),    -->
                         <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                        <!-- col58 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                        <!-- col59 =                                                           -->
-                        <!--   {'class': 'SqlSelectColumn',                                    -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),          -->
-                        <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                        <!-- col58 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col59 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                         <!-- col60 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
@@ -1215,14 +1215,14 @@
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),  -->
                         <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
-                        <!-- col70 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                        <!-- col71 =                                                    -->
-                        <!--   {'class': 'SqlSelectColumn',                             -->
-                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),   -->
-                        <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                        <!-- col70 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                        <!-- col71 =                                                   -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),  -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
                         <!-- col72 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
@@ -1266,11 +1266,11 @@
                         <!-- col82 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofweek'}      -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}            -->
                         <!-- col83 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
-                        <!--    'column_alias': 'metric_time__extract_dayofyear'}      -->
+                        <!--    'column_alias': 'metric_time__extract_doy'}            -->
                         <!-- col84 =                                                   -->
                         <!--   {'class': 'SqlSelectColumn',                            -->
                         <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
@@ -1415,11 +1415,11 @@
                             <!-- col25 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
-                            <!--    'column_alias': 'ds__extract_dayofweek'}         -->
+                            <!--    'column_alias': 'ds__extract_dow'}               -->
                             <!-- col26 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
-                            <!--    'column_alias': 'ds__extract_dayofyear'}         -->
+                            <!--    'column_alias': 'ds__extract_doy'}               -->
                             <!-- col27 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
@@ -1460,14 +1460,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
                             <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
-                            <!-- col37 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col38 =                                                  -->
-                            <!--   {'class': 'SqlSelectColumn',                           -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),       -->
-                            <!--    'column_alias': 'ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col37 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                            <!-- col38 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
                             <!-- col39 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
@@ -1511,11 +1511,11 @@
                             <!-- col49 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofweek'}    -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}          -->
                             <!-- col50 =                                             -->
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
-                            <!--    'column_alias': 'paid_at__extract_dayofyear'}    -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}          -->
                             <!-- col51 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
@@ -1560,14 +1560,14 @@
                             <!--   {'class': 'SqlSelectColumn',                      -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
                             <!--    'column_alias': 'booking__ds__extract_day'}      -->
-                            <!-- col62 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofweek'}  -->
-                            <!-- col63 =                                               -->
-                            <!--   {'class': 'SqlSelectColumn',                        -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),    -->
-                            <!--    'column_alias': 'booking__ds__extract_dayofyear'}  -->
+                            <!-- col62 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                            <!-- col63 =                                             -->
+                            <!--   {'class': 'SqlSelectColumn',                      -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}      -->
                             <!-- col64 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
@@ -1608,14 +1608,14 @@
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
                             <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
-                            <!-- col74 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofweek'}  -->
-                            <!-- col75 =                                                           -->
-                            <!--   {'class': 'SqlSelectColumn',                                    -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),                -->
-                            <!--    'column_alias': 'booking__ds_partitioned__extract_dayofyear'}  -->
+                            <!-- col74 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col75 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
                             <!-- col76 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
@@ -1656,14 +1656,14 @@
                             <!--   {'class': 'SqlSelectColumn',                       -->
                             <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
                             <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
-                            <!-- col86 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofweek'}  -->
-                            <!-- col87 =                                                    -->
-                            <!--   {'class': 'SqlSelectColumn',                             -->
-                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),         -->
-                            <!--    'column_alias': 'booking__paid_at__extract_dayofyear'}  -->
+                            <!-- col86 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                            <!-- col87 =                                              -->
+                            <!--   {'class': 'SqlSelectColumn',                       -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
                             <!-- col88 =                                                     -->
                             <!--   {'class': 'SqlSelectColumn',                              -->
                             <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
diff --git a/metricflow/time/date_part.py b/metricflow/time/date_part.py
index b6ccea9172..cccb1be6c8 100644
--- a/metricflow/time/date_part.py
+++ b/metricflow/time/date_part.py
@@ -17,8 +17,8 @@ class DatePart(Enum):
     MONTH = "month"
     WEEK = "week"
     DAY = "day"
-    DAYOFWEEK = "dayofweek"
-    DAYOFYEAR = "dayofyear"
+    DAYOFWEEK = "dow"
+    DAYOFYEAR = "doy"
 
     def to_int(self) -> int:
         """Convert to an int so that the size of the granularity can be easily compared."""

From 64164d92ba309c247efb7c980623dcd70fd8fbe9 Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Mon, 11 Sep 2023 20:51:25 -0700
Subject: [PATCH 08/15] Renaming

---
 metricflow/sql/render/big_query.py            |  12 +
 metricflow/sql/render/databricks.py           |   8 -
 metricflow/sql/render/expr_renderer.py        |   2 +-
 .../dataset/test_convert_semantic_model.py    |  24 +-
 metricflow/test/generate_snapshots.py         |  40 +-
 .../integration/test_cases/itest_metrics.yaml |   8 +-
 ...st_convert_query_semantic_model__plan0.sql |  28 +-
 ...le_semantic_model_with_measures__plan0.sql |  56 +-
 ...semantic_model_without_measures__plan0.sql |  28 +-
 ...st_convert_query_semantic_model__plan0.sql |  28 +-
 ...le_semantic_model_with_measures__plan0.sql |  56 +-
 ...semantic_model_without_measures__plan0.sql |  28 +-
 ...st_convert_query_semantic_model__plan0.sql |  28 +-
 ...le_semantic_model_with_measures__plan0.sql |  56 +-
 ...semantic_model_without_measures__plan0.sql |  28 +-
 ...st_convert_query_semantic_model__plan0.sql |  28 +-
 ...le_semantic_model_with_measures__plan0.sql |  56 +-
 ...semantic_model_without_measures__plan0.sql |  28 +-
 ...st_convert_query_semantic_model__plan0.sql |  28 +-
 ...le_semantic_model_with_measures__plan0.sql |  56 +-
 ...semantic_model_without_measures__plan0.sql |  28 +-
 ...st_convert_query_semantic_model__plan0.sql |  28 +-
 ...le_semantic_model_with_measures__plan0.sql |  56 +-
 ...semantic_model_without_measures__plan0.sql |  28 +-
 .../test_multihop_join_plan__dfp_0.xml        |  32 +-
 .../test_common_semantic_model__plan0.sql     | 224 ++++----
 .../test_compute_metrics_node__plan0.sql      | 140 ++---
 ...o_from_multiple_semantic_models__plan0.sql | 340 ++++++------
 ...atio_from_single_semantic_model__plan0.sql | 140 ++---
 ...ompute_metrics_node_simple_expr__plan0.sql | 140 ++---
 .../test_constrain_time_range_node__plan0.sql |  84 +--
 .../test_cumulative_metric__plan0.sql         |  40 +-
 ...cumulative_metric_grain_to_date__plan0.sql |  40 +-
 .../test_cumulative_metric_no_ds__plan0.sql   |  40 +-
 ...est_cumulative_metric_no_window__plan0.sql |  40 +-
 ..._no_window_with_time_constraint__plan0.sql |  52 +-
 ...ive_metric_with_time_constraint__plan0.sql |  52 +-
 .../BigQuery/test_derived_metric__plan0.sql   | 224 ++++----
 ...ved_metric_with_offset_to_grain__plan0.sql | 248 ++++-----
 ...offset_to_grain_and_granularity__plan0.sql | 248 ++++-----
 ...rived_metric_with_offset_window__plan0.sql | 248 ++++-----
 ...h_offset_window_and_granularity__plan0.sql | 248 ++++-----
 ...fset_window_and_offset_to_grain__plan0.sql | 272 +++++-----
 ...offset_to_grain_and_granularity__plan0.sql | 272 +++++-----
 ...erived_offset_cumulative_metric__plan0.sql | 164 +++---
 ...et_metric_with_one_input_metric__plan0.sql | 136 ++---
 .../BigQuery/test_distinct_values__plan0.sql  | 188 +++----
 .../BigQuery/test_filter_node__plan0.sql      |  84 +--
 ...lter_with_where_constraint_node__plan0.sql |  84 +--
 ...th_where_constraint_on_join_dim__plan0.sql | 188 +++----
 .../test_join_to_scd_dimension__plan0.sql     | 168 +++---
 ...spine_node_with_offset_to_grain__plan0.sql | 112 ++--
 ...e_spine_node_with_offset_window__plan0.sql | 112 ++--
 ..._time_spine_node_without_offset__plan0.sql | 112 ++--
 .../BigQuery/test_limit_rows__plan0.sql       | 112 ++--
 ...al_dimension_using_local_entity__plan0.sql |  76 +--
 .../test_measure_aggregation_node__plan0.sql  |  84 +--
 .../test_measure_constraint__plan0.sql        | 488 +++++++++---------
 ..._constraint_with_reused_measure__plan0.sql | 224 ++++----
 ...aint_with_single_expr_and_alias__plan0.sql | 112 ++--
 ..._multiple_sources_no_dimensions__plan0.sql | 188 +++----
 ...multi_hop_through_scd_dimension__plan0.sql | 224 ++++----
 ...test_multi_hop_to_scd_dimension__plan0.sql | 192 +++----
 .../BigQuery/test_multi_join_node__plan0.sql  | 196 +++----
 .../BigQuery/test_multihop_node__plan0.sql    | 152 +++---
 ..._multiple_metrics_no_dimensions__plan0.sql | 236 ++++-----
 .../test_nested_derived_metric__plan0.sql     | 448 ++++++++--------
 .../BigQuery/test_order_by_node__plan0.sql    |  84 +--
 .../BigQuery/test_partitioned_join__plan0.sql | 160 +++---
 .../test_semi_additive_join_node__plan0.sql   |  64 +--
 ...mi_additive_join_node__plan0_optimized.sql |  36 +-
 ...dditive_join_node_with_grouping__plan0.sql |  64 +--
 ...in_node_with_grouping__plan0_optimized.sql |  36 +-
 ...join_node_with_queried_group_by__plan0.sql |  64 +--
 ...with_queried_group_by__plan0_optimized.sql |  36 +-
 .../BigQuery/test_single_join_node__plan0.sql | 140 ++---
 .../BigQuery/test_source_node__plan0.sql      |  84 +--
 .../test_source_node__plan0_optimized.sql     |  84 +--
 .../test_common_semantic_model__plan0.sql     | 224 ++++----
 .../test_compute_metrics_node__plan0.sql      | 140 ++---
 ...o_from_multiple_semantic_models__plan0.sql | 340 ++++++------
 ...atio_from_single_semantic_model__plan0.sql | 140 ++---
 ...ompute_metrics_node_simple_expr__plan0.sql | 140 ++---
 .../test_constrain_time_range_node__plan0.sql |  84 +--
 .../test_cumulative_metric__plan0.sql         |  40 +-
 ...cumulative_metric_grain_to_date__plan0.sql |  40 +-
 .../test_cumulative_metric_no_ds__plan0.sql   |  40 +-
 ...est_cumulative_metric_no_window__plan0.sql |  40 +-
 ..._no_window_with_time_constraint__plan0.sql |  52 +-
 ...ive_metric_with_time_constraint__plan0.sql |  52 +-
 .../Databricks/test_derived_metric__plan0.sql | 224 ++++----
 ...ved_metric_with_offset_to_grain__plan0.sql | 248 ++++-----
 ...offset_to_grain_and_granularity__plan0.sql | 248 ++++-----
 ...rived_metric_with_offset_window__plan0.sql | 248 ++++-----
 ...h_offset_window_and_granularity__plan0.sql | 248 ++++-----
 ...fset_window_and_offset_to_grain__plan0.sql | 272 +++++-----
 ...offset_to_grain_and_granularity__plan0.sql | 272 +++++-----
 ...erived_offset_cumulative_metric__plan0.sql | 164 +++---
 ...et_metric_with_one_input_metric__plan0.sql | 136 ++---
 .../test_distinct_values__plan0.sql           | 188 +++----
 .../Databricks/test_filter_node__plan0.sql    |  84 +--
 ...lter_with_where_constraint_node__plan0.sql |  84 +--
 ...th_where_constraint_on_join_dim__plan0.sql | 188 +++----
 .../test_join_to_scd_dimension__plan0.sql     | 168 +++---
 ...spine_node_with_offset_to_grain__plan0.sql | 112 ++--
 ...e_spine_node_with_offset_window__plan0.sql | 112 ++--
 ..._time_spine_node_without_offset__plan0.sql | 112 ++--
 .../Databricks/test_limit_rows__plan0.sql     | 112 ++--
 ...al_dimension_using_local_entity__plan0.sql |  76 +--
 .../test_measure_aggregation_node__plan0.sql  |  84 +--
 .../test_measure_constraint__plan0.sql        | 488 +++++++++---------
 ..._constraint_with_reused_measure__plan0.sql | 224 ++++----
 ...aint_with_single_expr_and_alias__plan0.sql | 112 ++--
 ..._multiple_sources_no_dimensions__plan0.sql | 188 +++----
 ...multi_hop_through_scd_dimension__plan0.sql | 224 ++++----
 ...test_multi_hop_to_scd_dimension__plan0.sql | 192 +++----
 .../test_multi_join_node__plan0.sql           | 196 +++----
 .../Databricks/test_multihop_node__plan0.sql  | 152 +++---
 ..._multiple_metrics_no_dimensions__plan0.sql | 236 ++++-----
 .../test_nested_derived_metric__plan0.sql     | 448 ++++++++--------
 .../Databricks/test_order_by_node__plan0.sql  |  84 +--
 .../test_partitioned_join__plan0.sql          | 160 +++---
 .../test_semi_additive_join_node__plan0.sql   |  64 +--
 ...mi_additive_join_node__plan0_optimized.sql |  36 +-
 ...dditive_join_node_with_grouping__plan0.sql |  64 +--
 ...in_node_with_grouping__plan0_optimized.sql |  36 +-
 ...join_node_with_queried_group_by__plan0.sql |  64 +--
 ...with_queried_group_by__plan0_optimized.sql |  36 +-
 .../test_single_join_node__plan0.sql          | 140 ++---
 .../Databricks/test_source_node__plan0.sql    |  84 +--
 .../test_source_node__plan0_optimized.sql     |  84 +--
 .../test_common_semantic_model__plan0.sql     | 168 +++---
 .../test_compute_metrics_node__plan0.sql      | 140 ++---
 ...o_from_multiple_semantic_models__plan0.sql | 252 ++++-----
 ...atio_from_single_semantic_model__plan0.sql | 140 ++---
 ...ompute_metrics_node_simple_expr__plan0.sql | 140 ++---
 .../test_constrain_time_range_node__plan0.sql |  84 +--
 .../DuckDB/test_cumulative_metric__plan0.sql  |  28 +-
 ...cumulative_metric_grain_to_date__plan0.sql |  28 +-
 .../test_cumulative_metric_no_ds__plan0.sql   |  28 +-
 ...est_cumulative_metric_no_window__plan0.sql |  28 +-
 ..._no_window_with_time_constraint__plan0.sql |  28 +-
 ...ive_metric_with_time_constraint__plan0.sql |  28 +-
 .../DuckDB/test_derived_metric__plan0.sql     | 168 +++---
 ...ved_metric_with_offset_to_grain__plan0.sql | 168 +++---
 ...offset_to_grain_and_granularity__plan0.sql | 168 +++---
 ...rived_metric_with_offset_window__plan0.sql | 168 +++---
 ...h_offset_window_and_granularity__plan0.sql | 168 +++---
 ...fset_window_and_offset_to_grain__plan0.sql | 168 +++---
 ...offset_to_grain_and_granularity__plan0.sql | 168 +++---
 ...erived_offset_cumulative_metric__plan0.sql |  84 +--
 ...et_metric_with_one_input_metric__plan0.sql |  84 +--
 .../DuckDB/test_distinct_values__plan0.sql    | 140 ++---
 .../DuckDB/test_filter_node__plan0.sql        |  84 +--
 ...lter_with_where_constraint_node__plan0.sql |  84 +--
 ...th_where_constraint_on_join_dim__plan0.sql | 140 ++---
 .../test_join_to_scd_dimension__plan0.sql     | 140 ++---
 ...spine_node_with_offset_to_grain__plan0.sql |  84 +--
 ...e_spine_node_with_offset_window__plan0.sql |  84 +--
 ..._time_spine_node_without_offset__plan0.sql |  84 +--
 .../DuckDB/test_limit_rows__plan0.sql         |  84 +--
 ...al_dimension_using_local_entity__plan0.sql |  56 +-
 .../test_measure_aggregation_node__plan0.sql  |  84 +--
 .../DuckDB/test_measure_constraint__plan0.sql | 364 ++++++-------
 ..._constraint_with_reused_measure__plan0.sql | 168 +++---
 ...aint_with_single_expr_and_alias__plan0.sql |  84 +--
 ..._multiple_sources_no_dimensions__plan0.sql | 140 ++---
 ...multi_hop_through_scd_dimension__plan0.sql | 168 +++---
 ...test_multi_hop_to_scd_dimension__plan0.sql | 140 ++---
 .../DuckDB/test_multi_join_node__plan0.sql    | 196 +++----
 .../DuckDB/test_multihop_node__plan0.sql      | 112 ++--
 ..._multiple_metrics_no_dimensions__plan0.sql | 140 ++---
 .../test_nested_derived_metric__plan0.sql     | 336 ++++++------
 .../DuckDB/test_order_by_node__plan0.sql      |  84 +--
 .../DuckDB/test_partitioned_join__plan0.sql   | 140 ++---
 .../test_semi_additive_join_node__plan0.sql   |  56 +-
 ...mi_additive_join_node__plan0_optimized.sql |  28 +-
 ...dditive_join_node_with_grouping__plan0.sql |  56 +-
 ...in_node_with_grouping__plan0_optimized.sql |  28 +-
 ...join_node_with_queried_group_by__plan0.sql |  56 +-
 ...with_queried_group_by__plan0_optimized.sql |  28 +-
 .../DuckDB/test_single_join_node__plan0.sql   | 140 ++---
 .../DuckDB/test_source_node__plan0.sql        |  84 +--
 .../test_source_node__plan0_optimized.sql     |  84 +--
 .../test_common_semantic_model__plan0.sql     | 224 ++++----
 .../test_compute_metrics_node__plan0.sql      | 140 ++---
 ...o_from_multiple_semantic_models__plan0.sql | 340 ++++++------
 ...atio_from_single_semantic_model__plan0.sql | 140 ++---
 ...ompute_metrics_node_simple_expr__plan0.sql | 140 ++---
 .../test_constrain_time_range_node__plan0.sql |  84 +--
 .../test_cumulative_metric__plan0.sql         |  40 +-
 ...cumulative_metric_grain_to_date__plan0.sql |  40 +-
 .../test_cumulative_metric_no_ds__plan0.sql   |  40 +-
 ...est_cumulative_metric_no_window__plan0.sql |  40 +-
 ..._no_window_with_time_constraint__plan0.sql |  52 +-
 ...ive_metric_with_time_constraint__plan0.sql |  52 +-
 .../Postgres/test_derived_metric__plan0.sql   | 224 ++++----
 ...ved_metric_with_offset_to_grain__plan0.sql | 248 ++++-----
 ...offset_to_grain_and_granularity__plan0.sql | 248 ++++-----
 ...rived_metric_with_offset_window__plan0.sql | 248 ++++-----
 ...h_offset_window_and_granularity__plan0.sql | 248 ++++-----
 ...fset_window_and_offset_to_grain__plan0.sql | 272 +++++-----
 ...offset_to_grain_and_granularity__plan0.sql | 272 +++++-----
 ...erived_offset_cumulative_metric__plan0.sql | 164 +++---
 ...et_metric_with_one_input_metric__plan0.sql | 136 ++---
 .../Postgres/test_distinct_values__plan0.sql  | 188 +++----
 .../Postgres/test_filter_node__plan0.sql      |  84 +--
 ...lter_with_where_constraint_node__plan0.sql |  84 +--
 ...th_where_constraint_on_join_dim__plan0.sql | 188 +++----
 .../test_join_to_scd_dimension__plan0.sql     | 168 +++---
 ...spine_node_with_offset_to_grain__plan0.sql | 112 ++--
 ...e_spine_node_with_offset_window__plan0.sql | 112 ++--
 ..._time_spine_node_without_offset__plan0.sql | 112 ++--
 .../Postgres/test_limit_rows__plan0.sql       | 112 ++--
 ...al_dimension_using_local_entity__plan0.sql |  76 +--
 .../test_measure_aggregation_node__plan0.sql  |  84 +--
 .../test_measure_constraint__plan0.sql        | 488 +++++++++---------
 ..._constraint_with_reused_measure__plan0.sql | 224 ++++----
 ...aint_with_single_expr_and_alias__plan0.sql | 112 ++--
 ..._multiple_sources_no_dimensions__plan0.sql | 188 +++----
 ...multi_hop_through_scd_dimension__plan0.sql | 224 ++++----
 ...test_multi_hop_to_scd_dimension__plan0.sql | 192 +++----
 .../Postgres/test_multi_join_node__plan0.sql  | 196 +++----
 .../Postgres/test_multihop_node__plan0.sql    | 152 +++---
 ..._multiple_metrics_no_dimensions__plan0.sql | 236 ++++-----
 .../test_nested_derived_metric__plan0.sql     | 448 ++++++++--------
 .../Postgres/test_order_by_node__plan0.sql    |  84 +--
 .../Postgres/test_partitioned_join__plan0.sql | 160 +++---
 .../test_semi_additive_join_node__plan0.sql   |  64 +--
 ...mi_additive_join_node__plan0_optimized.sql |  36 +-
 ...dditive_join_node_with_grouping__plan0.sql |  64 +--
 ...in_node_with_grouping__plan0_optimized.sql |  36 +-
 ...join_node_with_queried_group_by__plan0.sql |  64 +--
 ...with_queried_group_by__plan0_optimized.sql |  36 +-
 .../Postgres/test_single_join_node__plan0.sql | 140 ++---
 .../Postgres/test_source_node__plan0.sql      |  84 +--
 .../test_source_node__plan0_optimized.sql     |  84 +--
 .../test_common_semantic_model__plan0.sql     | 224 ++++----
 .../test_compute_metrics_node__plan0.sql      | 140 ++---
 ...o_from_multiple_semantic_models__plan0.sql | 340 ++++++------
 ...atio_from_single_semantic_model__plan0.sql | 140 ++---
 ...ompute_metrics_node_simple_expr__plan0.sql | 140 ++---
 .../test_constrain_time_range_node__plan0.sql |  84 +--
 .../test_cumulative_metric__plan0.sql         |  40 +-
 ...cumulative_metric_grain_to_date__plan0.sql |  40 +-
 .../test_cumulative_metric_no_ds__plan0.sql   |  40 +-
 ...est_cumulative_metric_no_window__plan0.sql |  40 +-
 ..._no_window_with_time_constraint__plan0.sql |  52 +-
 ...ive_metric_with_time_constraint__plan0.sql |  52 +-
 .../Redshift/test_derived_metric__plan0.sql   | 224 ++++----
 ...ved_metric_with_offset_to_grain__plan0.sql | 248 ++++-----
 ...offset_to_grain_and_granularity__plan0.sql | 248 ++++-----
 ...rived_metric_with_offset_window__plan0.sql | 248 ++++-----
 ...h_offset_window_and_granularity__plan0.sql | 248 ++++-----
 ...fset_window_and_offset_to_grain__plan0.sql | 272 +++++-----
 ...offset_to_grain_and_granularity__plan0.sql | 272 +++++-----
 ...erived_offset_cumulative_metric__plan0.sql | 164 +++---
 ...et_metric_with_one_input_metric__plan0.sql | 136 ++---
 .../Redshift/test_distinct_values__plan0.sql  | 188 +++----
 .../Redshift/test_filter_node__plan0.sql      |  84 +--
 ...lter_with_where_constraint_node__plan0.sql |  84 +--
 ...th_where_constraint_on_join_dim__plan0.sql | 188 +++----
 .../test_join_to_scd_dimension__plan0.sql     | 168 +++---
 ...spine_node_with_offset_to_grain__plan0.sql | 112 ++--
 ...e_spine_node_with_offset_window__plan0.sql | 112 ++--
 ..._time_spine_node_without_offset__plan0.sql | 112 ++--
 .../Redshift/test_limit_rows__plan0.sql       | 112 ++--
 ...al_dimension_using_local_entity__plan0.sql |  76 +--
 .../test_measure_aggregation_node__plan0.sql  |  84 +--
 .../test_measure_constraint__plan0.sql        | 488 +++++++++---------
 ..._constraint_with_reused_measure__plan0.sql | 224 ++++----
 ...aint_with_single_expr_and_alias__plan0.sql | 112 ++--
 ..._multiple_sources_no_dimensions__plan0.sql | 188 +++----
 ...multi_hop_through_scd_dimension__plan0.sql | 224 ++++----
 ...test_multi_hop_to_scd_dimension__plan0.sql | 192 +++----
 .../Redshift/test_multi_join_node__plan0.sql  | 196 +++----
 .../Redshift/test_multihop_node__plan0.sql    | 152 +++---
 ..._multiple_metrics_no_dimensions__plan0.sql | 236 ++++-----
 .../test_nested_derived_metric__plan0.sql     | 448 ++++++++--------
 .../Redshift/test_order_by_node__plan0.sql    |  84 +--
 .../Redshift/test_partitioned_join__plan0.sql | 160 +++---
 .../test_semi_additive_join_node__plan0.sql   |  64 +--
 ...mi_additive_join_node__plan0_optimized.sql |  36 +-
 ...dditive_join_node_with_grouping__plan0.sql |  64 +--
 ...in_node_with_grouping__plan0_optimized.sql |  36 +-
 ...join_node_with_queried_group_by__plan0.sql |  64 +--
 ...with_queried_group_by__plan0_optimized.sql |  36 +-
 .../Redshift/test_single_join_node__plan0.sql | 140 ++---
 .../Redshift/test_source_node__plan0.sql      |  84 +--
 .../test_source_node__plan0_optimized.sql     |  84 +--
 .../test_common_semantic_model__plan0.sql     | 224 ++++----
 .../test_compute_metrics_node__plan0.sql      | 140 ++---
 ...o_from_multiple_semantic_models__plan0.sql | 340 ++++++------
 ...atio_from_single_semantic_model__plan0.sql | 140 ++---
 ...ompute_metrics_node_simple_expr__plan0.sql | 140 ++---
 .../test_constrain_time_range_node__plan0.sql |  84 +--
 .../test_cumulative_metric__plan0.sql         |  40 +-
 ...cumulative_metric_grain_to_date__plan0.sql |  40 +-
 .../test_cumulative_metric_no_ds__plan0.sql   |  40 +-
 ...est_cumulative_metric_no_window__plan0.sql |  40 +-
 ..._no_window_with_time_constraint__plan0.sql |  52 +-
 ...ive_metric_with_time_constraint__plan0.sql |  52 +-
 .../Snowflake/test_derived_metric__plan0.sql  | 224 ++++----
 ...ved_metric_with_offset_to_grain__plan0.sql | 248 ++++-----
 ...offset_to_grain_and_granularity__plan0.sql | 248 ++++-----
 ...rived_metric_with_offset_window__plan0.sql | 248 ++++-----
 ...h_offset_window_and_granularity__plan0.sql | 248 ++++-----
 ...fset_window_and_offset_to_grain__plan0.sql | 272 +++++-----
 ...offset_to_grain_and_granularity__plan0.sql | 272 +++++-----
 ...erived_offset_cumulative_metric__plan0.sql | 164 +++---
 ...et_metric_with_one_input_metric__plan0.sql | 136 ++---
 .../Snowflake/test_distinct_values__plan0.sql | 188 +++----
 .../Snowflake/test_filter_node__plan0.sql     |  84 +--
 ...lter_with_where_constraint_node__plan0.sql |  84 +--
 ...th_where_constraint_on_join_dim__plan0.sql | 188 +++----
 .../test_join_to_scd_dimension__plan0.sql     | 168 +++---
 ...spine_node_with_offset_to_grain__plan0.sql | 112 ++--
 ...e_spine_node_with_offset_window__plan0.sql | 112 ++--
 ..._time_spine_node_without_offset__plan0.sql | 112 ++--
 .../Snowflake/test_limit_rows__plan0.sql      | 112 ++--
 ...al_dimension_using_local_entity__plan0.sql |  76 +--
 .../test_measure_aggregation_node__plan0.sql  |  84 +--
 .../test_measure_constraint__plan0.sql        | 488 +++++++++---------
 ..._constraint_with_reused_measure__plan0.sql | 224 ++++----
 ...aint_with_single_expr_and_alias__plan0.sql | 112 ++--
 ..._multiple_sources_no_dimensions__plan0.sql | 188 +++----
 ...multi_hop_through_scd_dimension__plan0.sql | 224 ++++----
 ...test_multi_hop_to_scd_dimension__plan0.sql | 192 +++----
 .../Snowflake/test_multi_join_node__plan0.sql | 196 +++----
 .../Snowflake/test_multihop_node__plan0.sql   | 152 +++---
 ..._multiple_metrics_no_dimensions__plan0.sql | 236 ++++-----
 .../test_nested_derived_metric__plan0.sql     | 448 ++++++++--------
 .../Snowflake/test_order_by_node__plan0.sql   |  84 +--
 .../test_partitioned_join__plan0.sql          | 160 +++---
 .../test_semi_additive_join_node__plan0.sql   |  64 +--
 ...mi_additive_join_node__plan0_optimized.sql |  36 +-
 ...dditive_join_node_with_grouping__plan0.sql |  64 +--
 ...in_node_with_grouping__plan0_optimized.sql |  36 +-
 ...join_node_with_queried_group_by__plan0.sql |  64 +--
 ...with_queried_group_by__plan0_optimized.sql |  36 +-
 .../test_single_join_node__plan0.sql          | 140 ++---
 .../Snowflake/test_source_node__plan0.sql     |  84 +--
 .../test_source_node__plan0_optimized.sql     |  84 +--
 ...orm_node_using_non_primary_time__plan0.sql | 112 ++--
 ...sing_non_primary_time__plan0_optimized.sql |  98 ++--
 ...ansform_node_using_primary_time__plan0.sql | 112 ++--
 ...de_using_primary_time__plan0_optimized.sql |  98 ++--
 ...uery_with_metric_time_dimension__plan0.sql | 224 ++++----
 ...orm_node_using_non_primary_time__plan0.sql | 112 ++--
 ...sing_non_primary_time__plan0_optimized.sql |  98 ++--
 ...ansform_node_using_primary_time__plan0.sql | 112 ++--
 ...de_using_primary_time__plan0_optimized.sql |  98 ++--
 ...uery_with_metric_time_dimension__plan0.sql | 224 ++++----
 ...orm_node_using_non_primary_time__plan0.sql |  84 +--
 ...sing_non_primary_time__plan0_optimized.sql |  98 ++--
 ...ansform_node_using_primary_time__plan0.sql |  84 +--
 ...de_using_primary_time__plan0_optimized.sql |  98 ++--
 ...uery_with_metric_time_dimension__plan0.sql | 168 +++---
 ...orm_node_using_non_primary_time__plan0.sql | 112 ++--
 ...sing_non_primary_time__plan0_optimized.sql |  98 ++--
 ...ansform_node_using_primary_time__plan0.sql | 112 ++--
 ...de_using_primary_time__plan0_optimized.sql |  98 ++--
 ...uery_with_metric_time_dimension__plan0.sql | 224 ++++----
 ...orm_node_using_non_primary_time__plan0.sql | 112 ++--
 ...sing_non_primary_time__plan0_optimized.sql |  98 ++--
 ...ansform_node_using_primary_time__plan0.sql | 112 ++--
 ...de_using_primary_time__plan0_optimized.sql |  98 ++--
 ...uery_with_metric_time_dimension__plan0.sql | 224 ++++----
 ...orm_node_using_non_primary_time__plan0.sql | 112 ++--
 ...sing_non_primary_time__plan0_optimized.sql |  98 ++--
 ...ansform_node_using_primary_time__plan0.sql | 112 ++--
 ...de_using_primary_time__plan0_optimized.sql |  98 ++--
 ...uery_with_metric_time_dimension__plan0.sql | 224 ++++----
 metricflow/test/sql/test_sql_expr_render.py   |   4 +-
 metricflow/time/date_part.py                  |   8 +-
 375 files changed, 25409 insertions(+), 25405 deletions(-)

diff --git a/metricflow/sql/render/big_query.py b/metricflow/sql/render/big_query.py
index f5c15a2ab6..9b55c6a28d 100644
--- a/metricflow/sql/render/big_query.py
+++ b/metricflow/sql/render/big_query.py
@@ -24,6 +24,7 @@
     SqlTimeDeltaExpression,
 )
 from metricflow.sql.sql_plan import SqlSelectColumn
+from metricflow.time.date_part import DatePart
 
 
 class BigQuerySqlExpressionRenderer(DefaultSqlExpressionRenderer):
@@ -129,6 +130,17 @@ def visit_date_trunc_expr(self, node: SqlDateTruncExpression) -> SqlExpressionRe
             bind_parameters=arg_rendered.bind_parameters,
         )
 
+    @override
+    def render_date_part(self, date_part: DatePart) -> str:
+        if date_part == DatePart.DOY:
+            return "DAYOFYEAR"
+        if date_part == DatePart.DOW:
+            return "DAYOFWEEK"
+        if date_part == DatePart.WEEK:
+            return "ISOWEEK"
+
+        return super().render_date_part(date_part)
+
     @override
     def visit_time_delta_expr(self, node: SqlTimeDeltaExpression) -> SqlExpressionRenderResult:
         """Render time delta for BigQuery, which requires ISO prefixing for the WEEK granularity value."""
diff --git a/metricflow/sql/render/databricks.py b/metricflow/sql/render/databricks.py
index 307f15ba24..0740f66350 100644
--- a/metricflow/sql/render/databricks.py
+++ b/metricflow/sql/render/databricks.py
@@ -13,7 +13,6 @@
 )
 from metricflow.sql.render.sql_plan_renderer import DefaultSqlQueryPlanRenderer
 from metricflow.sql.sql_exprs import SqlPercentileExpression, SqlPercentileFunctionType
-from metricflow.time.date_part import DatePart
 
 
 class DatabricksSqlExpressionRenderer(DefaultSqlExpressionRenderer):
@@ -57,13 +56,6 @@ def visit_percentile_expr(self, node: SqlPercentileExpression) -> SqlExpressionR
             bind_parameters=params,
         )
 
-    @override
-    def render_date_part(self, date_part: DatePart) -> str:
-        if date_part == DatePart.DAYOFYEAR:
-            return "DOY"
-
-        return super().render_date_part(date_part)
-
 
 class DatabricksSqlQueryPlanRenderer(DefaultSqlQueryPlanRenderer):
     """Plan renderer for the Snowflake engine."""
diff --git a/metricflow/sql/render/expr_renderer.py b/metricflow/sql/render/expr_renderer.py
index 105c83e862..9a5e58a465 100644
--- a/metricflow/sql/render/expr_renderer.py
+++ b/metricflow/sql/render/expr_renderer.py
@@ -279,7 +279,7 @@ def visit_extract_expr(self, node: SqlExtractExpression) -> SqlExpressionRenderR
 
     def render_date_part(self, date_part: DatePart) -> str:
         """Render DATE PART for an EXTRACT expression."""
-        return date_part.name
+        return date_part.value
 
     def visit_time_delta_expr(self, node: SqlTimeDeltaExpression) -> SqlExpressionRenderResult:  # noqa: D
         arg_rendered = node.arg.accept(self)
diff --git a/metricflow/test/dataset/test_convert_semantic_model.py b/metricflow/test/dataset/test_convert_semantic_model.py
index d830438ea5..747510ff6e 100644
--- a/metricflow/test/dataset/test_convert_semantic_model.py
+++ b/metricflow/test/dataset/test_convert_semantic_model.py
@@ -66,10 +66,10 @@ def test_convert_table_semantic_model_without_measures(  # noqa: D
                 element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DAY
             ),
             TimeDimensionSpec(
-                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DAYOFWEEK
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DOW
             ),
             TimeDimensionSpec(
-                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DAYOFYEAR
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DOY
             ),
             TimeDimensionSpec(
                 element_name="ds",
@@ -130,13 +130,13 @@ def test_convert_table_semantic_model_without_measures(  # noqa: D
                 element_name="ds",
                 entity_links=(EntityReference(element_name="user"),),
                 time_granularity=TimeGranularity.DAY,
-                date_part=DatePart.DAYOFWEEK,
+                date_part=DatePart.DOW,
             ),
             TimeDimensionSpec(
                 element_name="ds",
                 entity_links=(EntityReference(element_name="user"),),
                 time_granularity=TimeGranularity.DAY,
-                date_part=DatePart.DAYOFYEAR,
+                date_part=DatePart.DOY,
             ),
         ),
     )
@@ -205,10 +205,10 @@ def test_convert_table_semantic_model_with_measures(  # noqa: D
                 element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DAY
             ),
             TimeDimensionSpec(
-                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DAYOFWEEK
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DOW
             ),
             TimeDimensionSpec(
-                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DAYOFYEAR
+                element_name="ds", entity_links=(), time_granularity=TimeGranularity.DAY, date_part=DatePart.DOY
             ),
             TimeDimensionSpec(element_name="ds_partitioned", entity_links=(), time_granularity=TimeGranularity.DAY),
             TimeDimensionSpec(element_name="ds_partitioned", entity_links=(), time_granularity=TimeGranularity.WEEK),
@@ -249,13 +249,13 @@ def test_convert_table_semantic_model_with_measures(  # noqa: D
                 element_name="ds_partitioned",
                 entity_links=(),
                 time_granularity=TimeGranularity.DAY,
-                date_part=DatePart.DAYOFWEEK,
+                date_part=DatePart.DOW,
             ),
             TimeDimensionSpec(
                 element_name="ds_partitioned",
                 entity_links=(),
                 time_granularity=TimeGranularity.DAY,
-                date_part=DatePart.DAYOFYEAR,
+                date_part=DatePart.DOY,
             ),
             TimeDimensionSpec(
                 element_name="ds",
@@ -316,13 +316,13 @@ def test_convert_table_semantic_model_with_measures(  # noqa: D
                 element_name="ds",
                 entity_links=(EntityReference(element_name="verification"),),
                 time_granularity=TimeGranularity.DAY,
-                date_part=DatePart.DAYOFWEEK,
+                date_part=DatePart.DOW,
             ),
             TimeDimensionSpec(
                 element_name="ds",
                 entity_links=(EntityReference(element_name="verification"),),
                 time_granularity=TimeGranularity.DAY,
-                date_part=DatePart.DAYOFYEAR,
+                date_part=DatePart.DOY,
             ),
             TimeDimensionSpec(
                 element_name="ds_partitioned",
@@ -383,13 +383,13 @@ def test_convert_table_semantic_model_with_measures(  # noqa: D
                 element_name="ds_partitioned",
                 entity_links=(EntityReference(element_name="verification"),),
                 time_granularity=TimeGranularity.DAY,
-                date_part=DatePart.DAYOFWEEK,
+                date_part=DatePart.DOW,
             ),
             TimeDimensionSpec(
                 element_name="ds_partitioned",
                 entity_links=(EntityReference(element_name="verification"),),
                 time_granularity=TimeGranularity.DAY,
-                date_part=DatePart.DAYOFYEAR,
+                date_part=DatePart.DOY,
             ),
         ),
     )
diff --git a/metricflow/test/generate_snapshots.py b/metricflow/test/generate_snapshots.py
index 64b87d91b5..9acafe9573 100644
--- a/metricflow/test/generate_snapshots.py
+++ b/metricflow/test/generate_snapshots.py
@@ -70,30 +70,30 @@ class MetricFlowTestCredentialSetForAllEngines(FrozenBaseModel):  # noqa: D
     @property
     def as_configurations(self) -> Sequence[MetricFlowTestConfiguration]:  # noqa: D
         return (
-            MetricFlowTestConfiguration(
-                engine=SqlEngine.DUCKDB,
-                credential_set=self.duck_db,
-            ),
-            MetricFlowTestConfiguration(
-                engine=SqlEngine.REDSHIFT,
-                credential_set=self.redshift,
-            ),
-            MetricFlowTestConfiguration(
-                engine=SqlEngine.SNOWFLAKE,
-                credential_set=self.snowflake,
-            ),
+            # MetricFlowTestConfiguration(
+            #     engine=SqlEngine.DUCKDB,
+            #     credential_set=self.duck_db,
+            # ),
+            # MetricFlowTestConfiguration(
+            #     engine=SqlEngine.REDSHIFT,
+            #     credential_set=self.redshift,
+            # ),
+            # MetricFlowTestConfiguration(
+            #     engine=SqlEngine.SNOWFLAKE,
+            #     credential_set=self.snowflake,
+            # ),
             MetricFlowTestConfiguration(
                 engine=SqlEngine.BIGQUERY,
                 credential_set=self.big_query,
             ),
-            MetricFlowTestConfiguration(
-                engine=SqlEngine.DATABRICKS,
-                credential_set=self.databricks,
-            ),
-            MetricFlowTestConfiguration(
-                engine=SqlEngine.POSTGRES,
-                credential_set=self.postgres,
-            ),
+            # MetricFlowTestConfiguration(
+            #     engine=SqlEngine.DATABRICKS,
+            #     credential_set=self.databricks,
+            # ),
+            # MetricFlowTestConfiguration(
+            #     engine=SqlEngine.POSTGRES,
+            #     credential_set=self.postgres,
+            # ),
         )
 
 
diff --git a/metricflow/test/integration/test_cases/itest_metrics.yaml b/metricflow/test/integration/test_cases/itest_metrics.yaml
index aa184a67e1..bd53ff686f 100644
--- a/metricflow/test/integration/test_cases/itest_metrics.yaml
+++ b/metricflow/test/integration/test_cases/itest_metrics.yaml
@@ -1067,15 +1067,15 @@ integration_test:
     SELECT
       SUM(1) AS bookings
       , {{ render_extract("ds", DatePart.QUARTER) }} AS metric_time__extract_quarter
-      , {{ render_extract("ds", DatePart.DAYOFWEEK) }} AS metric_time__extract_dow
-      , {{ render_extract("ds", DatePart.DAYOFYEAR) }} AS metric_time__extract_doy
+      , {{ render_extract("ds", DatePart.DOW) }} AS metric_time__extract_dow
+      , {{ render_extract("ds", DatePart.DOY) }} AS metric_time__extract_doy
       , {{ render_extract("ds", DatePart.DAY) }} AS metric_time__extract_day
       , {{ render_extract("ds", DatePart.WEEK) }} AS metric_time__extract_week
     FROM {{ source_schema }}.fct_bookings
     GROUP BY
       {{ render_extract("ds", DatePart.QUARTER) }}
-      , {{ render_extract("ds", DatePart.DAYOFWEEK) }}
-      , {{ render_extract("ds", DatePart.DAYOFYEAR) }}
+      , {{ render_extract("ds", DatePart.DOW) }}
+      , {{ render_extract("ds", DatePart.DOY) }}
       , {{ render_extract("ds", DatePart.DAY) }}
       , {{ render_extract("ds", DatePart.WEEK) }};
 ---
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
index 6a18fb55ab..f00e2be64e 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
@@ -6,25 +6,25 @@ SELECT
   , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
   , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
   , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
-  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+  , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+  , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+  , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+  , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+  , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
   , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
   , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
   , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
-  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+  , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+  , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+  , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+  , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+  , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
index be4db1864b..b6a752aa1c 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -6,50 +6,50 @@ SELECT
   , DATE_TRUNC(id_verifications_src_10003.ds, month) AS ds__month
   , DATE_TRUNC(id_verifications_src_10003.ds, quarter) AS ds__quarter
   , DATE_TRUNC(id_verifications_src_10003.ds, year) AS ds__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
+  , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, month) AS ds_partitioned__month
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, quarter) AS ds_partitioned__quarter
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, year) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC(id_verifications_src_10003.ds, isoweek) AS verification__ds__week
   , DATE_TRUNC(id_verifications_src_10003.ds, month) AS verification__ds__month
   , DATE_TRUNC(id_verifications_src_10003.ds, quarter) AS verification__ds__quarter
   , DATE_TRUNC(id_verifications_src_10003.ds, year) AS verification__ds__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+  , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, isoweek) AS verification__ds_partitioned__week
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, month) AS verification__ds_partitioned__month
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, quarter) AS verification__ds_partitioned__quarter
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, year) AS verification__ds_partitioned__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+  , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
index b4f8805489..c698caae42 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -5,26 +5,26 @@ SELECT
   , DATE_TRUNC(users_latest_src_10008.ds, month) AS ds__month
   , DATE_TRUNC(users_latest_src_10008.ds, quarter) AS ds__quarter
   , DATE_TRUNC(users_latest_src_10008.ds, year) AS ds__year
-  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM users_latest_src_10008.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM users_latest_src_10008.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM users_latest_src_10008.ds) AS ds__extract_month
+  , EXTRACT(ISOWEEK FROM users_latest_src_10008.ds) AS ds__extract_week
+  , EXTRACT(day FROM users_latest_src_10008.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_doy
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC(users_latest_src_10008.ds, isoweek) AS user__ds__week
   , DATE_TRUNC(users_latest_src_10008.ds, month) AS user__ds__month
   , DATE_TRUNC(users_latest_src_10008.ds, quarter) AS user__ds__quarter
   , DATE_TRUNC(users_latest_src_10008.ds, year) AS user__ds__year
-  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS user__ds__extract_year
-  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
-  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS user__ds__extract_month
-  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
-  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS user__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_dayofyear
+  , EXTRACT(year FROM users_latest_src_10008.ds) AS user__ds__extract_year
+  , EXTRACT(quarter FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
+  , EXTRACT(month FROM users_latest_src_10008.ds) AS user__ds__extract_month
+  , EXTRACT(ISOWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
+  , EXTRACT(day FROM users_latest_src_10008.ds) AS user__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_doy
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql
index 28bd5c725b..dab2be52a2 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_query_semantic_model__plan0.sql
@@ -6,25 +6,25 @@ SELECT
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-  , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+  , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+  , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+  , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+  , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+  , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+  , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+  , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-  , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+  , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+  , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+  , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+  , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+  , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+  , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+  , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql
index dbb952f05b..93f9b1f47a 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -6,50 +6,50 @@ SELECT
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
-  , EXTRACT(DOY FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds) AS ds__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds) AS ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DOY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
-  , EXTRACT(DOY FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
-  , EXTRACT(DOY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
index 60db7389f0..e96f783576 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Databricks/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -5,26 +5,26 @@ SELECT
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
-  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dayofweek
-  , EXTRACT(DOY FROM users_latest_src_10008.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM users_latest_src_10008.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM users_latest_src_10008.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM users_latest_src_10008.ds) AS ds__extract_month
+  , EXTRACT(week FROM users_latest_src_10008.ds) AS ds__extract_week
+  , EXTRACT(day FROM users_latest_src_10008.ds) AS ds__extract_day
+  , EXTRACT(dow FROM users_latest_src_10008.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM users_latest_src_10008.ds) AS ds__extract_doy
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
-  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS user__ds__extract_year
-  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
-  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS user__ds__extract_month
-  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
-  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS user__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dayofweek
-  , EXTRACT(DOY FROM users_latest_src_10008.ds) AS user__ds__extract_dayofyear
+  , EXTRACT(year FROM users_latest_src_10008.ds) AS user__ds__extract_year
+  , EXTRACT(quarter FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
+  , EXTRACT(month FROM users_latest_src_10008.ds) AS user__ds__extract_month
+  , EXTRACT(week FROM users_latest_src_10008.ds) AS user__ds__extract_week
+  , EXTRACT(day FROM users_latest_src_10008.ds) AS user__ds__extract_day
+  , EXTRACT(dow FROM users_latest_src_10008.ds) AS user__ds__extract_dow
+  , EXTRACT(doy FROM users_latest_src_10008.ds) AS user__ds__extract_doy
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
index db7d8060c4..dab2be52a2 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_query_semantic_model__plan0.sql
@@ -6,25 +6,25 @@ SELECT
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+  , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+  , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+  , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+  , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+  , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+  , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+  , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+  , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+  , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+  , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+  , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+  , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+  , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+  , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
index dd7ccdf1b3..93f9b1f47a 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -6,50 +6,50 @@ SELECT
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_doy
+  , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds) AS ds__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds) AS ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
+  , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
+  , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
+  , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
index c62de83dc6..e96f783576 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/DuckDB/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -5,26 +5,26 @@ SELECT
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
-  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_doy
+  , EXTRACT(year FROM users_latest_src_10008.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM users_latest_src_10008.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM users_latest_src_10008.ds) AS ds__extract_month
+  , EXTRACT(week FROM users_latest_src_10008.ds) AS ds__extract_week
+  , EXTRACT(day FROM users_latest_src_10008.ds) AS ds__extract_day
+  , EXTRACT(dow FROM users_latest_src_10008.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM users_latest_src_10008.ds) AS ds__extract_doy
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
-  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS user__ds__extract_year
-  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
-  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS user__ds__extract_month
-  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
-  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS user__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_doy
+  , EXTRACT(year FROM users_latest_src_10008.ds) AS user__ds__extract_year
+  , EXTRACT(quarter FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
+  , EXTRACT(month FROM users_latest_src_10008.ds) AS user__ds__extract_month
+  , EXTRACT(week FROM users_latest_src_10008.ds) AS user__ds__extract_week
+  , EXTRACT(day FROM users_latest_src_10008.ds) AS user__ds__extract_day
+  , EXTRACT(dow FROM users_latest_src_10008.ds) AS user__ds__extract_dow
+  , EXTRACT(doy FROM users_latest_src_10008.ds) AS user__ds__extract_doy
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql
index 390e922160..dab2be52a2 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_query_semantic_model__plan0.sql
@@ -6,25 +6,25 @@ SELECT
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+  , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+  , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+  , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+  , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+  , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+  , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+  , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+  , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+  , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+  , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+  , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+  , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+  , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+  , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql
index 4a4b1f53f4..93f9b1f47a 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -6,50 +6,50 @@ SELECT
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds) AS ds__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds) AS ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
index e3f2a1d31a..e96f783576 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Postgres/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -5,26 +5,26 @@ SELECT
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
-  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM users_latest_src_10008.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM users_latest_src_10008.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM users_latest_src_10008.ds) AS ds__extract_month
+  , EXTRACT(week FROM users_latest_src_10008.ds) AS ds__extract_week
+  , EXTRACT(day FROM users_latest_src_10008.ds) AS ds__extract_day
+  , EXTRACT(dow FROM users_latest_src_10008.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM users_latest_src_10008.ds) AS ds__extract_doy
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
-  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS user__ds__extract_year
-  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
-  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS user__ds__extract_month
-  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
-  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS user__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_dayofyear
+  , EXTRACT(year FROM users_latest_src_10008.ds) AS user__ds__extract_year
+  , EXTRACT(quarter FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
+  , EXTRACT(month FROM users_latest_src_10008.ds) AS user__ds__extract_month
+  , EXTRACT(week FROM users_latest_src_10008.ds) AS user__ds__extract_week
+  , EXTRACT(day FROM users_latest_src_10008.ds) AS user__ds__extract_day
+  , EXTRACT(dow FROM users_latest_src_10008.ds) AS user__ds__extract_dow
+  , EXTRACT(doy FROM users_latest_src_10008.ds) AS user__ds__extract_doy
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql
index 390e922160..dab2be52a2 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_query_semantic_model__plan0.sql
@@ -6,25 +6,25 @@ SELECT
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+  , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+  , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+  , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+  , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+  , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+  , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+  , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+  , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+  , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+  , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+  , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+  , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+  , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+  , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql
index 4a4b1f53f4..93f9b1f47a 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -6,50 +6,50 @@ SELECT
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds) AS ds__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds) AS ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
index e3f2a1d31a..e96f783576 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Redshift/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -5,26 +5,26 @@ SELECT
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
-  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM users_latest_src_10008.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM users_latest_src_10008.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM users_latest_src_10008.ds) AS ds__extract_month
+  , EXTRACT(week FROM users_latest_src_10008.ds) AS ds__extract_week
+  , EXTRACT(day FROM users_latest_src_10008.ds) AS ds__extract_day
+  , EXTRACT(dow FROM users_latest_src_10008.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM users_latest_src_10008.ds) AS ds__extract_doy
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
-  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS user__ds__extract_year
-  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
-  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS user__ds__extract_month
-  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
-  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS user__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_dayofyear
+  , EXTRACT(year FROM users_latest_src_10008.ds) AS user__ds__extract_year
+  , EXTRACT(quarter FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
+  , EXTRACT(month FROM users_latest_src_10008.ds) AS user__ds__extract_month
+  , EXTRACT(week FROM users_latest_src_10008.ds) AS user__ds__extract_week
+  , EXTRACT(day FROM users_latest_src_10008.ds) AS user__ds__extract_day
+  , EXTRACT(dow FROM users_latest_src_10008.ds) AS user__ds__extract_dow
+  , EXTRACT(doy FROM users_latest_src_10008.ds) AS user__ds__extract_doy
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql
index 390e922160..dab2be52a2 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_query_semantic_model__plan0.sql
@@ -6,25 +6,25 @@ SELECT
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+  , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+  , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+  , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+  , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+  , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+  , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+  , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
   , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
   , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
   , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-  , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-  , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-  , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-  , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-  , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+  , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+  , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+  , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+  , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+  , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+  , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+  , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql
index 4a4b1f53f4..93f9b1f47a 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -6,50 +6,50 @@ SELECT
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds) AS ds__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds) AS ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
   , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
   , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
   , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
-  , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+  , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+  , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+  , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
index e3f2a1d31a..e96f783576 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/Snowflake/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -5,26 +5,26 @@ SELECT
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS ds__year
-  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM users_latest_src_10008.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM users_latest_src_10008.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM users_latest_src_10008.ds) AS ds__extract_month
+  , EXTRACT(week FROM users_latest_src_10008.ds) AS ds__extract_week
+  , EXTRACT(day FROM users_latest_src_10008.ds) AS ds__extract_day
+  , EXTRACT(dow FROM users_latest_src_10008.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM users_latest_src_10008.ds) AS ds__extract_doy
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC('week', users_latest_src_10008.ds) AS user__ds__week
   , DATE_TRUNC('month', users_latest_src_10008.ds) AS user__ds__month
   , DATE_TRUNC('quarter', users_latest_src_10008.ds) AS user__ds__quarter
   , DATE_TRUNC('year', users_latest_src_10008.ds) AS user__ds__year
-  , EXTRACT(YEAR FROM users_latest_src_10008.ds) AS user__ds__extract_year
-  , EXTRACT(QUARTER FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
-  , EXTRACT(MONTH FROM users_latest_src_10008.ds) AS user__ds__extract_month
-  , EXTRACT(WEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
-  , EXTRACT(DAY FROM users_latest_src_10008.ds) AS user__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_dayofyear
+  , EXTRACT(year FROM users_latest_src_10008.ds) AS user__ds__extract_year
+  , EXTRACT(quarter FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
+  , EXTRACT(month FROM users_latest_src_10008.ds) AS user__ds__extract_month
+  , EXTRACT(week FROM users_latest_src_10008.ds) AS user__ds__extract_week
+  , EXTRACT(day FROM users_latest_src_10008.ds) AS user__ds__extract_day
+  , EXTRACT(dow FROM users_latest_src_10008.ds) AS user__ds__extract_dow
+  , EXTRACT(doy FROM users_latest_src_10008.ds) AS user__ds__extract_doy
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
index 289229a67a..4b1abcc4e0 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
@@ -253,20 +253,20 @@
                                     <!--    'time_granularity': TimeGranularity.DAY,  -->
                                     <!--    'date_part': <DatePart.DAY: 'day'>,       -->
                                     <!--    'aggregation_state': None}                -->
-                                    <!-- include_spec =                                -->
-                                    <!--   {'class': 'TimeDimensionSpec',              -->
-                                    <!--    'element_name': 'ds_partitioned',          -->
-                                    <!--    'entity_links': (),                        -->
-                                    <!--    'time_granularity': TimeGranularity.DAY,   -->
-                                    <!--    'date_part': <DatePart.DAYOFWEEK: 'dow'>,  -->
-                                    <!--    'aggregation_state': None}                 -->
-                                    <!-- include_spec =                                -->
-                                    <!--   {'class': 'TimeDimensionSpec',              -->
-                                    <!--    'element_name': 'ds_partitioned',          -->
-                                    <!--    'entity_links': (),                        -->
-                                    <!--    'time_granularity': TimeGranularity.DAY,   -->
-                                    <!--    'date_part': <DatePart.DAYOFYEAR: 'doy'>,  -->
-                                    <!--    'aggregation_state': None}                 -->
+                                    <!-- include_spec =                               -->
+                                    <!--   {'class': 'TimeDimensionSpec',             -->
+                                    <!--    'element_name': 'ds_partitioned',         -->
+                                    <!--    'entity_links': (),                       -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': <DatePart.DOW: 'dow'>,       -->
+                                    <!--    'aggregation_state': None}                -->
+                                    <!-- include_spec =                               -->
+                                    <!--   {'class': 'TimeDimensionSpec',             -->
+                                    <!--    'element_name': 'ds_partitioned',         -->
+                                    <!--    'entity_links': (),                       -->
+                                    <!--    'time_granularity': TimeGranularity.DAY,  -->
+                                    <!--    'date_part': <DatePart.DOY: 'doy'>,       -->
+                                    <!--    'aggregation_state': None}                -->
                                     <!-- include_spec =                                                                      -->
                                     <!--   {'class': 'TimeDimensionSpec',                                                    -->
                                     <!--    'element_name': 'ds_partitioned',                                                -->
@@ -342,14 +342,14 @@
                                     <!--    'element_name': 'ds_partitioned',                                                -->
                                     <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
                                     <!--    'time_granularity': TimeGranularity.DAY,                                         -->
-                                    <!--    'date_part': <DatePart.DAYOFWEEK: 'dow'>,                                        -->
+                                    <!--    'date_part': <DatePart.DOW: 'dow'>,                                              -->
                                     <!--    'aggregation_state': None}                                                       -->
                                     <!-- include_spec =                                                                      -->
                                     <!--   {'class': 'TimeDimensionSpec',                                                    -->
                                     <!--    'element_name': 'ds_partitioned',                                                -->
                                     <!--    'entity_links': ({'class': 'EntityReference', 'element_name': 'customer_id'},),  -->
                                     <!--    'time_granularity': TimeGranularity.DAY,                                         -->
-                                    <!--    'date_part': <DatePart.DAYOFYEAR: 'doy'>,                                        -->
+                                    <!--    'date_part': <DatePart.DOY: 'doy'>,                                              -->
                                     <!--    'aggregation_state': None}                                                       -->
                                     <!-- include_spec = EntitySpec(element_name='customer_id', entity_links=()) -->
                                     <ReadSqlSourceNode>
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
index 98ccda3807..8d272a50fc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -150,74 +150,74 @@ FROM (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -261,8 +261,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month
           , subq_5.ds__extract_week
           , subq_5.ds__extract_day
-          , subq_5.ds__extract_dayofweek
-          , subq_5.ds__extract_dayofyear
+          , subq_5.ds__extract_dow
+          , subq_5.ds__extract_doy
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
@@ -273,8 +273,8 @@ FULL OUTER JOIN (
           , subq_5.ds_partitioned__extract_month
           , subq_5.ds_partitioned__extract_week
           , subq_5.ds_partitioned__extract_day
-          , subq_5.ds_partitioned__extract_dayofweek
-          , subq_5.ds_partitioned__extract_dayofyear
+          , subq_5.ds_partitioned__extract_dow
+          , subq_5.ds_partitioned__extract_doy
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
@@ -285,8 +285,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month
           , subq_5.paid_at__extract_week
           , subq_5.paid_at__extract_day
-          , subq_5.paid_at__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear
+          , subq_5.paid_at__extract_dow
+          , subq_5.paid_at__extract_doy
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
@@ -297,8 +297,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds__extract_month
           , subq_5.booking__ds__extract_week
           , subq_5.booking__ds__extract_day
-          , subq_5.booking__ds__extract_dayofweek
-          , subq_5.booking__ds__extract_dayofyear
+          , subq_5.booking__ds__extract_dow
+          , subq_5.booking__ds__extract_doy
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
@@ -309,8 +309,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds_partitioned__extract_month
           , subq_5.booking__ds_partitioned__extract_week
           , subq_5.booking__ds_partitioned__extract_day
-          , subq_5.booking__ds_partitioned__extract_dayofweek
-          , subq_5.booking__ds_partitioned__extract_dayofyear
+          , subq_5.booking__ds_partitioned__extract_dow
+          , subq_5.booking__ds_partitioned__extract_doy
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
@@ -321,8 +321,8 @@ FULL OUTER JOIN (
           , subq_5.booking__paid_at__extract_month
           , subq_5.booking__paid_at__extract_week
           , subq_5.booking__paid_at__extract_day
-          , subq_5.booking__paid_at__extract_dayofweek
-          , subq_5.booking__paid_at__extract_dayofyear
+          , subq_5.booking__paid_at__extract_dow
+          , subq_5.booking__paid_at__extract_doy
           , subq_5.ds__day AS metric_time__day
           , subq_5.ds__week AS metric_time__week
           , subq_5.ds__month AS metric_time__month
@@ -333,8 +333,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month AS metric_time__extract_month
           , subq_5.ds__extract_week AS metric_time__extract_week
           , subq_5.ds__extract_day AS metric_time__extract_day
-          , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_5.ds__extract_dow AS metric_time__extract_dow
+          , subq_5.ds__extract_doy AS metric_time__extract_doy
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
@@ -379,74 +379,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql
index c647a56b30..fdcc14c145 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql
@@ -44,74 +44,74 @@ FROM (
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -138,25 +138,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -165,25 +165,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 561210bfe0..a0d4381867 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -56,8 +56,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -68,8 +68,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -80,8 +80,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -92,8 +92,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -104,8 +104,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -116,8 +116,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -128,8 +128,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -174,74 +174,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -271,8 +271,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -283,8 +283,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -295,8 +295,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -307,8 +307,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -319,8 +319,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -344,25 +344,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -371,25 +371,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -455,8 +455,8 @@ FROM (
                 , subq_10.ds__extract_month
                 , subq_10.ds__extract_week
                 , subq_10.ds__extract_day
-                , subq_10.ds__extract_dayofweek
-                , subq_10.ds__extract_dayofyear
+                , subq_10.ds__extract_dow
+                , subq_10.ds__extract_doy
                 , subq_10.ds_partitioned__day
                 , subq_10.ds_partitioned__week
                 , subq_10.ds_partitioned__month
@@ -467,8 +467,8 @@ FROM (
                 , subq_10.ds_partitioned__extract_month
                 , subq_10.ds_partitioned__extract_week
                 , subq_10.ds_partitioned__extract_day
-                , subq_10.ds_partitioned__extract_dayofweek
-                , subq_10.ds_partitioned__extract_dayofyear
+                , subq_10.ds_partitioned__extract_dow
+                , subq_10.ds_partitioned__extract_doy
                 , subq_10.view__ds__day
                 , subq_10.view__ds__week
                 , subq_10.view__ds__month
@@ -479,8 +479,8 @@ FROM (
                 , subq_10.view__ds__extract_month
                 , subq_10.view__ds__extract_week
                 , subq_10.view__ds__extract_day
-                , subq_10.view__ds__extract_dayofweek
-                , subq_10.view__ds__extract_dayofyear
+                , subq_10.view__ds__extract_dow
+                , subq_10.view__ds__extract_doy
                 , subq_10.view__ds_partitioned__day
                 , subq_10.view__ds_partitioned__week
                 , subq_10.view__ds_partitioned__month
@@ -491,8 +491,8 @@ FROM (
                 , subq_10.view__ds_partitioned__extract_month
                 , subq_10.view__ds_partitioned__extract_week
                 , subq_10.view__ds_partitioned__extract_day
-                , subq_10.view__ds_partitioned__extract_dayofweek
-                , subq_10.view__ds_partitioned__extract_dayofyear
+                , subq_10.view__ds_partitioned__extract_dow
+                , subq_10.view__ds_partitioned__extract_doy
                 , subq_10.ds__day AS metric_time__day
                 , subq_10.ds__week AS metric_time__week
                 , subq_10.ds__month AS metric_time__month
@@ -503,8 +503,8 @@ FROM (
                 , subq_10.ds__extract_month AS metric_time__extract_month
                 , subq_10.ds__extract_week AS metric_time__extract_week
                 , subq_10.ds__extract_day AS metric_time__extract_day
-                , subq_10.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_10.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_10.ds__extract_dow AS metric_time__extract_dow
+                , subq_10.ds__extract_doy AS metric_time__extract_doy
                 , subq_10.listing
                 , subq_10.user
                 , subq_10.view__listing
@@ -519,49 +519,49 @@ FROM (
                   , DATE_TRUNC(views_source_src_10009.ds, month) AS ds__month
                   , DATE_TRUNC(views_source_src_10009.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(views_source_src_10009.ds, year) AS ds__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds) AS ds__extract_month
+                  , EXTRACT(ISOWEEK FROM views_source_src_10009.ds) AS ds__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, year) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_doy
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC(views_source_src_10009.ds, isoweek) AS view__ds__week
                   , DATE_TRUNC(views_source_src_10009.ds, month) AS view__ds__month
                   , DATE_TRUNC(views_source_src_10009.ds, quarter) AS view__ds__quarter
                   , DATE_TRUNC(views_source_src_10009.ds, year) AS view__ds__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS view__ds__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS view__ds__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS view__ds__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS view__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds) AS view__ds__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds) AS view__ds__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds) AS view__ds__extract_month
+                  , EXTRACT(ISOWEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds) AS view__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, isoweek) AS view__ds_partitioned__week
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, month) AS view__ds_partitioned__month
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, quarter) AS view__ds_partitioned__quarter
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, year) AS view__ds_partitioned__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_doy
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -589,8 +589,8 @@ FROM (
                 , subq_13.ds__extract_month
                 , subq_13.ds__extract_week
                 , subq_13.ds__extract_day
-                , subq_13.ds__extract_dayofweek
-                , subq_13.ds__extract_dayofyear
+                , subq_13.ds__extract_dow
+                , subq_13.ds__extract_doy
                 , subq_13.created_at__day
                 , subq_13.created_at__week
                 , subq_13.created_at__month
@@ -601,8 +601,8 @@ FROM (
                 , subq_13.created_at__extract_month
                 , subq_13.created_at__extract_week
                 , subq_13.created_at__extract_day
-                , subq_13.created_at__extract_dayofweek
-                , subq_13.created_at__extract_dayofyear
+                , subq_13.created_at__extract_dow
+                , subq_13.created_at__extract_doy
                 , subq_13.listing__ds__day
                 , subq_13.listing__ds__week
                 , subq_13.listing__ds__month
@@ -613,8 +613,8 @@ FROM (
                 , subq_13.listing__ds__extract_month
                 , subq_13.listing__ds__extract_week
                 , subq_13.listing__ds__extract_day
-                , subq_13.listing__ds__extract_dayofweek
-                , subq_13.listing__ds__extract_dayofyear
+                , subq_13.listing__ds__extract_dow
+                , subq_13.listing__ds__extract_doy
                 , subq_13.listing__created_at__day
                 , subq_13.listing__created_at__week
                 , subq_13.listing__created_at__month
@@ -625,8 +625,8 @@ FROM (
                 , subq_13.listing__created_at__extract_month
                 , subq_13.listing__created_at__extract_week
                 , subq_13.listing__created_at__extract_day
-                , subq_13.listing__created_at__extract_dayofweek
-                , subq_13.listing__created_at__extract_dayofyear
+                , subq_13.listing__created_at__extract_dow
+                , subq_13.listing__created_at__extract_doy
                 , subq_13.ds__day AS metric_time__day
                 , subq_13.ds__week AS metric_time__week
                 , subq_13.ds__month AS metric_time__month
@@ -637,8 +637,8 @@ FROM (
                 , subq_13.ds__extract_month AS metric_time__extract_month
                 , subq_13.ds__extract_week AS metric_time__extract_week
                 , subq_13.ds__extract_day AS metric_time__extract_day
-                , subq_13.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_13.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_13.ds__extract_dow AS metric_time__extract_dow
+                , subq_13.ds__extract_doy AS metric_time__extract_doy
                 , subq_13.listing
                 , subq_13.user
                 , subq_13.listing__user
@@ -662,25 +662,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -689,25 +689,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index 7bf9d04ee5..ad59db3e71 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -47,74 +47,74 @@ FROM (
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -141,25 +141,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -168,25 +168,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
index 2064e8d4a5..4d1af3e704 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
@@ -44,74 +44,74 @@ FROM (
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -138,25 +138,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -165,25 +165,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql
index b2502ec83f..539cd1c2ea 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql
@@ -38,74 +38,74 @@ FROM (
         , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
         , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
         , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+        , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+        , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
         , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
         , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
         , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+        , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
         , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
         , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
         , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+        , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+        , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
         , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
         , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
         , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+        , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
index cc45bf1891..c60a8f1013 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
index d4dd5b361d..c2e7e2ba3a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
index 0f93debdc2..5690d18f05 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
@@ -23,8 +23,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -35,8 +35,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -47,8 +47,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -61,25 +61,25 @@ FROM (
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
index 06c8ba798c..958cb5faa4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
           , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
           , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index b7e9032ac9..431635cda5 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_1.ds__extract_month
         , subq_1.ds__extract_week
         , subq_1.ds__extract_day
-        , subq_1.ds__extract_dayofweek
-        , subq_1.ds__extract_dayofyear
+        , subq_1.ds__extract_dow
+        , subq_1.ds__extract_doy
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_1.company__ds__extract_month
         , subq_1.company__ds__extract_week
         , subq_1.company__ds__extract_day
-        , subq_1.company__ds__extract_dayofweek
-        , subq_1.company__ds__extract_dayofyear
+        , subq_1.company__ds__extract_dow
+        , subq_1.company__ds__extract_doy
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_1.metric_time__extract_month
         , subq_1.metric_time__extract_week
         , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dayofweek
-        , subq_1.metric_time__extract_dayofyear
+        , subq_1.metric_time__extract_dow
+        , subq_1.metric_time__extract_doy
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -68,8 +68,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.company__ds__extract_month
           , subq_0.company__ds__extract_week
           , subq_0.company__ds__extract_day
-          , subq_0.company__ds__extract_dayofweek
-          , subq_0.company__ds__extract_dayofyear
+          , subq_0.company__ds__extract_dow
+          , subq_0.company__ds__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
@@ -106,25 +106,25 @@ FROM (
             , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
             , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
             , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
             , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
             , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
             , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
index 9e6b7ea463..f16e293fe0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_1.ds__extract_month
         , subq_1.ds__extract_week
         , subq_1.ds__extract_day
-        , subq_1.ds__extract_dayofweek
-        , subq_1.ds__extract_dayofyear
+        , subq_1.ds__extract_dow
+        , subq_1.ds__extract_doy
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_1.company__ds__extract_month
         , subq_1.company__ds__extract_week
         , subq_1.company__ds__extract_day
-        , subq_1.company__ds__extract_dayofweek
-        , subq_1.company__ds__extract_dayofyear
+        , subq_1.company__ds__extract_dow
+        , subq_1.company__ds__extract_doy
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_1.metric_time__extract_month
         , subq_1.metric_time__extract_week
         , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dayofweek
-        , subq_1.metric_time__extract_dayofyear
+        , subq_1.metric_time__extract_dow
+        , subq_1.metric_time__extract_doy
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -68,8 +68,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.company__ds__extract_month
           , subq_0.company__ds__extract_week
           , subq_0.company__ds__extract_day
-          , subq_0.company__ds__extract_dayofweek
-          , subq_0.company__ds__extract_dayofyear
+          , subq_0.company__ds__extract_dow
+          , subq_0.company__ds__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
@@ -106,25 +106,25 @@ FROM (
             , DATE_TRUNC(revenue_src_10006.created_at, month) AS ds__month
             , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS ds__quarter
             , DATE_TRUNC(revenue_src_10006.created_at, year) AS ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
             , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
             , DATE_TRUNC(revenue_src_10006.created_at, quarter) AS company__ds__quarter
             , DATE_TRUNC(revenue_src_10006.created_at, year) AS company__ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
index bfe2d094f8..2982019f1d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -266,8 +266,8 @@ FROM (
             , subq_5.ds__extract_month
             , subq_5.ds__extract_week
             , subq_5.ds__extract_day
-            , subq_5.ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear
+            , subq_5.ds__extract_dow
+            , subq_5.ds__extract_doy
             , subq_5.ds_partitioned__day
             , subq_5.ds_partitioned__week
             , subq_5.ds_partitioned__month
@@ -278,8 +278,8 @@ FROM (
             , subq_5.ds_partitioned__extract_month
             , subq_5.ds_partitioned__extract_week
             , subq_5.ds_partitioned__extract_day
-            , subq_5.ds_partitioned__extract_dayofweek
-            , subq_5.ds_partitioned__extract_dayofyear
+            , subq_5.ds_partitioned__extract_dow
+            , subq_5.ds_partitioned__extract_doy
             , subq_5.paid_at__day
             , subq_5.paid_at__week
             , subq_5.paid_at__month
@@ -290,8 +290,8 @@ FROM (
             , subq_5.paid_at__extract_month
             , subq_5.paid_at__extract_week
             , subq_5.paid_at__extract_day
-            , subq_5.paid_at__extract_dayofweek
-            , subq_5.paid_at__extract_dayofyear
+            , subq_5.paid_at__extract_dow
+            , subq_5.paid_at__extract_doy
             , subq_5.booking__ds__day
             , subq_5.booking__ds__week
             , subq_5.booking__ds__month
@@ -302,8 +302,8 @@ FROM (
             , subq_5.booking__ds__extract_month
             , subq_5.booking__ds__extract_week
             , subq_5.booking__ds__extract_day
-            , subq_5.booking__ds__extract_dayofweek
-            , subq_5.booking__ds__extract_dayofyear
+            , subq_5.booking__ds__extract_dow
+            , subq_5.booking__ds__extract_doy
             , subq_5.booking__ds_partitioned__day
             , subq_5.booking__ds_partitioned__week
             , subq_5.booking__ds_partitioned__month
@@ -314,8 +314,8 @@ FROM (
             , subq_5.booking__ds_partitioned__extract_month
             , subq_5.booking__ds_partitioned__extract_week
             , subq_5.booking__ds_partitioned__extract_day
-            , subq_5.booking__ds_partitioned__extract_dayofweek
-            , subq_5.booking__ds_partitioned__extract_dayofyear
+            , subq_5.booking__ds_partitioned__extract_dow
+            , subq_5.booking__ds_partitioned__extract_doy
             , subq_5.booking__paid_at__day
             , subq_5.booking__paid_at__week
             , subq_5.booking__paid_at__month
@@ -326,8 +326,8 @@ FROM (
             , subq_5.booking__paid_at__extract_month
             , subq_5.booking__paid_at__extract_week
             , subq_5.booking__paid_at__extract_day
-            , subq_5.booking__paid_at__extract_dayofweek
-            , subq_5.booking__paid_at__extract_dayofyear
+            , subq_5.booking__paid_at__extract_dow
+            , subq_5.booking__paid_at__extract_doy
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -338,8 +338,8 @@ FROM (
             , subq_5.ds__extract_month AS metric_time__extract_month
             , subq_5.ds__extract_week AS metric_time__extract_week
             , subq_5.ds__extract_day AS metric_time__extract_day
-            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_5.ds__extract_dow AS metric_time__extract_dow
+            , subq_5.ds__extract_doy AS metric_time__extract_doy
             , subq_5.listing
             , subq_5.guest
             , subq_5.host
@@ -384,74 +384,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
index 9ca086a919..9b40278672 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 52d9d94da7..2ab4211e28 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
index 1b1449615b..b344f149a4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 475e77c5dc..8028b1f148 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index f2aa5d7c8c..64d1c8125b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -38,8 +38,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -50,8 +50,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -62,8 +62,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -74,8 +74,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -86,8 +86,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -98,8 +98,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -140,8 +140,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -152,8 +152,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -164,8 +164,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -176,8 +176,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -188,8 +188,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -200,8 +200,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -212,8 +212,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -258,74 +258,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -373,8 +373,8 @@ FROM (
             , subq_9.ds__extract_month AS ds__extract_month
             , subq_9.ds__extract_week AS ds__extract_week
             , subq_9.ds__extract_day AS ds__extract_day
-            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_9.ds__extract_dow AS ds__extract_dow
+            , subq_9.ds__extract_doy AS ds__extract_doy
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
@@ -385,8 +385,8 @@ FROM (
             , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_9.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_9.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
@@ -397,8 +397,8 @@ FROM (
             , subq_9.paid_at__extract_month AS paid_at__extract_month
             , subq_9.paid_at__extract_week AS paid_at__extract_week
             , subq_9.paid_at__extract_day AS paid_at__extract_day
-            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_9.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_9.paid_at__extract_doy AS paid_at__extract_doy
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
@@ -409,8 +409,8 @@ FROM (
             , subq_9.booking__ds__extract_month AS booking__ds__extract_month
             , subq_9.booking__ds__extract_week AS booking__ds__extract_week
             , subq_9.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_9.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_9.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -421,8 +421,8 @@ FROM (
             , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_9.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_9.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
@@ -433,8 +433,8 @@ FROM (
             , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_9.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_9.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -475,8 +475,8 @@ FROM (
               , subq_8.ds__extract_month
               , subq_8.ds__extract_week
               , subq_8.ds__extract_day
-              , subq_8.ds__extract_dayofweek
-              , subq_8.ds__extract_dayofyear
+              , subq_8.ds__extract_dow
+              , subq_8.ds__extract_doy
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
@@ -487,8 +487,8 @@ FROM (
               , subq_8.ds_partitioned__extract_month
               , subq_8.ds_partitioned__extract_week
               , subq_8.ds_partitioned__extract_day
-              , subq_8.ds_partitioned__extract_dayofweek
-              , subq_8.ds_partitioned__extract_dayofyear
+              , subq_8.ds_partitioned__extract_dow
+              , subq_8.ds_partitioned__extract_doy
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
@@ -499,8 +499,8 @@ FROM (
               , subq_8.paid_at__extract_month
               , subq_8.paid_at__extract_week
               , subq_8.paid_at__extract_day
-              , subq_8.paid_at__extract_dayofweek
-              , subq_8.paid_at__extract_dayofyear
+              , subq_8.paid_at__extract_dow
+              , subq_8.paid_at__extract_doy
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
@@ -511,8 +511,8 @@ FROM (
               , subq_8.booking__ds__extract_month
               , subq_8.booking__ds__extract_week
               , subq_8.booking__ds__extract_day
-              , subq_8.booking__ds__extract_dayofweek
-              , subq_8.booking__ds__extract_dayofyear
+              , subq_8.booking__ds__extract_dow
+              , subq_8.booking__ds__extract_doy
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
@@ -523,8 +523,8 @@ FROM (
               , subq_8.booking__ds_partitioned__extract_month
               , subq_8.booking__ds_partitioned__extract_week
               , subq_8.booking__ds_partitioned__extract_day
-              , subq_8.booking__ds_partitioned__extract_dayofweek
-              , subq_8.booking__ds_partitioned__extract_dayofyear
+              , subq_8.booking__ds_partitioned__extract_dow
+              , subq_8.booking__ds_partitioned__extract_doy
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
@@ -535,8 +535,8 @@ FROM (
               , subq_8.booking__paid_at__extract_month
               , subq_8.booking__paid_at__extract_week
               , subq_8.booking__paid_at__extract_day
-              , subq_8.booking__paid_at__extract_dayofweek
-              , subq_8.booking__paid_at__extract_dayofyear
+              , subq_8.booking__paid_at__extract_dow
+              , subq_8.booking__paid_at__extract_doy
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -547,8 +547,8 @@ FROM (
               , subq_8.ds__extract_month AS metric_time__extract_month
               , subq_8.ds__extract_week AS metric_time__extract_week
               , subq_8.ds__extract_day AS metric_time__extract_day
-              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_8.ds__extract_dow AS metric_time__extract_dow
+              , subq_8.ds__extract_doy AS metric_time__extract_doy
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
@@ -593,74 +593,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index e057de623f..3bf4e0e3cd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -38,8 +38,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -50,8 +50,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -62,8 +62,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -74,8 +74,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -86,8 +86,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -98,8 +98,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -140,8 +140,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -152,8 +152,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -164,8 +164,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -176,8 +176,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -188,8 +188,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -200,8 +200,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -212,8 +212,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -258,74 +258,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -374,8 +374,8 @@ FROM (
             , subq_9.ds__extract_month AS ds__extract_month
             , subq_9.ds__extract_week AS ds__extract_week
             , subq_9.ds__extract_day AS ds__extract_day
-            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_9.ds__extract_dow AS ds__extract_dow
+            , subq_9.ds__extract_doy AS ds__extract_doy
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
@@ -386,8 +386,8 @@ FROM (
             , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_9.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_9.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
@@ -398,8 +398,8 @@ FROM (
             , subq_9.paid_at__extract_month AS paid_at__extract_month
             , subq_9.paid_at__extract_week AS paid_at__extract_week
             , subq_9.paid_at__extract_day AS paid_at__extract_day
-            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_9.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_9.paid_at__extract_doy AS paid_at__extract_doy
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
@@ -410,8 +410,8 @@ FROM (
             , subq_9.booking__ds__extract_month AS booking__ds__extract_month
             , subq_9.booking__ds__extract_week AS booking__ds__extract_week
             , subq_9.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_9.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_9.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -422,8 +422,8 @@ FROM (
             , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_9.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_9.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
@@ -434,8 +434,8 @@ FROM (
             , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_9.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_9.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -476,8 +476,8 @@ FROM (
               , subq_8.ds__extract_month
               , subq_8.ds__extract_week
               , subq_8.ds__extract_day
-              , subq_8.ds__extract_dayofweek
-              , subq_8.ds__extract_dayofyear
+              , subq_8.ds__extract_dow
+              , subq_8.ds__extract_doy
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
@@ -488,8 +488,8 @@ FROM (
               , subq_8.ds_partitioned__extract_month
               , subq_8.ds_partitioned__extract_week
               , subq_8.ds_partitioned__extract_day
-              , subq_8.ds_partitioned__extract_dayofweek
-              , subq_8.ds_partitioned__extract_dayofyear
+              , subq_8.ds_partitioned__extract_dow
+              , subq_8.ds_partitioned__extract_doy
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
@@ -500,8 +500,8 @@ FROM (
               , subq_8.paid_at__extract_month
               , subq_8.paid_at__extract_week
               , subq_8.paid_at__extract_day
-              , subq_8.paid_at__extract_dayofweek
-              , subq_8.paid_at__extract_dayofyear
+              , subq_8.paid_at__extract_dow
+              , subq_8.paid_at__extract_doy
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
@@ -512,8 +512,8 @@ FROM (
               , subq_8.booking__ds__extract_month
               , subq_8.booking__ds__extract_week
               , subq_8.booking__ds__extract_day
-              , subq_8.booking__ds__extract_dayofweek
-              , subq_8.booking__ds__extract_dayofyear
+              , subq_8.booking__ds__extract_dow
+              , subq_8.booking__ds__extract_doy
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
@@ -524,8 +524,8 @@ FROM (
               , subq_8.booking__ds_partitioned__extract_month
               , subq_8.booking__ds_partitioned__extract_week
               , subq_8.booking__ds_partitioned__extract_day
-              , subq_8.booking__ds_partitioned__extract_dayofweek
-              , subq_8.booking__ds_partitioned__extract_dayofyear
+              , subq_8.booking__ds_partitioned__extract_dow
+              , subq_8.booking__ds_partitioned__extract_doy
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
@@ -536,8 +536,8 @@ FROM (
               , subq_8.booking__paid_at__extract_month
               , subq_8.booking__paid_at__extract_week
               , subq_8.booking__paid_at__extract_day
-              , subq_8.booking__paid_at__extract_dayofweek
-              , subq_8.booking__paid_at__extract_dayofyear
+              , subq_8.booking__paid_at__extract_dow
+              , subq_8.booking__paid_at__extract_doy
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -548,8 +548,8 @@ FROM (
               , subq_8.ds__extract_month AS metric_time__extract_month
               , subq_8.ds__extract_week AS metric_time__extract_week
               , subq_8.ds__extract_day AS metric_time__extract_day
-              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_8.ds__extract_dow AS metric_time__extract_dow
+              , subq_8.ds__extract_doy AS metric_time__extract_doy
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
@@ -594,74 +594,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
index 7a120c1236..b6f236cde8 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_4.ds__extract_month AS ds__extract_month
           , subq_4.ds__extract_week AS ds__extract_week
           , subq_4.ds__extract_day AS ds__extract_day
-          , subq_4.ds__extract_dayofweek AS ds__extract_dayofweek
-          , subq_4.ds__extract_dayofyear AS ds__extract_dayofyear
+          , subq_4.ds__extract_dow AS ds__extract_dow
+          , subq_4.ds__extract_doy AS ds__extract_doy
           , subq_4.ds_partitioned__day AS ds_partitioned__day
           , subq_4.ds_partitioned__week AS ds_partitioned__week
           , subq_4.ds_partitioned__month AS ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_4.ds_partitioned__extract_month AS ds_partitioned__extract_month
           , subq_4.ds_partitioned__extract_week AS ds_partitioned__extract_week
           , subq_4.ds_partitioned__extract_day AS ds_partitioned__extract_day
-          , subq_4.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-          , subq_4.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+          , subq_4.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+          , subq_4.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
           , subq_4.paid_at__day AS paid_at__day
           , subq_4.paid_at__week AS paid_at__week
           , subq_4.paid_at__month AS paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_4.paid_at__extract_month AS paid_at__extract_month
           , subq_4.paid_at__extract_week AS paid_at__extract_week
           , subq_4.paid_at__extract_day AS paid_at__extract_day
-          , subq_4.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-          , subq_4.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+          , subq_4.paid_at__extract_dow AS paid_at__extract_dow
+          , subq_4.paid_at__extract_doy AS paid_at__extract_doy
           , subq_4.booking__ds__day AS booking__ds__day
           , subq_4.booking__ds__week AS booking__ds__week
           , subq_4.booking__ds__month AS booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_4.booking__ds__extract_month AS booking__ds__extract_month
           , subq_4.booking__ds__extract_week AS booking__ds__extract_week
           , subq_4.booking__ds__extract_day AS booking__ds__extract_day
-          , subq_4.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-          , subq_4.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+          , subq_4.booking__ds__extract_dow AS booking__ds__extract_dow
+          , subq_4.booking__ds__extract_doy AS booking__ds__extract_doy
           , subq_4.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_4.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_4.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_4.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
           , subq_4.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
           , subq_4.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-          , subq_4.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-          , subq_4.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+          , subq_4.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+          , subq_4.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
           , subq_4.booking__paid_at__day AS booking__paid_at__day
           , subq_4.booking__paid_at__week AS booking__paid_at__week
           , subq_4.booking__paid_at__month AS booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_4.booking__paid_at__extract_month AS booking__paid_at__extract_month
           , subq_4.booking__paid_at__extract_week AS booking__paid_at__extract_week
           , subq_4.booking__paid_at__extract_day AS booking__paid_at__extract_day
-          , subq_4.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-          , subq_4.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+          , subq_4.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+          , subq_4.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
           , subq_4.listing AS listing
           , subq_4.guest AS guest
           , subq_4.host AS host
@@ -135,8 +135,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -147,8 +147,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -159,8 +159,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -171,8 +171,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -183,8 +183,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -195,8 +195,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.metric_time__week AS metric_time__week
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
@@ -206,8 +206,8 @@ FROM (
             , subq_1.metric_time__extract_month AS metric_time__extract_month
             , subq_1.metric_time__extract_week AS metric_time__extract_week
             , subq_1.metric_time__extract_day AS metric_time__extract_day
-            , subq_1.metric_time__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_1.metric_time__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_1.metric_time__extract_dow AS metric_time__extract_dow
+            , subq_1.metric_time__extract_doy AS metric_time__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -248,8 +248,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -260,8 +260,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -272,8 +272,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -284,8 +284,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -296,8 +296,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -308,8 +308,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -320,8 +320,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -366,74 +366,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 19b237f759..4d754919c2 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_1.ds__extract_month AS ds__extract_month
           , subq_1.ds__extract_week AS ds__extract_week
           , subq_1.ds__extract_day AS ds__extract_day
-          , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-          , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+          , subq_1.ds__extract_dow AS ds__extract_dow
+          , subq_1.ds__extract_doy AS ds__extract_doy
           , subq_1.ds_partitioned__day AS ds_partitioned__day
           , subq_1.ds_partitioned__week AS ds_partitioned__week
           , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
           , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
           , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-          , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-          , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+          , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+          , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
           , subq_1.paid_at__day AS paid_at__day
           , subq_1.paid_at__week AS paid_at__week
           , subq_1.paid_at__month AS paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_1.paid_at__extract_month AS paid_at__extract_month
           , subq_1.paid_at__extract_week AS paid_at__extract_week
           , subq_1.paid_at__extract_day AS paid_at__extract_day
-          , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-          , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+          , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+          , subq_1.paid_at__extract_doy AS paid_at__extract_doy
           , subq_1.booking__ds__day AS booking__ds__day
           , subq_1.booking__ds__week AS booking__ds__week
           , subq_1.booking__ds__month AS booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_1.booking__ds__extract_month AS booking__ds__extract_month
           , subq_1.booking__ds__extract_week AS booking__ds__extract_week
           , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-          , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-          , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+          , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+          , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
           , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
           , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
           , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-          , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-          , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+          , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+          , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
           , subq_1.booking__paid_at__day AS booking__paid_at__day
           , subq_1.booking__paid_at__week AS booking__paid_at__week
           , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
           , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
           , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-          , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-          , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+          , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+          , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
           , subq_1.listing AS listing
           , subq_1.guest AS guest
           , subq_1.host AS host
@@ -134,8 +134,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -146,8 +146,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -158,8 +158,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -170,8 +170,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -182,8 +182,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -194,8 +194,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -206,8 +206,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -252,74 +252,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
index 95a9c68e3f..9373149736 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
@@ -47,8 +47,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -59,8 +59,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -71,8 +71,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -83,8 +83,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -95,8 +95,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -107,8 +107,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -119,8 +119,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -165,74 +165,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -262,8 +262,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -274,8 +274,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -286,8 +286,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -298,8 +298,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -310,8 +310,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -335,25 +335,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -362,25 +362,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql
index 275f765347..84160306fc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql
@@ -25,74 +25,74 @@ FROM (
     , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
     , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
     , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
     , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
     , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
     , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
     , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
     , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
index 4f0cd51ead..74d3cae54a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
@@ -31,74 +31,74 @@ FROM (
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 298d60b12f..0352822f08 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -53,8 +53,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -65,8 +65,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -77,8 +77,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -89,8 +89,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -101,8 +101,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -113,8 +113,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -125,8 +125,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -171,74 +171,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -268,8 +268,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -280,8 +280,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -292,8 +292,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -304,8 +304,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -316,8 +316,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -341,25 +341,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -368,25 +368,25 @@ FROM (
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
                   , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
                   , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
index 00a9252e55..1ebeb96fdf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
@@ -55,8 +55,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -67,8 +67,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -79,8 +79,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -91,8 +91,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -103,8 +103,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -115,8 +115,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -127,8 +127,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -159,74 +159,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10015.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10015.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10015.ds, year) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, year) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, year) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10015.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10015.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10015.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10015.ds, year) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, year) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, year) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -255,25 +255,25 @@ FROM (
                 , DATE_TRUNC(listings_src_10017.active_from, month) AS window_start__month
                 , DATE_TRUNC(listings_src_10017.active_from, quarter) AS window_start__quarter
                 , DATE_TRUNC(listings_src_10017.active_from, year) AS window_start__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
+                , EXTRACT(ISOWEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dow
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_doy
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC(listings_src_10017.active_to, isoweek) AS window_end__week
                 , DATE_TRUNC(listings_src_10017.active_to, month) AS window_end__month
                 , DATE_TRUNC(listings_src_10017.active_to, quarter) AS window_end__quarter
                 , DATE_TRUNC(listings_src_10017.active_to, year) AS window_end__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
+                , EXTRACT(ISOWEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dow
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_doy
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -282,25 +282,25 @@ FROM (
                 , DATE_TRUNC(listings_src_10017.active_from, month) AS listing__window_start__month
                 , DATE_TRUNC(listings_src_10017.active_from, quarter) AS listing__window_start__quarter
                 , DATE_TRUNC(listings_src_10017.active_from, year) AS listing__window_start__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+                , EXTRACT(ISOWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC(listings_src_10017.active_to, isoweek) AS listing__window_end__week
                 , DATE_TRUNC(listings_src_10017.active_to, month) AS listing__window_end__month
                 , DATE_TRUNC(listings_src_10017.active_to, quarter) AS listing__window_end__quarter
                 , DATE_TRUNC(listings_src_10017.active_to, year) AS listing__window_end__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+                , EXTRACT(ISOWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 16eb99e413..f40b5933ab 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
index fbeb26604f..bdb3b55b6b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
index 2162a5c2ad..f0523526b9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
index aa307ac3ae..8aac1294f0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
@@ -31,8 +31,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -43,8 +43,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -55,8 +55,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -67,8 +67,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -79,8 +79,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -91,8 +91,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -103,8 +103,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -149,74 +149,74 @@ FROM (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
index c02240d603..bc42027f9e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.created_at__day
         , subq_0.created_at__week
         , subq_0.created_at__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.created_at__extract_month
         , subq_0.created_at__extract_week
         , subq_0.created_at__extract_day
-        , subq_0.created_at__extract_dayofweek
-        , subq_0.created_at__extract_dayofyear
+        , subq_0.created_at__extract_dow
+        , subq_0.created_at__extract_doy
         , subq_0.listing__ds__day
         , subq_0.listing__ds__week
         , subq_0.listing__ds__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.listing__ds__extract_month
         , subq_0.listing__ds__extract_week
         , subq_0.listing__ds__extract_day
-        , subq_0.listing__ds__extract_dayofweek
-        , subq_0.listing__ds__extract_dayofyear
+        , subq_0.listing__ds__extract_dow
+        , subq_0.listing__ds__extract_doy
         , subq_0.listing__created_at__day
         , subq_0.listing__created_at__week
         , subq_0.listing__created_at__month
@@ -62,8 +62,8 @@ FROM (
         , subq_0.listing__created_at__extract_month
         , subq_0.listing__created_at__extract_week
         , subq_0.listing__created_at__extract_day
-        , subq_0.listing__created_at__extract_dayofweek
-        , subq_0.listing__created_at__extract_dayofyear
+        , subq_0.listing__created_at__extract_dow
+        , subq_0.listing__created_at__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -74,8 +74,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.listing
         , subq_0.user
         , subq_0.listing__user
@@ -99,25 +99,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -126,25 +126,25 @@ FROM (
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
           , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
           , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql
index db653ee51c..7cffe26a94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql
@@ -35,74 +35,74 @@ FROM (
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
index f83d1e53c7..451625b47c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
@@ -65,8 +65,8 @@ FROM (
                     , subq_0.ds__extract_month
                     , subq_0.ds__extract_week
                     , subq_0.ds__extract_day
-                    , subq_0.ds__extract_dayofweek
-                    , subq_0.ds__extract_dayofyear
+                    , subq_0.ds__extract_dow
+                    , subq_0.ds__extract_doy
                     , subq_0.ds_partitioned__day
                     , subq_0.ds_partitioned__week
                     , subq_0.ds_partitioned__month
@@ -77,8 +77,8 @@ FROM (
                     , subq_0.ds_partitioned__extract_month
                     , subq_0.ds_partitioned__extract_week
                     , subq_0.ds_partitioned__extract_day
-                    , subq_0.ds_partitioned__extract_dayofweek
-                    , subq_0.ds_partitioned__extract_dayofyear
+                    , subq_0.ds_partitioned__extract_dow
+                    , subq_0.ds_partitioned__extract_doy
                     , subq_0.paid_at__day
                     , subq_0.paid_at__week
                     , subq_0.paid_at__month
@@ -89,8 +89,8 @@ FROM (
                     , subq_0.paid_at__extract_month
                     , subq_0.paid_at__extract_week
                     , subq_0.paid_at__extract_day
-                    , subq_0.paid_at__extract_dayofweek
-                    , subq_0.paid_at__extract_dayofyear
+                    , subq_0.paid_at__extract_dow
+                    , subq_0.paid_at__extract_doy
                     , subq_0.booking__ds__day
                     , subq_0.booking__ds__week
                     , subq_0.booking__ds__month
@@ -101,8 +101,8 @@ FROM (
                     , subq_0.booking__ds__extract_month
                     , subq_0.booking__ds__extract_week
                     , subq_0.booking__ds__extract_day
-                    , subq_0.booking__ds__extract_dayofweek
-                    , subq_0.booking__ds__extract_dayofyear
+                    , subq_0.booking__ds__extract_dow
+                    , subq_0.booking__ds__extract_doy
                     , subq_0.booking__ds_partitioned__day
                     , subq_0.booking__ds_partitioned__week
                     , subq_0.booking__ds_partitioned__month
@@ -113,8 +113,8 @@ FROM (
                     , subq_0.booking__ds_partitioned__extract_month
                     , subq_0.booking__ds_partitioned__extract_week
                     , subq_0.booking__ds_partitioned__extract_day
-                    , subq_0.booking__ds_partitioned__extract_dayofweek
-                    , subq_0.booking__ds_partitioned__extract_dayofyear
+                    , subq_0.booking__ds_partitioned__extract_dow
+                    , subq_0.booking__ds_partitioned__extract_doy
                     , subq_0.booking__paid_at__day
                     , subq_0.booking__paid_at__week
                     , subq_0.booking__paid_at__month
@@ -125,8 +125,8 @@ FROM (
                     , subq_0.booking__paid_at__extract_month
                     , subq_0.booking__paid_at__extract_week
                     , subq_0.booking__paid_at__extract_day
-                    , subq_0.booking__paid_at__extract_dayofweek
-                    , subq_0.booking__paid_at__extract_dayofyear
+                    , subq_0.booking__paid_at__extract_dow
+                    , subq_0.booking__paid_at__extract_doy
                     , subq_0.ds__day AS metric_time__day
                     , subq_0.ds__week AS metric_time__week
                     , subq_0.ds__month AS metric_time__month
@@ -137,8 +137,8 @@ FROM (
                     , subq_0.ds__extract_month AS metric_time__extract_month
                     , subq_0.ds__extract_week AS metric_time__extract_week
                     , subq_0.ds__extract_day AS metric_time__extract_day
-                    , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_0.ds__extract_dow AS metric_time__extract_dow
+                    , subq_0.ds__extract_doy AS metric_time__extract_doy
                     , subq_0.listing
                     , subq_0.guest
                     , subq_0.host
@@ -183,74 +183,74 @@ FROM (
                       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -280,8 +280,8 @@ FROM (
                     , subq_3.ds__extract_month
                     , subq_3.ds__extract_week
                     , subq_3.ds__extract_day
-                    , subq_3.ds__extract_dayofweek
-                    , subq_3.ds__extract_dayofyear
+                    , subq_3.ds__extract_dow
+                    , subq_3.ds__extract_doy
                     , subq_3.created_at__day
                     , subq_3.created_at__week
                     , subq_3.created_at__month
@@ -292,8 +292,8 @@ FROM (
                     , subq_3.created_at__extract_month
                     , subq_3.created_at__extract_week
                     , subq_3.created_at__extract_day
-                    , subq_3.created_at__extract_dayofweek
-                    , subq_3.created_at__extract_dayofyear
+                    , subq_3.created_at__extract_dow
+                    , subq_3.created_at__extract_doy
                     , subq_3.listing__ds__day
                     , subq_3.listing__ds__week
                     , subq_3.listing__ds__month
@@ -304,8 +304,8 @@ FROM (
                     , subq_3.listing__ds__extract_month
                     , subq_3.listing__ds__extract_week
                     , subq_3.listing__ds__extract_day
-                    , subq_3.listing__ds__extract_dayofweek
-                    , subq_3.listing__ds__extract_dayofyear
+                    , subq_3.listing__ds__extract_dow
+                    , subq_3.listing__ds__extract_doy
                     , subq_3.listing__created_at__day
                     , subq_3.listing__created_at__week
                     , subq_3.listing__created_at__month
@@ -316,8 +316,8 @@ FROM (
                     , subq_3.listing__created_at__extract_month
                     , subq_3.listing__created_at__extract_week
                     , subq_3.listing__created_at__extract_day
-                    , subq_3.listing__created_at__extract_dayofweek
-                    , subq_3.listing__created_at__extract_dayofyear
+                    , subq_3.listing__created_at__extract_dow
+                    , subq_3.listing__created_at__extract_doy
                     , subq_3.ds__day AS metric_time__day
                     , subq_3.ds__week AS metric_time__week
                     , subq_3.ds__month AS metric_time__month
@@ -328,8 +328,8 @@ FROM (
                     , subq_3.ds__extract_month AS metric_time__extract_month
                     , subq_3.ds__extract_week AS metric_time__extract_week
                     , subq_3.ds__extract_day AS metric_time__extract_day
-                    , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_3.ds__extract_dow AS metric_time__extract_dow
+                    , subq_3.ds__extract_doy AS metric_time__extract_doy
                     , subq_3.listing
                     , subq_3.user
                     , subq_3.listing__user
@@ -353,25 +353,25 @@ FROM (
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -380,25 +380,25 @@ FROM (
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -476,8 +476,8 @@ FROM (
                     , subq_12.ds__extract_month
                     , subq_12.ds__extract_week
                     , subq_12.ds__extract_day
-                    , subq_12.ds__extract_dayofweek
-                    , subq_12.ds__extract_dayofyear
+                    , subq_12.ds__extract_dow
+                    , subq_12.ds__extract_doy
                     , subq_12.ds_partitioned__day
                     , subq_12.ds_partitioned__week
                     , subq_12.ds_partitioned__month
@@ -488,8 +488,8 @@ FROM (
                     , subq_12.ds_partitioned__extract_month
                     , subq_12.ds_partitioned__extract_week
                     , subq_12.ds_partitioned__extract_day
-                    , subq_12.ds_partitioned__extract_dayofweek
-                    , subq_12.ds_partitioned__extract_dayofyear
+                    , subq_12.ds_partitioned__extract_dow
+                    , subq_12.ds_partitioned__extract_doy
                     , subq_12.paid_at__day
                     , subq_12.paid_at__week
                     , subq_12.paid_at__month
@@ -500,8 +500,8 @@ FROM (
                     , subq_12.paid_at__extract_month
                     , subq_12.paid_at__extract_week
                     , subq_12.paid_at__extract_day
-                    , subq_12.paid_at__extract_dayofweek
-                    , subq_12.paid_at__extract_dayofyear
+                    , subq_12.paid_at__extract_dow
+                    , subq_12.paid_at__extract_doy
                     , subq_12.booking__ds__day
                     , subq_12.booking__ds__week
                     , subq_12.booking__ds__month
@@ -512,8 +512,8 @@ FROM (
                     , subq_12.booking__ds__extract_month
                     , subq_12.booking__ds__extract_week
                     , subq_12.booking__ds__extract_day
-                    , subq_12.booking__ds__extract_dayofweek
-                    , subq_12.booking__ds__extract_dayofyear
+                    , subq_12.booking__ds__extract_dow
+                    , subq_12.booking__ds__extract_doy
                     , subq_12.booking__ds_partitioned__day
                     , subq_12.booking__ds_partitioned__week
                     , subq_12.booking__ds_partitioned__month
@@ -524,8 +524,8 @@ FROM (
                     , subq_12.booking__ds_partitioned__extract_month
                     , subq_12.booking__ds_partitioned__extract_week
                     , subq_12.booking__ds_partitioned__extract_day
-                    , subq_12.booking__ds_partitioned__extract_dayofweek
-                    , subq_12.booking__ds_partitioned__extract_dayofyear
+                    , subq_12.booking__ds_partitioned__extract_dow
+                    , subq_12.booking__ds_partitioned__extract_doy
                     , subq_12.booking__paid_at__day
                     , subq_12.booking__paid_at__week
                     , subq_12.booking__paid_at__month
@@ -536,8 +536,8 @@ FROM (
                     , subq_12.booking__paid_at__extract_month
                     , subq_12.booking__paid_at__extract_week
                     , subq_12.booking__paid_at__extract_day
-                    , subq_12.booking__paid_at__extract_dayofweek
-                    , subq_12.booking__paid_at__extract_dayofyear
+                    , subq_12.booking__paid_at__extract_dow
+                    , subq_12.booking__paid_at__extract_doy
                     , subq_12.ds__day AS metric_time__day
                     , subq_12.ds__week AS metric_time__week
                     , subq_12.ds__month AS metric_time__month
@@ -548,8 +548,8 @@ FROM (
                     , subq_12.ds__extract_month AS metric_time__extract_month
                     , subq_12.ds__extract_week AS metric_time__extract_week
                     , subq_12.ds__extract_day AS metric_time__extract_day
-                    , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_12.ds__extract_dow AS metric_time__extract_dow
+                    , subq_12.ds__extract_doy AS metric_time__extract_doy
                     , subq_12.listing
                     , subq_12.guest
                     , subq_12.host
@@ -594,74 +594,74 @@ FROM (
                       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -691,8 +691,8 @@ FROM (
                     , subq_15.ds__extract_month
                     , subq_15.ds__extract_week
                     , subq_15.ds__extract_day
-                    , subq_15.ds__extract_dayofweek
-                    , subq_15.ds__extract_dayofyear
+                    , subq_15.ds__extract_dow
+                    , subq_15.ds__extract_doy
                     , subq_15.created_at__day
                     , subq_15.created_at__week
                     , subq_15.created_at__month
@@ -703,8 +703,8 @@ FROM (
                     , subq_15.created_at__extract_month
                     , subq_15.created_at__extract_week
                     , subq_15.created_at__extract_day
-                    , subq_15.created_at__extract_dayofweek
-                    , subq_15.created_at__extract_dayofyear
+                    , subq_15.created_at__extract_dow
+                    , subq_15.created_at__extract_doy
                     , subq_15.listing__ds__day
                     , subq_15.listing__ds__week
                     , subq_15.listing__ds__month
@@ -715,8 +715,8 @@ FROM (
                     , subq_15.listing__ds__extract_month
                     , subq_15.listing__ds__extract_week
                     , subq_15.listing__ds__extract_day
-                    , subq_15.listing__ds__extract_dayofweek
-                    , subq_15.listing__ds__extract_dayofyear
+                    , subq_15.listing__ds__extract_dow
+                    , subq_15.listing__ds__extract_doy
                     , subq_15.listing__created_at__day
                     , subq_15.listing__created_at__week
                     , subq_15.listing__created_at__month
@@ -727,8 +727,8 @@ FROM (
                     , subq_15.listing__created_at__extract_month
                     , subq_15.listing__created_at__extract_week
                     , subq_15.listing__created_at__extract_day
-                    , subq_15.listing__created_at__extract_dayofweek
-                    , subq_15.listing__created_at__extract_dayofyear
+                    , subq_15.listing__created_at__extract_dow
+                    , subq_15.listing__created_at__extract_doy
                     , subq_15.ds__day AS metric_time__day
                     , subq_15.ds__week AS metric_time__week
                     , subq_15.ds__month AS metric_time__month
@@ -739,8 +739,8 @@ FROM (
                     , subq_15.ds__extract_month AS metric_time__extract_month
                     , subq_15.ds__extract_week AS metric_time__extract_week
                     , subq_15.ds__extract_day AS metric_time__extract_day
-                    , subq_15.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_15.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_15.ds__extract_dow AS metric_time__extract_dow
+                    , subq_15.ds__extract_doy AS metric_time__extract_doy
                     , subq_15.listing
                     , subq_15.user
                     , subq_15.listing__user
@@ -764,25 +764,25 @@ FROM (
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -791,25 +791,25 @@ FROM (
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
                       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
                       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -870,8 +870,8 @@ FROM (
             , subq_24.ds__extract_month
             , subq_24.ds__extract_week
             , subq_24.ds__extract_day
-            , subq_24.ds__extract_dayofweek
-            , subq_24.ds__extract_dayofyear
+            , subq_24.ds__extract_dow
+            , subq_24.ds__extract_doy
             , subq_24.ds_partitioned__day
             , subq_24.ds_partitioned__week
             , subq_24.ds_partitioned__month
@@ -882,8 +882,8 @@ FROM (
             , subq_24.ds_partitioned__extract_month
             , subq_24.ds_partitioned__extract_week
             , subq_24.ds_partitioned__extract_day
-            , subq_24.ds_partitioned__extract_dayofweek
-            , subq_24.ds_partitioned__extract_dayofyear
+            , subq_24.ds_partitioned__extract_dow
+            , subq_24.ds_partitioned__extract_doy
             , subq_24.paid_at__day
             , subq_24.paid_at__week
             , subq_24.paid_at__month
@@ -894,8 +894,8 @@ FROM (
             , subq_24.paid_at__extract_month
             , subq_24.paid_at__extract_week
             , subq_24.paid_at__extract_day
-            , subq_24.paid_at__extract_dayofweek
-            , subq_24.paid_at__extract_dayofyear
+            , subq_24.paid_at__extract_dow
+            , subq_24.paid_at__extract_doy
             , subq_24.booking__ds__day
             , subq_24.booking__ds__week
             , subq_24.booking__ds__month
@@ -906,8 +906,8 @@ FROM (
             , subq_24.booking__ds__extract_month
             , subq_24.booking__ds__extract_week
             , subq_24.booking__ds__extract_day
-            , subq_24.booking__ds__extract_dayofweek
-            , subq_24.booking__ds__extract_dayofyear
+            , subq_24.booking__ds__extract_dow
+            , subq_24.booking__ds__extract_doy
             , subq_24.booking__ds_partitioned__day
             , subq_24.booking__ds_partitioned__week
             , subq_24.booking__ds_partitioned__month
@@ -918,8 +918,8 @@ FROM (
             , subq_24.booking__ds_partitioned__extract_month
             , subq_24.booking__ds_partitioned__extract_week
             , subq_24.booking__ds_partitioned__extract_day
-            , subq_24.booking__ds_partitioned__extract_dayofweek
-            , subq_24.booking__ds_partitioned__extract_dayofyear
+            , subq_24.booking__ds_partitioned__extract_dow
+            , subq_24.booking__ds_partitioned__extract_doy
             , subq_24.booking__paid_at__day
             , subq_24.booking__paid_at__week
             , subq_24.booking__paid_at__month
@@ -930,8 +930,8 @@ FROM (
             , subq_24.booking__paid_at__extract_month
             , subq_24.booking__paid_at__extract_week
             , subq_24.booking__paid_at__extract_day
-            , subq_24.booking__paid_at__extract_dayofweek
-            , subq_24.booking__paid_at__extract_dayofyear
+            , subq_24.booking__paid_at__extract_dow
+            , subq_24.booking__paid_at__extract_doy
             , subq_24.ds__day AS metric_time__day
             , subq_24.ds__week AS metric_time__week
             , subq_24.ds__month AS metric_time__month
@@ -942,8 +942,8 @@ FROM (
             , subq_24.ds__extract_month AS metric_time__extract_month
             , subq_24.ds__extract_week AS metric_time__extract_week
             , subq_24.ds__extract_day AS metric_time__extract_day
-            , subq_24.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_24.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_24.ds__extract_dow AS metric_time__extract_dow
+            , subq_24.ds__extract_doy AS metric_time__extract_doy
             , subq_24.listing
             , subq_24.guest
             , subq_24.host
@@ -988,74 +988,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
index 28f70455e3..74ac44eb4b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
@@ -50,8 +50,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -62,8 +62,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -74,8 +74,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -86,8 +86,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -98,8 +98,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -110,8 +110,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -122,8 +122,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -168,74 +168,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -282,8 +282,8 @@ FROM (
             , subq_7.ds__extract_month
             , subq_7.ds__extract_week
             , subq_7.ds__extract_day
-            , subq_7.ds__extract_dayofweek
-            , subq_7.ds__extract_dayofyear
+            , subq_7.ds__extract_dow
+            , subq_7.ds__extract_doy
             , subq_7.ds_partitioned__day
             , subq_7.ds_partitioned__week
             , subq_7.ds_partitioned__month
@@ -294,8 +294,8 @@ FROM (
             , subq_7.ds_partitioned__extract_month
             , subq_7.ds_partitioned__extract_week
             , subq_7.ds_partitioned__extract_day
-            , subq_7.ds_partitioned__extract_dayofweek
-            , subq_7.ds_partitioned__extract_dayofyear
+            , subq_7.ds_partitioned__extract_dow
+            , subq_7.ds_partitioned__extract_doy
             , subq_7.paid_at__day
             , subq_7.paid_at__week
             , subq_7.paid_at__month
@@ -306,8 +306,8 @@ FROM (
             , subq_7.paid_at__extract_month
             , subq_7.paid_at__extract_week
             , subq_7.paid_at__extract_day
-            , subq_7.paid_at__extract_dayofweek
-            , subq_7.paid_at__extract_dayofyear
+            , subq_7.paid_at__extract_dow
+            , subq_7.paid_at__extract_doy
             , subq_7.booking__ds__day
             , subq_7.booking__ds__week
             , subq_7.booking__ds__month
@@ -318,8 +318,8 @@ FROM (
             , subq_7.booking__ds__extract_month
             , subq_7.booking__ds__extract_week
             , subq_7.booking__ds__extract_day
-            , subq_7.booking__ds__extract_dayofweek
-            , subq_7.booking__ds__extract_dayofyear
+            , subq_7.booking__ds__extract_dow
+            , subq_7.booking__ds__extract_doy
             , subq_7.booking__ds_partitioned__day
             , subq_7.booking__ds_partitioned__week
             , subq_7.booking__ds_partitioned__month
@@ -330,8 +330,8 @@ FROM (
             , subq_7.booking__ds_partitioned__extract_month
             , subq_7.booking__ds_partitioned__extract_week
             , subq_7.booking__ds_partitioned__extract_day
-            , subq_7.booking__ds_partitioned__extract_dayofweek
-            , subq_7.booking__ds_partitioned__extract_dayofyear
+            , subq_7.booking__ds_partitioned__extract_dow
+            , subq_7.booking__ds_partitioned__extract_doy
             , subq_7.booking__paid_at__day
             , subq_7.booking__paid_at__week
             , subq_7.booking__paid_at__month
@@ -342,8 +342,8 @@ FROM (
             , subq_7.booking__paid_at__extract_month
             , subq_7.booking__paid_at__extract_week
             , subq_7.booking__paid_at__extract_day
-            , subq_7.booking__paid_at__extract_dayofweek
-            , subq_7.booking__paid_at__extract_dayofyear
+            , subq_7.booking__paid_at__extract_dow
+            , subq_7.booking__paid_at__extract_doy
             , subq_7.ds__day AS metric_time__day
             , subq_7.ds__week AS metric_time__week
             , subq_7.ds__month AS metric_time__month
@@ -354,8 +354,8 @@ FROM (
             , subq_7.ds__extract_month AS metric_time__extract_month
             , subq_7.ds__extract_week AS metric_time__extract_week
             , subq_7.ds__extract_day AS metric_time__extract_day
-            , subq_7.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_7.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_7.ds__extract_dow AS metric_time__extract_dow
+            , subq_7.ds__extract_doy AS metric_time__extract_doy
             , subq_7.listing
             , subq_7.guest
             , subq_7.host
@@ -400,74 +400,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 933c4905c0..6afff7eaab 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -44,8 +44,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -56,8 +56,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -68,8 +68,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -80,8 +80,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -92,8 +92,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -104,8 +104,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -116,8 +116,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -162,74 +162,74 @@ FROM (
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                 , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                 , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 3c83f6b210..e0d87aa819 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -32,8 +32,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -150,74 +150,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -256,8 +256,8 @@ FROM (
             , subq_5.ds__extract_month
             , subq_5.ds__extract_week
             , subq_5.ds__extract_day
-            , subq_5.ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear
+            , subq_5.ds__extract_dow
+            , subq_5.ds__extract_doy
             , subq_5.created_at__day
             , subq_5.created_at__week
             , subq_5.created_at__month
@@ -268,8 +268,8 @@ FROM (
             , subq_5.created_at__extract_month
             , subq_5.created_at__extract_week
             , subq_5.created_at__extract_day
-            , subq_5.created_at__extract_dayofweek
-            , subq_5.created_at__extract_dayofyear
+            , subq_5.created_at__extract_dow
+            , subq_5.created_at__extract_doy
             , subq_5.listing__ds__day
             , subq_5.listing__ds__week
             , subq_5.listing__ds__month
@@ -280,8 +280,8 @@ FROM (
             , subq_5.listing__ds__extract_month
             , subq_5.listing__ds__extract_week
             , subq_5.listing__ds__extract_day
-            , subq_5.listing__ds__extract_dayofweek
-            , subq_5.listing__ds__extract_dayofyear
+            , subq_5.listing__ds__extract_dow
+            , subq_5.listing__ds__extract_doy
             , subq_5.listing__created_at__day
             , subq_5.listing__created_at__week
             , subq_5.listing__created_at__month
@@ -292,8 +292,8 @@ FROM (
             , subq_5.listing__created_at__extract_month
             , subq_5.listing__created_at__extract_week
             , subq_5.listing__created_at__extract_day
-            , subq_5.listing__created_at__extract_dayofweek
-            , subq_5.listing__created_at__extract_dayofyear
+            , subq_5.listing__created_at__extract_dow
+            , subq_5.listing__created_at__extract_doy
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -304,8 +304,8 @@ FROM (
             , subq_5.ds__extract_month AS metric_time__extract_month
             , subq_5.ds__extract_week AS metric_time__extract_week
             , subq_5.ds__extract_day AS metric_time__extract_day
-            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_5.ds__extract_dow AS metric_time__extract_dow
+            , subq_5.ds__extract_doy AS metric_time__extract_doy
             , subq_5.listing
             , subq_5.user
             , subq_5.listing__user
@@ -329,25 +329,25 @@ FROM (
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -356,25 +356,25 @@ FROM (
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
index 9a8ead4f06..ba0780ad72 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
@@ -45,8 +45,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -57,8 +57,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -69,8 +69,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -81,8 +81,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -93,8 +93,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -105,8 +105,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -117,8 +117,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -149,74 +149,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10015.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10015.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10015.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10015.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10015.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10015.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10015.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10015.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10015.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -250,8 +250,8 @@ FROM (
             , subq_3.window_start__extract_month AS window_start__extract_month
             , subq_3.window_start__extract_week AS window_start__extract_week
             , subq_3.window_start__extract_day AS window_start__extract_day
-            , subq_3.window_start__extract_dayofweek AS window_start__extract_dayofweek
-            , subq_3.window_start__extract_dayofyear AS window_start__extract_dayofyear
+            , subq_3.window_start__extract_dow AS window_start__extract_dow
+            , subq_3.window_start__extract_doy AS window_start__extract_doy
             , subq_3.window_end__day AS window_end__day
             , subq_3.window_end__week AS window_end__week
             , subq_3.window_end__month AS window_end__month
@@ -262,8 +262,8 @@ FROM (
             , subq_3.window_end__extract_month AS window_end__extract_month
             , subq_3.window_end__extract_week AS window_end__extract_week
             , subq_3.window_end__extract_day AS window_end__extract_day
-            , subq_3.window_end__extract_dayofweek AS window_end__extract_dayofweek
-            , subq_3.window_end__extract_dayofyear AS window_end__extract_dayofyear
+            , subq_3.window_end__extract_dow AS window_end__extract_dow
+            , subq_3.window_end__extract_doy AS window_end__extract_doy
             , subq_3.listing__window_start__day AS listing__window_start__day
             , subq_3.listing__window_start__week AS listing__window_start__week
             , subq_3.listing__window_start__month AS listing__window_start__month
@@ -274,8 +274,8 @@ FROM (
             , subq_3.listing__window_start__extract_month AS listing__window_start__extract_month
             , subq_3.listing__window_start__extract_week AS listing__window_start__extract_week
             , subq_3.listing__window_start__extract_day AS listing__window_start__extract_day
-            , subq_3.listing__window_start__extract_dayofweek AS listing__window_start__extract_dayofweek
-            , subq_3.listing__window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
+            , subq_3.listing__window_start__extract_dow AS listing__window_start__extract_dow
+            , subq_3.listing__window_start__extract_doy AS listing__window_start__extract_doy
             , subq_3.listing__window_end__day AS listing__window_end__day
             , subq_3.listing__window_end__week AS listing__window_end__week
             , subq_3.listing__window_end__month AS listing__window_end__month
@@ -286,8 +286,8 @@ FROM (
             , subq_3.listing__window_end__extract_month AS listing__window_end__extract_month
             , subq_3.listing__window_end__extract_week AS listing__window_end__extract_week
             , subq_3.listing__window_end__extract_day AS listing__window_end__extract_day
-            , subq_3.listing__window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
-            , subq_3.listing__window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
+            , subq_3.listing__window_end__extract_dow AS listing__window_end__extract_dow
+            , subq_3.listing__window_end__extract_doy AS listing__window_end__extract_doy
             , subq_5.ds__day AS user__ds__day
             , subq_5.ds__week AS user__ds__week
             , subq_5.ds__month AS user__ds__month
@@ -298,8 +298,8 @@ FROM (
             , subq_5.ds__extract_month AS user__ds__extract_month
             , subq_5.ds__extract_week AS user__ds__extract_week
             , subq_5.ds__extract_day AS user__ds__extract_day
-            , subq_5.ds__extract_dayofweek AS user__ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS user__ds__extract_dayofyear
+            , subq_5.ds__extract_dow AS user__ds__extract_dow
+            , subq_5.ds__extract_doy AS user__ds__extract_doy
             , subq_3.listing AS listing
             , subq_3.user AS user
             , subq_3.listing__user AS listing__user
@@ -318,25 +318,25 @@ FROM (
               , DATE_TRUNC(listings_src_10017.active_from, month) AS window_start__month
               , DATE_TRUNC(listings_src_10017.active_from, quarter) AS window_start__quarter
               , DATE_TRUNC(listings_src_10017.active_from, year) AS window_start__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
+              , EXTRACT(ISOWEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_doy
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC(listings_src_10017.active_to, isoweek) AS window_end__week
               , DATE_TRUNC(listings_src_10017.active_to, month) AS window_end__month
               , DATE_TRUNC(listings_src_10017.active_to, quarter) AS window_end__quarter
               , DATE_TRUNC(listings_src_10017.active_to, year) AS window_end__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
+              , EXTRACT(ISOWEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_doy
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -345,25 +345,25 @@ FROM (
               , DATE_TRUNC(listings_src_10017.active_from, month) AS listing__window_start__month
               , DATE_TRUNC(listings_src_10017.active_from, quarter) AS listing__window_start__quarter
               , DATE_TRUNC(listings_src_10017.active_from, year) AS listing__window_start__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+              , EXTRACT(ISOWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC(listings_src_10017.active_to, isoweek) AS listing__window_end__week
               , DATE_TRUNC(listings_src_10017.active_to, month) AS listing__window_end__month
               , DATE_TRUNC(listings_src_10017.active_to, quarter) AS listing__window_end__quarter
               , DATE_TRUNC(listings_src_10017.active_to, year) AS listing__window_end__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+              , EXTRACT(ISOWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -412,8 +412,8 @@ FROM (
               , subq_4.ds__extract_month
               , subq_4.ds__extract_week
               , subq_4.ds__extract_day
-              , subq_4.ds__extract_dayofweek
-              , subq_4.ds__extract_dayofyear
+              , subq_4.ds__extract_dow
+              , subq_4.ds__extract_doy
               , subq_4.user__ds__day
               , subq_4.user__ds__week
               , subq_4.user__ds__month
@@ -424,8 +424,8 @@ FROM (
               , subq_4.user__ds__extract_month
               , subq_4.user__ds__extract_week
               , subq_4.user__ds__extract_day
-              , subq_4.user__ds__extract_dayofweek
-              , subq_4.user__ds__extract_dayofyear
+              , subq_4.user__ds__extract_dow
+              , subq_4.user__ds__extract_doy
               , subq_4.user
               , subq_4.home_state_latest
               , subq_4.user__home_state_latest
@@ -437,26 +437,26 @@ FROM (
                 , DATE_TRUNC(users_latest_src_10021.ds, month) AS ds__month
                 , DATE_TRUNC(users_latest_src_10021.ds, quarter) AS ds__quarter
                 , DATE_TRUNC(users_latest_src_10021.ds, year) AS ds__year
-                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM users_latest_src_10021.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM users_latest_src_10021.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM users_latest_src_10021.ds) AS ds__extract_month
+                , EXTRACT(ISOWEEK FROM users_latest_src_10021.ds) AS ds__extract_week
+                , EXTRACT(day FROM users_latest_src_10021.ds) AS ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_doy
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC(users_latest_src_10021.ds, isoweek) AS user__ds__week
                 , DATE_TRUNC(users_latest_src_10021.ds, month) AS user__ds__month
                 , DATE_TRUNC(users_latest_src_10021.ds, quarter) AS user__ds__quarter
                 , DATE_TRUNC(users_latest_src_10021.ds, year) AS user__ds__year
-                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS user__ds__extract_year
-                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
-                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS user__ds__extract_month
-                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
-                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS user__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_dayofyear
+                , EXTRACT(year FROM users_latest_src_10021.ds) AS user__ds__extract_year
+                , EXTRACT(quarter FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
+                , EXTRACT(month FROM users_latest_src_10021.ds) AS user__ds__extract_month
+                , EXTRACT(ISOWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
+                , EXTRACT(day FROM users_latest_src_10021.ds) AS user__ds__extract_day
+                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dow
+                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_doy
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
index 2f2cded306..62d24b00ba 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
@@ -45,8 +45,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -57,8 +57,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -69,8 +69,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -81,8 +81,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -93,8 +93,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -105,8 +105,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -117,8 +117,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -149,74 +149,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10015.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10015.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10015.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10015.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10015.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10015.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10015.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10015.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10015.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -253,8 +253,8 @@ FROM (
             , subq_5.window_start__extract_month AS lux_listing__window_start__extract_month
             , subq_5.window_start__extract_week AS lux_listing__window_start__extract_week
             , subq_5.window_start__extract_day AS lux_listing__window_start__extract_day
-            , subq_5.window_start__extract_dayofweek AS lux_listing__window_start__extract_dayofweek
-            , subq_5.window_start__extract_dayofyear AS lux_listing__window_start__extract_dayofyear
+            , subq_5.window_start__extract_dow AS lux_listing__window_start__extract_dow
+            , subq_5.window_start__extract_doy AS lux_listing__window_start__extract_doy
             , subq_5.window_end__day AS lux_listing__window_end__day
             , subq_5.window_end__week AS lux_listing__window_end__week
             , subq_5.window_end__month AS lux_listing__window_end__month
@@ -265,8 +265,8 @@ FROM (
             , subq_5.window_end__extract_month AS lux_listing__window_end__extract_month
             , subq_5.window_end__extract_week AS lux_listing__window_end__extract_week
             , subq_5.window_end__extract_day AS lux_listing__window_end__extract_day
-            , subq_5.window_end__extract_dayofweek AS lux_listing__window_end__extract_dayofweek
-            , subq_5.window_end__extract_dayofyear AS lux_listing__window_end__extract_dayofyear
+            , subq_5.window_end__extract_dow AS lux_listing__window_end__extract_dow
+            , subq_5.window_end__extract_doy AS lux_listing__window_end__extract_doy
             , subq_3.listing AS listing
             , subq_3.lux_listing AS lux_listing
             , subq_3.listing__lux_listing AS listing__lux_listing
@@ -343,8 +343,8 @@ FROM (
               , subq_4.window_start__extract_month
               , subq_4.window_start__extract_week
               , subq_4.window_start__extract_day
-              , subq_4.window_start__extract_dayofweek
-              , subq_4.window_start__extract_dayofyear
+              , subq_4.window_start__extract_dow
+              , subq_4.window_start__extract_doy
               , subq_4.window_end__day
               , subq_4.window_end__week
               , subq_4.window_end__month
@@ -355,8 +355,8 @@ FROM (
               , subq_4.window_end__extract_month
               , subq_4.window_end__extract_week
               , subq_4.window_end__extract_day
-              , subq_4.window_end__extract_dayofweek
-              , subq_4.window_end__extract_dayofyear
+              , subq_4.window_end__extract_dow
+              , subq_4.window_end__extract_doy
               , subq_4.lux_listing__window_start__day
               , subq_4.lux_listing__window_start__week
               , subq_4.lux_listing__window_start__month
@@ -367,8 +367,8 @@ FROM (
               , subq_4.lux_listing__window_start__extract_month
               , subq_4.lux_listing__window_start__extract_week
               , subq_4.lux_listing__window_start__extract_day
-              , subq_4.lux_listing__window_start__extract_dayofweek
-              , subq_4.lux_listing__window_start__extract_dayofyear
+              , subq_4.lux_listing__window_start__extract_dow
+              , subq_4.lux_listing__window_start__extract_doy
               , subq_4.lux_listing__window_end__day
               , subq_4.lux_listing__window_end__week
               , subq_4.lux_listing__window_end__month
@@ -379,8 +379,8 @@ FROM (
               , subq_4.lux_listing__window_end__extract_month
               , subq_4.lux_listing__window_end__extract_week
               , subq_4.lux_listing__window_end__extract_day
-              , subq_4.lux_listing__window_end__extract_dayofweek
-              , subq_4.lux_listing__window_end__extract_dayofyear
+              , subq_4.lux_listing__window_end__extract_dow
+              , subq_4.lux_listing__window_end__extract_doy
               , subq_4.lux_listing
               , subq_4.is_confirmed_lux
               , subq_4.lux_listing__is_confirmed_lux
@@ -392,50 +392,50 @@ FROM (
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, month) AS window_start__month
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, quarter) AS window_start__quarter
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, year) AS window_start__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
+                , EXTRACT(ISOWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dow
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, isoweek) AS window_end__week
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, month) AS window_end__month
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, quarter) AS window_end__quarter
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, year) AS window_end__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
+                , EXTRACT(ISOWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dow
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, isoweek) AS lux_listing__window_start__week
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, month) AS lux_listing__window_start__month
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, quarter) AS lux_listing__window_start__quarter
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, year) AS lux_listing__window_start__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
+                , EXTRACT(ISOWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dow
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, isoweek) AS lux_listing__window_end__week
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, month) AS lux_listing__window_end__month
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, quarter) AS lux_listing__window_end__quarter
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, year) AS lux_listing__window_end__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+                , EXTRACT(ISOWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
+                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dow
+                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql
index 9c13f10eec..0b80e4d74f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql
@@ -33,74 +33,74 @@ FROM (
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -127,25 +127,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -154,25 +154,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -201,25 +201,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -228,25 +228,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
index b0ede76214..7e7b3ab4ea 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
@@ -41,8 +41,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.ds__day
             , subq_0.ds__week
             , subq_0.ds__month
@@ -53,8 +53,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.account_id__ds_partitioned__day
             , subq_0.account_id__ds_partitioned__week
             , subq_0.account_id__ds_partitioned__month
@@ -65,8 +65,8 @@ FROM (
             , subq_0.account_id__ds_partitioned__extract_month
             , subq_0.account_id__ds_partitioned__extract_week
             , subq_0.account_id__ds_partitioned__extract_day
-            , subq_0.account_id__ds_partitioned__extract_dayofweek
-            , subq_0.account_id__ds_partitioned__extract_dayofyear
+            , subq_0.account_id__ds_partitioned__extract_dow
+            , subq_0.account_id__ds_partitioned__extract_doy
             , subq_0.account_id__ds__day
             , subq_0.account_id__ds__week
             , subq_0.account_id__ds__month
@@ -77,8 +77,8 @@ FROM (
             , subq_0.account_id__ds__extract_month
             , subq_0.account_id__ds__extract_week
             , subq_0.account_id__ds__extract_day
-            , subq_0.account_id__ds__extract_dayofweek
-            , subq_0.account_id__ds__extract_dayofyear
+            , subq_0.account_id__ds__extract_dow
+            , subq_0.account_id__ds__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -89,8 +89,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.account_id
             , subq_0.account_month
             , subq_0.account_id__account_month
@@ -104,50 +104,50 @@ FROM (
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC(account_month_txns_src_10010.ds, isoweek) AS ds__week
               , DATE_TRUNC(account_month_txns_src_10010.ds, month) AS ds__month
               , DATE_TRUNC(account_month_txns_src_10010.ds, quarter) AS ds__quarter
               , DATE_TRUNC(account_month_txns_src_10010.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_doy
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, isoweek) AS account_id__ds_partitioned__week
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, month) AS account_id__ds_partitioned__month
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, quarter) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, year) AS account_id__ds_partitioned__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC(account_month_txns_src_10010.ds, isoweek) AS account_id__ds__week
               , DATE_TRUNC(account_month_txns_src_10010.ds, month) AS account_id__ds__month
               , DATE_TRUNC(account_month_txns_src_10010.ds, quarter) AS account_id__ds__quarter
               , DATE_TRUNC(account_month_txns_src_10010.ds, year) AS account_id__ds__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
+              , EXTRACT(ISOWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_doy
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -174,8 +174,8 @@ FROM (
             , subq_3.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_3.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_3.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_3.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_3.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_3.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_3.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_3.account_id__ds_partitioned__day AS account_id__ds_partitioned__day
             , subq_3.account_id__ds_partitioned__week AS account_id__ds_partitioned__week
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
@@ -186,8 +186,8 @@ FROM (
             , subq_3.account_id__ds_partitioned__extract_month AS account_id__ds_partitioned__extract_month
             , subq_3.account_id__ds_partitioned__extract_week AS account_id__ds_partitioned__extract_week
             , subq_3.account_id__ds_partitioned__extract_day AS account_id__ds_partitioned__extract_day
-            , subq_3.account_id__ds_partitioned__extract_dayofweek AS account_id__ds_partitioned__extract_dayofweek
-            , subq_3.account_id__ds_partitioned__extract_dayofyear AS account_id__ds_partitioned__extract_dayofyear
+            , subq_3.account_id__ds_partitioned__extract_dow AS account_id__ds_partitioned__extract_dow
+            , subq_3.account_id__ds_partitioned__extract_doy AS account_id__ds_partitioned__extract_doy
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
@@ -198,8 +198,8 @@ FROM (
             , subq_5.ds_partitioned__extract_month AS customer_id__ds_partitioned__extract_month
             , subq_5.ds_partitioned__extract_week AS customer_id__ds_partitioned__extract_week
             , subq_5.ds_partitioned__extract_day AS customer_id__ds_partitioned__extract_day
-            , subq_5.ds_partitioned__extract_dayofweek AS customer_id__ds_partitioned__extract_dayofweek
-            , subq_5.ds_partitioned__extract_dayofyear AS customer_id__ds_partitioned__extract_dayofyear
+            , subq_5.ds_partitioned__extract_dow AS customer_id__ds_partitioned__extract_dow
+            , subq_5.ds_partitioned__extract_doy AS customer_id__ds_partitioned__extract_doy
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
@@ -216,26 +216,26 @@ FROM (
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_doy
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, isoweek) AS account_id__ds_partitioned__week
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, month) AS account_id__ds_partitioned__month
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, quarter) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, year) AS account_id__ds_partitioned__year
-              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -283,8 +283,8 @@ FROM (
               , subq_4.ds_partitioned__extract_month
               , subq_4.ds_partitioned__extract_week
               , subq_4.ds_partitioned__extract_day
-              , subq_4.ds_partitioned__extract_dayofweek
-              , subq_4.ds_partitioned__extract_dayofyear
+              , subq_4.ds_partitioned__extract_dow
+              , subq_4.ds_partitioned__extract_doy
               , subq_4.customer_id__ds_partitioned__day
               , subq_4.customer_id__ds_partitioned__week
               , subq_4.customer_id__ds_partitioned__month
@@ -295,8 +295,8 @@ FROM (
               , subq_4.customer_id__ds_partitioned__extract_month
               , subq_4.customer_id__ds_partitioned__extract_week
               , subq_4.customer_id__ds_partitioned__extract_day
-              , subq_4.customer_id__ds_partitioned__extract_dayofweek
-              , subq_4.customer_id__ds_partitioned__extract_dayofyear
+              , subq_4.customer_id__ds_partitioned__extract_dow
+              , subq_4.customer_id__ds_partitioned__extract_doy
               , subq_4.customer_id
               , subq_4.customer_name
               , subq_4.customer_atomic_weight
@@ -312,13 +312,13 @@ FROM (
                 , DATE_TRUNC(customer_table_src_10013.ds_partitioned, month) AS ds_partitioned__month
                 , DATE_TRUNC(customer_table_src_10013.ds_partitioned, quarter) AS ds_partitioned__quarter
                 , DATE_TRUNC(customer_table_src_10013.ds_partitioned, year) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -326,13 +326,13 @@ FROM (
                 , DATE_TRUNC(customer_table_src_10013.ds_partitioned, month) AS customer_id__ds_partitioned__month
                 , DATE_TRUNC(customer_table_src_10013.ds_partitioned, quarter) AS customer_id__ds_partitioned__quarter
                 , DATE_TRUNC(customer_table_src_10013.ds_partitioned, year) AS customer_id__ds_partitioned__year
-                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
+                , EXTRACT(ISOWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
+                , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
+                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dow
+                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
index 7a1160e719..83d7b73587 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
@@ -28,8 +28,8 @@ FROM (
           , subq_1.ds__extract_month
           , subq_1.ds__extract_week
           , subq_1.ds__extract_day
-          , subq_1.ds__extract_dayofweek
-          , subq_1.ds__extract_dayofyear
+          , subq_1.ds__extract_dow
+          , subq_1.ds__extract_doy
           , subq_1.ds_partitioned__day
           , subq_1.ds_partitioned__week
           , subq_1.ds_partitioned__month
@@ -40,8 +40,8 @@ FROM (
           , subq_1.ds_partitioned__extract_month
           , subq_1.ds_partitioned__extract_week
           , subq_1.ds_partitioned__extract_day
-          , subq_1.ds_partitioned__extract_dayofweek
-          , subq_1.ds_partitioned__extract_dayofyear
+          , subq_1.ds_partitioned__extract_dow
+          , subq_1.ds_partitioned__extract_doy
           , subq_1.paid_at__day
           , subq_1.paid_at__week
           , subq_1.paid_at__month
@@ -52,8 +52,8 @@ FROM (
           , subq_1.paid_at__extract_month
           , subq_1.paid_at__extract_week
           , subq_1.paid_at__extract_day
-          , subq_1.paid_at__extract_dayofweek
-          , subq_1.paid_at__extract_dayofyear
+          , subq_1.paid_at__extract_dow
+          , subq_1.paid_at__extract_doy
           , subq_1.booking__ds__day
           , subq_1.booking__ds__week
           , subq_1.booking__ds__month
@@ -64,8 +64,8 @@ FROM (
           , subq_1.booking__ds__extract_month
           , subq_1.booking__ds__extract_week
           , subq_1.booking__ds__extract_day
-          , subq_1.booking__ds__extract_dayofweek
-          , subq_1.booking__ds__extract_dayofyear
+          , subq_1.booking__ds__extract_dow
+          , subq_1.booking__ds__extract_doy
           , subq_1.booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month
@@ -76,8 +76,8 @@ FROM (
           , subq_1.booking__ds_partitioned__extract_month
           , subq_1.booking__ds_partitioned__extract_week
           , subq_1.booking__ds_partitioned__extract_day
-          , subq_1.booking__ds_partitioned__extract_dayofweek
-          , subq_1.booking__ds_partitioned__extract_dayofyear
+          , subq_1.booking__ds_partitioned__extract_dow
+          , subq_1.booking__ds_partitioned__extract_doy
           , subq_1.booking__paid_at__day
           , subq_1.booking__paid_at__week
           , subq_1.booking__paid_at__month
@@ -88,8 +88,8 @@ FROM (
           , subq_1.booking__paid_at__extract_month
           , subq_1.booking__paid_at__extract_week
           , subq_1.booking__paid_at__extract_day
-          , subq_1.booking__paid_at__extract_dayofweek
-          , subq_1.booking__paid_at__extract_dayofyear
+          , subq_1.booking__paid_at__extract_dow
+          , subq_1.booking__paid_at__extract_doy
           , subq_1.metric_time__day
           , subq_1.metric_time__week
           , subq_1.metric_time__month
@@ -100,8 +100,8 @@ FROM (
           , subq_1.metric_time__extract_month
           , subq_1.metric_time__extract_week
           , subq_1.metric_time__extract_day
-          , subq_1.metric_time__extract_dayofweek
-          , subq_1.metric_time__extract_dayofyear
+          , subq_1.metric_time__extract_dow
+          , subq_1.metric_time__extract_doy
           , subq_1.listing
           , subq_1.guest
           , subq_1.host
@@ -136,8 +136,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -148,8 +148,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -160,8 +160,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -172,8 +172,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -184,8 +184,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -196,8 +196,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -208,8 +208,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -254,74 +254,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -362,8 +362,8 @@ CROSS JOIN (
           , subq_7.ds__extract_month
           , subq_7.ds__extract_week
           , subq_7.ds__extract_day
-          , subq_7.ds__extract_dayofweek
-          , subq_7.ds__extract_dayofyear
+          , subq_7.ds__extract_dow
+          , subq_7.ds__extract_doy
           , subq_7.created_at__day
           , subq_7.created_at__week
           , subq_7.created_at__month
@@ -374,8 +374,8 @@ CROSS JOIN (
           , subq_7.created_at__extract_month
           , subq_7.created_at__extract_week
           , subq_7.created_at__extract_day
-          , subq_7.created_at__extract_dayofweek
-          , subq_7.created_at__extract_dayofyear
+          , subq_7.created_at__extract_dow
+          , subq_7.created_at__extract_doy
           , subq_7.listing__ds__day
           , subq_7.listing__ds__week
           , subq_7.listing__ds__month
@@ -386,8 +386,8 @@ CROSS JOIN (
           , subq_7.listing__ds__extract_month
           , subq_7.listing__ds__extract_week
           , subq_7.listing__ds__extract_day
-          , subq_7.listing__ds__extract_dayofweek
-          , subq_7.listing__ds__extract_dayofyear
+          , subq_7.listing__ds__extract_dow
+          , subq_7.listing__ds__extract_doy
           , subq_7.listing__created_at__day
           , subq_7.listing__created_at__week
           , subq_7.listing__created_at__month
@@ -398,8 +398,8 @@ CROSS JOIN (
           , subq_7.listing__created_at__extract_month
           , subq_7.listing__created_at__extract_week
           , subq_7.listing__created_at__extract_day
-          , subq_7.listing__created_at__extract_dayofweek
-          , subq_7.listing__created_at__extract_dayofyear
+          , subq_7.listing__created_at__extract_dow
+          , subq_7.listing__created_at__extract_doy
           , subq_7.metric_time__day
           , subq_7.metric_time__week
           , subq_7.metric_time__month
@@ -410,8 +410,8 @@ CROSS JOIN (
           , subq_7.metric_time__extract_month
           , subq_7.metric_time__extract_week
           , subq_7.metric_time__extract_day
-          , subq_7.metric_time__extract_dayofweek
-          , subq_7.metric_time__extract_dayofyear
+          , subq_7.metric_time__extract_dow
+          , subq_7.metric_time__extract_doy
           , subq_7.listing
           , subq_7.user
           , subq_7.listing__user
@@ -437,8 +437,8 @@ CROSS JOIN (
             , subq_6.ds__extract_month
             , subq_6.ds__extract_week
             , subq_6.ds__extract_day
-            , subq_6.ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear
+            , subq_6.ds__extract_dow
+            , subq_6.ds__extract_doy
             , subq_6.created_at__day
             , subq_6.created_at__week
             , subq_6.created_at__month
@@ -449,8 +449,8 @@ CROSS JOIN (
             , subq_6.created_at__extract_month
             , subq_6.created_at__extract_week
             , subq_6.created_at__extract_day
-            , subq_6.created_at__extract_dayofweek
-            , subq_6.created_at__extract_dayofyear
+            , subq_6.created_at__extract_dow
+            , subq_6.created_at__extract_doy
             , subq_6.listing__ds__day
             , subq_6.listing__ds__week
             , subq_6.listing__ds__month
@@ -461,8 +461,8 @@ CROSS JOIN (
             , subq_6.listing__ds__extract_month
             , subq_6.listing__ds__extract_week
             , subq_6.listing__ds__extract_day
-            , subq_6.listing__ds__extract_dayofweek
-            , subq_6.listing__ds__extract_dayofyear
+            , subq_6.listing__ds__extract_dow
+            , subq_6.listing__ds__extract_doy
             , subq_6.listing__created_at__day
             , subq_6.listing__created_at__week
             , subq_6.listing__created_at__month
@@ -473,8 +473,8 @@ CROSS JOIN (
             , subq_6.listing__created_at__extract_month
             , subq_6.listing__created_at__extract_week
             , subq_6.listing__created_at__extract_day
-            , subq_6.listing__created_at__extract_dayofweek
-            , subq_6.listing__created_at__extract_dayofyear
+            , subq_6.listing__created_at__extract_dow
+            , subq_6.listing__created_at__extract_doy
             , subq_6.ds__day AS metric_time__day
             , subq_6.ds__week AS metric_time__week
             , subq_6.ds__month AS metric_time__month
@@ -485,8 +485,8 @@ CROSS JOIN (
             , subq_6.ds__extract_month AS metric_time__extract_month
             , subq_6.ds__extract_week AS metric_time__extract_week
             , subq_6.ds__extract_day AS metric_time__extract_day
-            , subq_6.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_6.ds__extract_dow AS metric_time__extract_dow
+            , subq_6.ds__extract_doy AS metric_time__extract_doy
             , subq_6.listing
             , subq_6.user
             , subq_6.listing__user
@@ -510,25 +510,25 @@ CROSS JOIN (
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -537,25 +537,25 @@ CROSS JOIN (
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
               , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
               , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
index 530e65ec20..9037a9f0bb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
@@ -49,8 +49,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -61,8 +61,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -73,8 +73,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -85,8 +85,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -97,8 +97,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -109,8 +109,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -121,8 +121,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -167,74 +167,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -278,8 +278,8 @@ FROM (
                 , subq_5.ds__extract_month
                 , subq_5.ds__extract_week
                 , subq_5.ds__extract_day
-                , subq_5.ds__extract_dayofweek
-                , subq_5.ds__extract_dayofyear
+                , subq_5.ds__extract_dow
+                , subq_5.ds__extract_doy
                 , subq_5.ds_partitioned__day
                 , subq_5.ds_partitioned__week
                 , subq_5.ds_partitioned__month
@@ -290,8 +290,8 @@ FROM (
                 , subq_5.ds_partitioned__extract_month
                 , subq_5.ds_partitioned__extract_week
                 , subq_5.ds_partitioned__extract_day
-                , subq_5.ds_partitioned__extract_dayofweek
-                , subq_5.ds_partitioned__extract_dayofyear
+                , subq_5.ds_partitioned__extract_dow
+                , subq_5.ds_partitioned__extract_doy
                 , subq_5.paid_at__day
                 , subq_5.paid_at__week
                 , subq_5.paid_at__month
@@ -302,8 +302,8 @@ FROM (
                 , subq_5.paid_at__extract_month
                 , subq_5.paid_at__extract_week
                 , subq_5.paid_at__extract_day
-                , subq_5.paid_at__extract_dayofweek
-                , subq_5.paid_at__extract_dayofyear
+                , subq_5.paid_at__extract_dow
+                , subq_5.paid_at__extract_doy
                 , subq_5.booking__ds__day
                 , subq_5.booking__ds__week
                 , subq_5.booking__ds__month
@@ -314,8 +314,8 @@ FROM (
                 , subq_5.booking__ds__extract_month
                 , subq_5.booking__ds__extract_week
                 , subq_5.booking__ds__extract_day
-                , subq_5.booking__ds__extract_dayofweek
-                , subq_5.booking__ds__extract_dayofyear
+                , subq_5.booking__ds__extract_dow
+                , subq_5.booking__ds__extract_doy
                 , subq_5.booking__ds_partitioned__day
                 , subq_5.booking__ds_partitioned__week
                 , subq_5.booking__ds_partitioned__month
@@ -326,8 +326,8 @@ FROM (
                 , subq_5.booking__ds_partitioned__extract_month
                 , subq_5.booking__ds_partitioned__extract_week
                 , subq_5.booking__ds_partitioned__extract_day
-                , subq_5.booking__ds_partitioned__extract_dayofweek
-                , subq_5.booking__ds_partitioned__extract_dayofyear
+                , subq_5.booking__ds_partitioned__extract_dow
+                , subq_5.booking__ds_partitioned__extract_doy
                 , subq_5.booking__paid_at__day
                 , subq_5.booking__paid_at__week
                 , subq_5.booking__paid_at__month
@@ -338,8 +338,8 @@ FROM (
                 , subq_5.booking__paid_at__extract_month
                 , subq_5.booking__paid_at__extract_week
                 , subq_5.booking__paid_at__extract_day
-                , subq_5.booking__paid_at__extract_dayofweek
-                , subq_5.booking__paid_at__extract_dayofyear
+                , subq_5.booking__paid_at__extract_dow
+                , subq_5.booking__paid_at__extract_doy
                 , subq_5.ds__day AS metric_time__day
                 , subq_5.ds__week AS metric_time__week
                 , subq_5.ds__month AS metric_time__month
@@ -350,8 +350,8 @@ FROM (
                 , subq_5.ds__extract_month AS metric_time__extract_month
                 , subq_5.ds__extract_week AS metric_time__extract_week
                 , subq_5.ds__extract_day AS metric_time__extract_day
-                , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_5.ds__extract_dow AS metric_time__extract_dow
+                , subq_5.ds__extract_doy AS metric_time__extract_doy
                 , subq_5.listing
                 , subq_5.guest
                 , subq_5.host
@@ -396,74 +396,74 @@ FROM (
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
                   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
                   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -519,8 +519,8 @@ FROM (
             , subq_12.ds__extract_month
             , subq_12.ds__extract_week
             , subq_12.ds__extract_day
-            , subq_12.ds__extract_dayofweek
-            , subq_12.ds__extract_dayofyear
+            , subq_12.ds__extract_dow
+            , subq_12.ds__extract_doy
             , subq_12.ds_partitioned__day
             , subq_12.ds_partitioned__week
             , subq_12.ds_partitioned__month
@@ -531,8 +531,8 @@ FROM (
             , subq_12.ds_partitioned__extract_month
             , subq_12.ds_partitioned__extract_week
             , subq_12.ds_partitioned__extract_day
-            , subq_12.ds_partitioned__extract_dayofweek
-            , subq_12.ds_partitioned__extract_dayofyear
+            , subq_12.ds_partitioned__extract_dow
+            , subq_12.ds_partitioned__extract_doy
             , subq_12.paid_at__day
             , subq_12.paid_at__week
             , subq_12.paid_at__month
@@ -543,8 +543,8 @@ FROM (
             , subq_12.paid_at__extract_month
             , subq_12.paid_at__extract_week
             , subq_12.paid_at__extract_day
-            , subq_12.paid_at__extract_dayofweek
-            , subq_12.paid_at__extract_dayofyear
+            , subq_12.paid_at__extract_dow
+            , subq_12.paid_at__extract_doy
             , subq_12.booking__ds__day
             , subq_12.booking__ds__week
             , subq_12.booking__ds__month
@@ -555,8 +555,8 @@ FROM (
             , subq_12.booking__ds__extract_month
             , subq_12.booking__ds__extract_week
             , subq_12.booking__ds__extract_day
-            , subq_12.booking__ds__extract_dayofweek
-            , subq_12.booking__ds__extract_dayofyear
+            , subq_12.booking__ds__extract_dow
+            , subq_12.booking__ds__extract_doy
             , subq_12.booking__ds_partitioned__day
             , subq_12.booking__ds_partitioned__week
             , subq_12.booking__ds_partitioned__month
@@ -567,8 +567,8 @@ FROM (
             , subq_12.booking__ds_partitioned__extract_month
             , subq_12.booking__ds_partitioned__extract_week
             , subq_12.booking__ds_partitioned__extract_day
-            , subq_12.booking__ds_partitioned__extract_dayofweek
-            , subq_12.booking__ds_partitioned__extract_dayofyear
+            , subq_12.booking__ds_partitioned__extract_dow
+            , subq_12.booking__ds_partitioned__extract_doy
             , subq_12.booking__paid_at__day
             , subq_12.booking__paid_at__week
             , subq_12.booking__paid_at__month
@@ -579,8 +579,8 @@ FROM (
             , subq_12.booking__paid_at__extract_month
             , subq_12.booking__paid_at__extract_week
             , subq_12.booking__paid_at__extract_day
-            , subq_12.booking__paid_at__extract_dayofweek
-            , subq_12.booking__paid_at__extract_dayofyear
+            , subq_12.booking__paid_at__extract_dow
+            , subq_12.booking__paid_at__extract_doy
             , subq_12.ds__day AS metric_time__day
             , subq_12.ds__week AS metric_time__week
             , subq_12.ds__month AS metric_time__month
@@ -591,8 +591,8 @@ FROM (
             , subq_12.ds__extract_month AS metric_time__extract_month
             , subq_12.ds__extract_week AS metric_time__extract_week
             , subq_12.ds__extract_day AS metric_time__extract_day
-            , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_12.ds__extract_dow AS metric_time__extract_dow
+            , subq_12.ds__extract_doy AS metric_time__extract_doy
             , subq_12.listing
             , subq_12.guest
             , subq_12.host
@@ -637,74 +637,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -758,8 +758,8 @@ FROM (
             , subq_17.ds__extract_month
             , subq_17.ds__extract_week
             , subq_17.ds__extract_day
-            , subq_17.ds__extract_dayofweek
-            , subq_17.ds__extract_dayofyear
+            , subq_17.ds__extract_dow
+            , subq_17.ds__extract_doy
             , subq_17.ds_partitioned__day
             , subq_17.ds_partitioned__week
             , subq_17.ds_partitioned__month
@@ -770,8 +770,8 @@ FROM (
             , subq_17.ds_partitioned__extract_month
             , subq_17.ds_partitioned__extract_week
             , subq_17.ds_partitioned__extract_day
-            , subq_17.ds_partitioned__extract_dayofweek
-            , subq_17.ds_partitioned__extract_dayofyear
+            , subq_17.ds_partitioned__extract_dow
+            , subq_17.ds_partitioned__extract_doy
             , subq_17.paid_at__day
             , subq_17.paid_at__week
             , subq_17.paid_at__month
@@ -782,8 +782,8 @@ FROM (
             , subq_17.paid_at__extract_month
             , subq_17.paid_at__extract_week
             , subq_17.paid_at__extract_day
-            , subq_17.paid_at__extract_dayofweek
-            , subq_17.paid_at__extract_dayofyear
+            , subq_17.paid_at__extract_dow
+            , subq_17.paid_at__extract_doy
             , subq_17.booking__ds__day
             , subq_17.booking__ds__week
             , subq_17.booking__ds__month
@@ -794,8 +794,8 @@ FROM (
             , subq_17.booking__ds__extract_month
             , subq_17.booking__ds__extract_week
             , subq_17.booking__ds__extract_day
-            , subq_17.booking__ds__extract_dayofweek
-            , subq_17.booking__ds__extract_dayofyear
+            , subq_17.booking__ds__extract_dow
+            , subq_17.booking__ds__extract_doy
             , subq_17.booking__ds_partitioned__day
             , subq_17.booking__ds_partitioned__week
             , subq_17.booking__ds_partitioned__month
@@ -806,8 +806,8 @@ FROM (
             , subq_17.booking__ds_partitioned__extract_month
             , subq_17.booking__ds_partitioned__extract_week
             , subq_17.booking__ds_partitioned__extract_day
-            , subq_17.booking__ds_partitioned__extract_dayofweek
-            , subq_17.booking__ds_partitioned__extract_dayofyear
+            , subq_17.booking__ds_partitioned__extract_dow
+            , subq_17.booking__ds_partitioned__extract_doy
             , subq_17.booking__paid_at__day
             , subq_17.booking__paid_at__week
             , subq_17.booking__paid_at__month
@@ -818,8 +818,8 @@ FROM (
             , subq_17.booking__paid_at__extract_month
             , subq_17.booking__paid_at__extract_week
             , subq_17.booking__paid_at__extract_day
-            , subq_17.booking__paid_at__extract_dayofweek
-            , subq_17.booking__paid_at__extract_dayofyear
+            , subq_17.booking__paid_at__extract_dow
+            , subq_17.booking__paid_at__extract_doy
             , subq_17.ds__day AS metric_time__day
             , subq_17.ds__week AS metric_time__week
             , subq_17.ds__month AS metric_time__month
@@ -830,8 +830,8 @@ FROM (
             , subq_17.ds__extract_month AS metric_time__extract_month
             , subq_17.ds__extract_week AS metric_time__extract_week
             , subq_17.ds__extract_day AS metric_time__extract_day
-            , subq_17.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_17.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_17.ds__extract_dow AS metric_time__extract_dow
+            , subq_17.ds__extract_doy AS metric_time__extract_doy
             , subq_17.listing
             , subq_17.guest
             , subq_17.host
@@ -876,74 +876,74 @@ FROM (
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
               , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
               , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
               , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
               , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql
index 6fe53f5780..61c29db82f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql
@@ -45,74 +45,74 @@ FROM (
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
           , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
           , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
           , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
           , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
index ce7f3ffa85..2fff30c78d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
@@ -41,8 +41,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -53,8 +53,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.verification__ds__day
             , subq_0.verification__ds__week
             , subq_0.verification__ds__month
@@ -65,8 +65,8 @@ FROM (
             , subq_0.verification__ds__extract_month
             , subq_0.verification__ds__extract_week
             , subq_0.verification__ds__extract_day
-            , subq_0.verification__ds__extract_dayofweek
-            , subq_0.verification__ds__extract_dayofyear
+            , subq_0.verification__ds__extract_dow
+            , subq_0.verification__ds__extract_doy
             , subq_0.verification__ds_partitioned__day
             , subq_0.verification__ds_partitioned__week
             , subq_0.verification__ds_partitioned__month
@@ -77,8 +77,8 @@ FROM (
             , subq_0.verification__ds_partitioned__extract_month
             , subq_0.verification__ds_partitioned__extract_week
             , subq_0.verification__ds_partitioned__extract_day
-            , subq_0.verification__ds_partitioned__extract_dayofweek
-            , subq_0.verification__ds_partitioned__extract_dayofyear
+            , subq_0.verification__ds_partitioned__extract_dow
+            , subq_0.verification__ds_partitioned__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -89,8 +89,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.verification
             , subq_0.user
             , subq_0.verification__user
@@ -106,50 +106,50 @@ FROM (
               , DATE_TRUNC(id_verifications_src_10003.ds, month) AS ds__month
               , DATE_TRUNC(id_verifications_src_10003.ds, quarter) AS ds__quarter
               , DATE_TRUNC(id_verifications_src_10003.ds, year) AS ds__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
+              , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, month) AS ds_partitioned__month
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, quarter) AS ds_partitioned__quarter
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, year) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC(id_verifications_src_10003.ds, isoweek) AS verification__ds__week
               , DATE_TRUNC(id_verifications_src_10003.ds, month) AS verification__ds__month
               , DATE_TRUNC(id_verifications_src_10003.ds, quarter) AS verification__ds__quarter
               , DATE_TRUNC(id_verifications_src_10003.ds, year) AS verification__ds__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+              , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, isoweek) AS verification__ds_partitioned__week
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, month) AS verification__ds_partitioned__month
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, quarter) AS verification__ds_partitioned__quarter
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, year) AS verification__ds_partitioned__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+              , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -173,74 +173,74 @@ FROM (
             , DATE_TRUNC(users_ds_source_src_10007.ds, month) AS ds__month
             , DATE_TRUNC(users_ds_source_src_10007.ds, quarter) AS ds__quarter
             , DATE_TRUNC(users_ds_source_src_10007.ds, year) AS ds__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds) AS ds__extract_month
+            , EXTRACT(ISOWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_doy
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC(users_ds_source_src_10007.created_at, isoweek) AS created_at__week
             , DATE_TRUNC(users_ds_source_src_10007.created_at, month) AS created_at__month
             , DATE_TRUNC(users_ds_source_src_10007.created_at, quarter) AS created_at__quarter
             , DATE_TRUNC(users_ds_source_src_10007.created_at, year) AS created_at__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
+            , EXTRACT(ISOWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, year) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC(users_ds_source_src_10007.ds, isoweek) AS user__ds__week
             , DATE_TRUNC(users_ds_source_src_10007.ds, month) AS user__ds__month
             , DATE_TRUNC(users_ds_source_src_10007.ds, quarter) AS user__ds__quarter
             , DATE_TRUNC(users_ds_source_src_10007.ds, year) AS user__ds__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
+            , EXTRACT(ISOWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_doy
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC(users_ds_source_src_10007.created_at, isoweek) AS user__created_at__week
             , DATE_TRUNC(users_ds_source_src_10007.created_at, month) AS user__created_at__month
             , DATE_TRUNC(users_ds_source_src_10007.created_at, quarter) AS user__created_at__quarter
             , DATE_TRUNC(users_ds_source_src_10007.created_at, year) AS user__created_at__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
+            , EXTRACT(ISOWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, isoweek) AS user__ds_partitioned__week
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, month) AS user__ds_partitioned__month
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, quarter) AS user__ds_partitioned__quarter
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, year) AS user__ds_partitioned__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql
index febccc91aa..791d0d4049 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC(accounts_source_src_10000.ds, month) AS ds__month
     , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS ds__quarter
     , DATE_TRUNC(accounts_source_src_10000.ds, year) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
     , DATE_TRUNC(accounts_source_src_10000.ds, month) AS account__ds__month
     , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS account__ds__quarter
     , DATE_TRUNC(accounts_source_src_10000.ds, year) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -82,26 +82,26 @@ INNER JOIN (
       , DATE_TRUNC(accounts_source_src_10000.ds, month) AS ds__month
       , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS ds__quarter
       , DATE_TRUNC(accounts_source_src_10000.ds, year) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
       , DATE_TRUNC(accounts_source_src_10000.ds, month) AS account__ds__month
       , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS account__ds__quarter
       , DATE_TRUNC(accounts_source_src_10000.ds, year) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
index 17d01a31fc..0f94ea6726 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC(ds, month) AS ds__month
     , DATE_TRUNC(ds, quarter) AS ds__quarter
     , DATE_TRUNC(ds, year) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(ISOWEEK FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC(ds, isoweek) AS account__ds__week
     , DATE_TRUNC(ds, month) AS account__ds__month
     , DATE_TRUNC(ds, quarter) AS account__ds__quarter
     , DATE_TRUNC(ds, year) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(ISOWEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
index cc5ef6ef07..1e815dd2dc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC(accounts_source_src_10000.ds, month) AS ds__month
     , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS ds__quarter
     , DATE_TRUNC(accounts_source_src_10000.ds, year) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
     , DATE_TRUNC(accounts_source_src_10000.ds, month) AS account__ds__month
     , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS account__ds__quarter
     , DATE_TRUNC(accounts_source_src_10000.ds, year) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -83,26 +83,26 @@ INNER JOIN (
       , DATE_TRUNC(accounts_source_src_10000.ds, month) AS ds__month
       , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS ds__quarter
       , DATE_TRUNC(accounts_source_src_10000.ds, year) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
       , DATE_TRUNC(accounts_source_src_10000.ds, month) AS account__ds__month
       , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS account__ds__quarter
       , DATE_TRUNC(accounts_source_src_10000.ds, year) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index 8fbb61349d..a25638e888 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC(ds, month) AS ds__month
     , DATE_TRUNC(ds, quarter) AS ds__quarter
     , DATE_TRUNC(ds, year) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(ISOWEEK FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC(ds, isoweek) AS account__ds__week
     , DATE_TRUNC(ds, month) AS account__ds__month
     , DATE_TRUNC(ds, quarter) AS account__ds__quarter
     , DATE_TRUNC(ds, year) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(ISOWEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index ab91ef4285..de371ca618 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC(accounts_source_src_10000.ds, month) AS ds__month
     , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS ds__quarter
     , DATE_TRUNC(accounts_source_src_10000.ds, year) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
     , DATE_TRUNC(accounts_source_src_10000.ds, month) AS account__ds__month
     , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS account__ds__quarter
     , DATE_TRUNC(accounts_source_src_10000.ds, year) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -83,26 +83,26 @@ INNER JOIN (
       , DATE_TRUNC(accounts_source_src_10000.ds, month) AS ds__month
       , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS ds__quarter
       , DATE_TRUNC(accounts_source_src_10000.ds, year) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
       , DATE_TRUNC(accounts_source_src_10000.ds, month) AS account__ds__month
       , DATE_TRUNC(accounts_source_src_10000.ds, quarter) AS account__ds__quarter
       , DATE_TRUNC(accounts_source_src_10000.ds, year) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index c1a7811068..35af81c4d7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC(ds, month) AS ds__month
     , DATE_TRUNC(ds, quarter) AS ds__quarter
     , DATE_TRUNC(ds, year) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(ISOWEEK FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC(ds, isoweek) AS account__ds__week
     , DATE_TRUNC(ds, month) AS account__ds__month
     , DATE_TRUNC(ds, quarter) AS account__ds__quarter
     , DATE_TRUNC(ds, year) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(ISOWEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql
index 2f7370d5ba..794337f673 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql
@@ -31,74 +31,74 @@ FROM (
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
       , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
       , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
       , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
       , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -125,25 +125,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS ds__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS ds__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS created_at__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -152,25 +152,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__ds__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__ds__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
       , DATE_TRUNC(listings_latest_src_10004.created_at, quarter) AS listing__created_at__quarter
       , DATE_TRUNC(listings_latest_src_10004.created_at, year) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql
index 2f0a3bb53b..28daacf7ef 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql
@@ -20,74 +20,74 @@ SELECT
   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
   , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
   , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
   , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
   , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
   , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql
index d68f494296..b6c163b9eb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql
@@ -20,74 +20,74 @@ SELECT
   , DATE_TRUNC(ds, month) AS ds__month
   , DATE_TRUNC(ds, quarter) AS ds__quarter
   , DATE_TRUNC(ds, year) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(ISOWEEK FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS ds_partitioned__month
   , DATE_TRUNC(ds_partitioned, quarter) AS ds_partitioned__quarter
   , DATE_TRUNC(ds_partitioned, year) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(ISOWEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS paid_at__week
   , DATE_TRUNC(paid_at, month) AS paid_at__month
   , DATE_TRUNC(paid_at, quarter) AS paid_at__quarter
   , DATE_TRUNC(paid_at, year) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(ISOWEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_doy
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC(ds, isoweek) AS booking__ds__week
   , DATE_TRUNC(ds, month) AS booking__ds__month
   , DATE_TRUNC(ds, quarter) AS booking__ds__quarter
   , DATE_TRUNC(ds, year) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(ISOWEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS booking__ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS booking__ds_partitioned__month
   , DATE_TRUNC(ds_partitioned, quarter) AS booking__ds_partitioned__quarter
   , DATE_TRUNC(ds_partitioned, year) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(ISOWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS booking__paid_at__week
   , DATE_TRUNC(paid_at, month) AS booking__paid_at__month
   , DATE_TRUNC(paid_at, quarter) AS booking__paid_at__quarter
   , DATE_TRUNC(paid_at, year) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(ISOWEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql
index e98764d3a8..b954d8927e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_common_semantic_model__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -150,74 +150,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -261,8 +261,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month
           , subq_5.ds__extract_week
           , subq_5.ds__extract_day
-          , subq_5.ds__extract_dayofweek
-          , subq_5.ds__extract_dayofyear
+          , subq_5.ds__extract_dow
+          , subq_5.ds__extract_doy
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
@@ -273,8 +273,8 @@ FULL OUTER JOIN (
           , subq_5.ds_partitioned__extract_month
           , subq_5.ds_partitioned__extract_week
           , subq_5.ds_partitioned__extract_day
-          , subq_5.ds_partitioned__extract_dayofweek
-          , subq_5.ds_partitioned__extract_dayofyear
+          , subq_5.ds_partitioned__extract_dow
+          , subq_5.ds_partitioned__extract_doy
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
@@ -285,8 +285,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month
           , subq_5.paid_at__extract_week
           , subq_5.paid_at__extract_day
-          , subq_5.paid_at__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear
+          , subq_5.paid_at__extract_dow
+          , subq_5.paid_at__extract_doy
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
@@ -297,8 +297,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds__extract_month
           , subq_5.booking__ds__extract_week
           , subq_5.booking__ds__extract_day
-          , subq_5.booking__ds__extract_dayofweek
-          , subq_5.booking__ds__extract_dayofyear
+          , subq_5.booking__ds__extract_dow
+          , subq_5.booking__ds__extract_doy
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
@@ -309,8 +309,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds_partitioned__extract_month
           , subq_5.booking__ds_partitioned__extract_week
           , subq_5.booking__ds_partitioned__extract_day
-          , subq_5.booking__ds_partitioned__extract_dayofweek
-          , subq_5.booking__ds_partitioned__extract_dayofyear
+          , subq_5.booking__ds_partitioned__extract_dow
+          , subq_5.booking__ds_partitioned__extract_doy
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
@@ -321,8 +321,8 @@ FULL OUTER JOIN (
           , subq_5.booking__paid_at__extract_month
           , subq_5.booking__paid_at__extract_week
           , subq_5.booking__paid_at__extract_day
-          , subq_5.booking__paid_at__extract_dayofweek
-          , subq_5.booking__paid_at__extract_dayofyear
+          , subq_5.booking__paid_at__extract_dow
+          , subq_5.booking__paid_at__extract_doy
           , subq_5.ds__day AS metric_time__day
           , subq_5.ds__week AS metric_time__week
           , subq_5.ds__month AS metric_time__month
@@ -333,8 +333,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month AS metric_time__extract_month
           , subq_5.ds__extract_week AS metric_time__extract_week
           , subq_5.ds__extract_day AS metric_time__extract_day
-          , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_5.ds__extract_dow AS metric_time__extract_dow
+          , subq_5.ds__extract_doy AS metric_time__extract_doy
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
@@ -379,74 +379,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql
index 9ddc5fe579..b1bf877e84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node__plan0.sql
@@ -44,74 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -138,25 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -165,25 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 83df46b3c4..5373f3b9a9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -56,8 +56,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -68,8 +68,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -80,8 +80,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -92,8 +92,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -104,8 +104,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -116,8 +116,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -128,8 +128,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -174,74 +174,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -271,8 +271,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -283,8 +283,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -295,8 +295,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -307,8 +307,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -319,8 +319,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -344,25 +344,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -371,25 +371,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -455,8 +455,8 @@ FROM (
                 , subq_10.ds__extract_month
                 , subq_10.ds__extract_week
                 , subq_10.ds__extract_day
-                , subq_10.ds__extract_dayofweek
-                , subq_10.ds__extract_dayofyear
+                , subq_10.ds__extract_dow
+                , subq_10.ds__extract_doy
                 , subq_10.ds_partitioned__day
                 , subq_10.ds_partitioned__week
                 , subq_10.ds_partitioned__month
@@ -467,8 +467,8 @@ FROM (
                 , subq_10.ds_partitioned__extract_month
                 , subq_10.ds_partitioned__extract_week
                 , subq_10.ds_partitioned__extract_day
-                , subq_10.ds_partitioned__extract_dayofweek
-                , subq_10.ds_partitioned__extract_dayofyear
+                , subq_10.ds_partitioned__extract_dow
+                , subq_10.ds_partitioned__extract_doy
                 , subq_10.view__ds__day
                 , subq_10.view__ds__week
                 , subq_10.view__ds__month
@@ -479,8 +479,8 @@ FROM (
                 , subq_10.view__ds__extract_month
                 , subq_10.view__ds__extract_week
                 , subq_10.view__ds__extract_day
-                , subq_10.view__ds__extract_dayofweek
-                , subq_10.view__ds__extract_dayofyear
+                , subq_10.view__ds__extract_dow
+                , subq_10.view__ds__extract_doy
                 , subq_10.view__ds_partitioned__day
                 , subq_10.view__ds_partitioned__week
                 , subq_10.view__ds_partitioned__month
@@ -491,8 +491,8 @@ FROM (
                 , subq_10.view__ds_partitioned__extract_month
                 , subq_10.view__ds_partitioned__extract_week
                 , subq_10.view__ds_partitioned__extract_day
-                , subq_10.view__ds_partitioned__extract_dayofweek
-                , subq_10.view__ds_partitioned__extract_dayofyear
+                , subq_10.view__ds_partitioned__extract_dow
+                , subq_10.view__ds_partitioned__extract_doy
                 , subq_10.ds__day AS metric_time__day
                 , subq_10.ds__week AS metric_time__week
                 , subq_10.ds__month AS metric_time__month
@@ -503,8 +503,8 @@ FROM (
                 , subq_10.ds__extract_month AS metric_time__extract_month
                 , subq_10.ds__extract_week AS metric_time__extract_week
                 , subq_10.ds__extract_day AS metric_time__extract_day
-                , subq_10.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_10.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_10.ds__extract_dow AS metric_time__extract_dow
+                , subq_10.ds__extract_doy AS metric_time__extract_doy
                 , subq_10.listing
                 , subq_10.user
                 , subq_10.view__listing
@@ -519,49 +519,49 @@ FROM (
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS ds__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DOY FROM views_source_src_10009.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds) AS ds__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds) AS ds__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds) AS ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_doy
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC('week', views_source_src_10009.ds) AS view__ds__week
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS view__ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS view__ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS view__ds__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS view__ds__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS view__ds__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS view__ds__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS view__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dayofweek
-                  , EXTRACT(DOY FROM views_source_src_10009.ds) AS view__ds__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds) AS view__ds__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds) AS view__ds__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds) AS view__ds__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds) AS view__ds__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds) AS view__ds__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds) AS view__ds__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds) AS view__ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_doy
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -589,8 +589,8 @@ FROM (
                 , subq_13.ds__extract_month
                 , subq_13.ds__extract_week
                 , subq_13.ds__extract_day
-                , subq_13.ds__extract_dayofweek
-                , subq_13.ds__extract_dayofyear
+                , subq_13.ds__extract_dow
+                , subq_13.ds__extract_doy
                 , subq_13.created_at__day
                 , subq_13.created_at__week
                 , subq_13.created_at__month
@@ -601,8 +601,8 @@ FROM (
                 , subq_13.created_at__extract_month
                 , subq_13.created_at__extract_week
                 , subq_13.created_at__extract_day
-                , subq_13.created_at__extract_dayofweek
-                , subq_13.created_at__extract_dayofyear
+                , subq_13.created_at__extract_dow
+                , subq_13.created_at__extract_doy
                 , subq_13.listing__ds__day
                 , subq_13.listing__ds__week
                 , subq_13.listing__ds__month
@@ -613,8 +613,8 @@ FROM (
                 , subq_13.listing__ds__extract_month
                 , subq_13.listing__ds__extract_week
                 , subq_13.listing__ds__extract_day
-                , subq_13.listing__ds__extract_dayofweek
-                , subq_13.listing__ds__extract_dayofyear
+                , subq_13.listing__ds__extract_dow
+                , subq_13.listing__ds__extract_doy
                 , subq_13.listing__created_at__day
                 , subq_13.listing__created_at__week
                 , subq_13.listing__created_at__month
@@ -625,8 +625,8 @@ FROM (
                 , subq_13.listing__created_at__extract_month
                 , subq_13.listing__created_at__extract_week
                 , subq_13.listing__created_at__extract_day
-                , subq_13.listing__created_at__extract_dayofweek
-                , subq_13.listing__created_at__extract_dayofyear
+                , subq_13.listing__created_at__extract_dow
+                , subq_13.listing__created_at__extract_doy
                 , subq_13.ds__day AS metric_time__day
                 , subq_13.ds__week AS metric_time__week
                 , subq_13.ds__month AS metric_time__month
@@ -637,8 +637,8 @@ FROM (
                 , subq_13.ds__extract_month AS metric_time__extract_month
                 , subq_13.ds__extract_week AS metric_time__extract_week
                 , subq_13.ds__extract_day AS metric_time__extract_day
-                , subq_13.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_13.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_13.ds__extract_dow AS metric_time__extract_dow
+                , subq_13.ds__extract_doy AS metric_time__extract_doy
                 , subq_13.listing
                 , subq_13.user
                 , subq_13.listing__user
@@ -662,25 +662,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -689,25 +689,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index f47fd76de7..1bd176c115 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -47,74 +47,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -141,25 +141,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -168,25 +168,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql
index 3eb622fa49..cd879426f7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_compute_metrics_node_simple_expr__plan0.sql
@@ -44,74 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -138,25 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -165,25 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql
index 2b0077fe9a..5b6dd99cc4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_constrain_time_range_node__plan0.sql
@@ -38,74 +38,74 @@ FROM (
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-        , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-        , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-        , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-        , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-        , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-        , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
index 5dd2138c23..6920a36691 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
index 33a5834e5f..4080ab9420 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_grain_to_date__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
index 12219e1521..fcf74a5947 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_ds__plan0.sql
@@ -23,8 +23,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -35,8 +35,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -47,8 +47,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -61,25 +61,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
index bcac8fdcad..0143335613 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 61a5f71588..5cba3a3202 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_1.ds__extract_month
         , subq_1.ds__extract_week
         , subq_1.ds__extract_day
-        , subq_1.ds__extract_dayofweek
-        , subq_1.ds__extract_dayofyear
+        , subq_1.ds__extract_dow
+        , subq_1.ds__extract_doy
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_1.company__ds__extract_month
         , subq_1.company__ds__extract_week
         , subq_1.company__ds__extract_day
-        , subq_1.company__ds__extract_dayofweek
-        , subq_1.company__ds__extract_dayofyear
+        , subq_1.company__ds__extract_dow
+        , subq_1.company__ds__extract_doy
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_1.metric_time__extract_month
         , subq_1.metric_time__extract_week
         , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dayofweek
-        , subq_1.metric_time__extract_dayofyear
+        , subq_1.metric_time__extract_dow
+        , subq_1.metric_time__extract_doy
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -68,8 +68,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.company__ds__extract_month
           , subq_0.company__ds__extract_week
           , subq_0.company__ds__extract_day
-          , subq_0.company__ds__extract_dayofweek
-          , subq_0.company__ds__extract_dayofyear
+          , subq_0.company__ds__extract_dow
+          , subq_0.company__ds__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
@@ -106,25 +106,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-            , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-            , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
index 7c4b4abfb3..414159089b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_1.ds__extract_month
         , subq_1.ds__extract_week
         , subq_1.ds__extract_day
-        , subq_1.ds__extract_dayofweek
-        , subq_1.ds__extract_dayofyear
+        , subq_1.ds__extract_dow
+        , subq_1.ds__extract_doy
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_1.company__ds__extract_month
         , subq_1.company__ds__extract_week
         , subq_1.company__ds__extract_day
-        , subq_1.company__ds__extract_dayofweek
-        , subq_1.company__ds__extract_dayofyear
+        , subq_1.company__ds__extract_dow
+        , subq_1.company__ds__extract_doy
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_1.metric_time__extract_month
         , subq_1.metric_time__extract_week
         , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dayofweek
-        , subq_1.metric_time__extract_dayofyear
+        , subq_1.metric_time__extract_dow
+        , subq_1.metric_time__extract_doy
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -68,8 +68,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.company__ds__extract_month
           , subq_0.company__ds__extract_week
           , subq_0.company__ds__extract_day
-          , subq_0.company__ds__extract_dayofweek
-          , subq_0.company__ds__extract_dayofyear
+          , subq_0.company__ds__extract_dow
+          , subq_0.company__ds__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
@@ -106,25 +106,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-            , EXTRACT(DOY FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-            , EXTRACT(DOY FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql
index 24eacc8f9e..5b4011175d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -266,8 +266,8 @@ FROM (
             , subq_5.ds__extract_month
             , subq_5.ds__extract_week
             , subq_5.ds__extract_day
-            , subq_5.ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear
+            , subq_5.ds__extract_dow
+            , subq_5.ds__extract_doy
             , subq_5.ds_partitioned__day
             , subq_5.ds_partitioned__week
             , subq_5.ds_partitioned__month
@@ -278,8 +278,8 @@ FROM (
             , subq_5.ds_partitioned__extract_month
             , subq_5.ds_partitioned__extract_week
             , subq_5.ds_partitioned__extract_day
-            , subq_5.ds_partitioned__extract_dayofweek
-            , subq_5.ds_partitioned__extract_dayofyear
+            , subq_5.ds_partitioned__extract_dow
+            , subq_5.ds_partitioned__extract_doy
             , subq_5.paid_at__day
             , subq_5.paid_at__week
             , subq_5.paid_at__month
@@ -290,8 +290,8 @@ FROM (
             , subq_5.paid_at__extract_month
             , subq_5.paid_at__extract_week
             , subq_5.paid_at__extract_day
-            , subq_5.paid_at__extract_dayofweek
-            , subq_5.paid_at__extract_dayofyear
+            , subq_5.paid_at__extract_dow
+            , subq_5.paid_at__extract_doy
             , subq_5.booking__ds__day
             , subq_5.booking__ds__week
             , subq_5.booking__ds__month
@@ -302,8 +302,8 @@ FROM (
             , subq_5.booking__ds__extract_month
             , subq_5.booking__ds__extract_week
             , subq_5.booking__ds__extract_day
-            , subq_5.booking__ds__extract_dayofweek
-            , subq_5.booking__ds__extract_dayofyear
+            , subq_5.booking__ds__extract_dow
+            , subq_5.booking__ds__extract_doy
             , subq_5.booking__ds_partitioned__day
             , subq_5.booking__ds_partitioned__week
             , subq_5.booking__ds_partitioned__month
@@ -314,8 +314,8 @@ FROM (
             , subq_5.booking__ds_partitioned__extract_month
             , subq_5.booking__ds_partitioned__extract_week
             , subq_5.booking__ds_partitioned__extract_day
-            , subq_5.booking__ds_partitioned__extract_dayofweek
-            , subq_5.booking__ds_partitioned__extract_dayofyear
+            , subq_5.booking__ds_partitioned__extract_dow
+            , subq_5.booking__ds_partitioned__extract_doy
             , subq_5.booking__paid_at__day
             , subq_5.booking__paid_at__week
             , subq_5.booking__paid_at__month
@@ -326,8 +326,8 @@ FROM (
             , subq_5.booking__paid_at__extract_month
             , subq_5.booking__paid_at__extract_week
             , subq_5.booking__paid_at__extract_day
-            , subq_5.booking__paid_at__extract_dayofweek
-            , subq_5.booking__paid_at__extract_dayofyear
+            , subq_5.booking__paid_at__extract_dow
+            , subq_5.booking__paid_at__extract_doy
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -338,8 +338,8 @@ FROM (
             , subq_5.ds__extract_month AS metric_time__extract_month
             , subq_5.ds__extract_week AS metric_time__extract_week
             , subq_5.ds__extract_day AS metric_time__extract_day
-            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_5.ds__extract_dow AS metric_time__extract_dow
+            , subq_5.ds__extract_doy AS metric_time__extract_doy
             , subq_5.listing
             , subq_5.guest
             , subq_5.host
@@ -384,74 +384,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
index bf72a9c59a..d11a69936d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index cdf5e6646b..b98d6d0f3d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
index 5c396371e8..9139bc862d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 7b2c9a7661..0022a4f526 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index f635bf528d..10bb6c0450 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -38,8 +38,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -50,8 +50,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -62,8 +62,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -74,8 +74,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -86,8 +86,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -98,8 +98,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -140,8 +140,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -152,8 +152,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -164,8 +164,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -176,8 +176,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -188,8 +188,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -200,8 +200,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -212,8 +212,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -258,74 +258,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -373,8 +373,8 @@ FROM (
             , subq_9.ds__extract_month AS ds__extract_month
             , subq_9.ds__extract_week AS ds__extract_week
             , subq_9.ds__extract_day AS ds__extract_day
-            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_9.ds__extract_dow AS ds__extract_dow
+            , subq_9.ds__extract_doy AS ds__extract_doy
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
@@ -385,8 +385,8 @@ FROM (
             , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_9.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_9.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
@@ -397,8 +397,8 @@ FROM (
             , subq_9.paid_at__extract_month AS paid_at__extract_month
             , subq_9.paid_at__extract_week AS paid_at__extract_week
             , subq_9.paid_at__extract_day AS paid_at__extract_day
-            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_9.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_9.paid_at__extract_doy AS paid_at__extract_doy
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
@@ -409,8 +409,8 @@ FROM (
             , subq_9.booking__ds__extract_month AS booking__ds__extract_month
             , subq_9.booking__ds__extract_week AS booking__ds__extract_week
             , subq_9.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_9.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_9.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -421,8 +421,8 @@ FROM (
             , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_9.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_9.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
@@ -433,8 +433,8 @@ FROM (
             , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_9.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_9.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -475,8 +475,8 @@ FROM (
               , subq_8.ds__extract_month
               , subq_8.ds__extract_week
               , subq_8.ds__extract_day
-              , subq_8.ds__extract_dayofweek
-              , subq_8.ds__extract_dayofyear
+              , subq_8.ds__extract_dow
+              , subq_8.ds__extract_doy
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
@@ -487,8 +487,8 @@ FROM (
               , subq_8.ds_partitioned__extract_month
               , subq_8.ds_partitioned__extract_week
               , subq_8.ds_partitioned__extract_day
-              , subq_8.ds_partitioned__extract_dayofweek
-              , subq_8.ds_partitioned__extract_dayofyear
+              , subq_8.ds_partitioned__extract_dow
+              , subq_8.ds_partitioned__extract_doy
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
@@ -499,8 +499,8 @@ FROM (
               , subq_8.paid_at__extract_month
               , subq_8.paid_at__extract_week
               , subq_8.paid_at__extract_day
-              , subq_8.paid_at__extract_dayofweek
-              , subq_8.paid_at__extract_dayofyear
+              , subq_8.paid_at__extract_dow
+              , subq_8.paid_at__extract_doy
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
@@ -511,8 +511,8 @@ FROM (
               , subq_8.booking__ds__extract_month
               , subq_8.booking__ds__extract_week
               , subq_8.booking__ds__extract_day
-              , subq_8.booking__ds__extract_dayofweek
-              , subq_8.booking__ds__extract_dayofyear
+              , subq_8.booking__ds__extract_dow
+              , subq_8.booking__ds__extract_doy
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
@@ -523,8 +523,8 @@ FROM (
               , subq_8.booking__ds_partitioned__extract_month
               , subq_8.booking__ds_partitioned__extract_week
               , subq_8.booking__ds_partitioned__extract_day
-              , subq_8.booking__ds_partitioned__extract_dayofweek
-              , subq_8.booking__ds_partitioned__extract_dayofyear
+              , subq_8.booking__ds_partitioned__extract_dow
+              , subq_8.booking__ds_partitioned__extract_doy
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
@@ -535,8 +535,8 @@ FROM (
               , subq_8.booking__paid_at__extract_month
               , subq_8.booking__paid_at__extract_week
               , subq_8.booking__paid_at__extract_day
-              , subq_8.booking__paid_at__extract_dayofweek
-              , subq_8.booking__paid_at__extract_dayofyear
+              , subq_8.booking__paid_at__extract_dow
+              , subq_8.booking__paid_at__extract_doy
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -547,8 +547,8 @@ FROM (
               , subq_8.ds__extract_month AS metric_time__extract_month
               , subq_8.ds__extract_week AS metric_time__extract_week
               , subq_8.ds__extract_day AS metric_time__extract_day
-              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_8.ds__extract_dow AS metric_time__extract_dow
+              , subq_8.ds__extract_doy AS metric_time__extract_doy
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
@@ -593,74 +593,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index c61f320f56..1aaa96b40a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -38,8 +38,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -50,8 +50,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -62,8 +62,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -74,8 +74,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -86,8 +86,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -98,8 +98,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -140,8 +140,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -152,8 +152,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -164,8 +164,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -176,8 +176,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -188,8 +188,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -200,8 +200,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -212,8 +212,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -258,74 +258,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -374,8 +374,8 @@ FROM (
             , subq_9.ds__extract_month AS ds__extract_month
             , subq_9.ds__extract_week AS ds__extract_week
             , subq_9.ds__extract_day AS ds__extract_day
-            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_9.ds__extract_dow AS ds__extract_dow
+            , subq_9.ds__extract_doy AS ds__extract_doy
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
@@ -386,8 +386,8 @@ FROM (
             , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_9.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_9.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
@@ -398,8 +398,8 @@ FROM (
             , subq_9.paid_at__extract_month AS paid_at__extract_month
             , subq_9.paid_at__extract_week AS paid_at__extract_week
             , subq_9.paid_at__extract_day AS paid_at__extract_day
-            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_9.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_9.paid_at__extract_doy AS paid_at__extract_doy
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
@@ -410,8 +410,8 @@ FROM (
             , subq_9.booking__ds__extract_month AS booking__ds__extract_month
             , subq_9.booking__ds__extract_week AS booking__ds__extract_week
             , subq_9.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_9.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_9.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -422,8 +422,8 @@ FROM (
             , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_9.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_9.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
@@ -434,8 +434,8 @@ FROM (
             , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_9.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_9.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -476,8 +476,8 @@ FROM (
               , subq_8.ds__extract_month
               , subq_8.ds__extract_week
               , subq_8.ds__extract_day
-              , subq_8.ds__extract_dayofweek
-              , subq_8.ds__extract_dayofyear
+              , subq_8.ds__extract_dow
+              , subq_8.ds__extract_doy
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
@@ -488,8 +488,8 @@ FROM (
               , subq_8.ds_partitioned__extract_month
               , subq_8.ds_partitioned__extract_week
               , subq_8.ds_partitioned__extract_day
-              , subq_8.ds_partitioned__extract_dayofweek
-              , subq_8.ds_partitioned__extract_dayofyear
+              , subq_8.ds_partitioned__extract_dow
+              , subq_8.ds_partitioned__extract_doy
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
@@ -500,8 +500,8 @@ FROM (
               , subq_8.paid_at__extract_month
               , subq_8.paid_at__extract_week
               , subq_8.paid_at__extract_day
-              , subq_8.paid_at__extract_dayofweek
-              , subq_8.paid_at__extract_dayofyear
+              , subq_8.paid_at__extract_dow
+              , subq_8.paid_at__extract_doy
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
@@ -512,8 +512,8 @@ FROM (
               , subq_8.booking__ds__extract_month
               , subq_8.booking__ds__extract_week
               , subq_8.booking__ds__extract_day
-              , subq_8.booking__ds__extract_dayofweek
-              , subq_8.booking__ds__extract_dayofyear
+              , subq_8.booking__ds__extract_dow
+              , subq_8.booking__ds__extract_doy
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
@@ -524,8 +524,8 @@ FROM (
               , subq_8.booking__ds_partitioned__extract_month
               , subq_8.booking__ds_partitioned__extract_week
               , subq_8.booking__ds_partitioned__extract_day
-              , subq_8.booking__ds_partitioned__extract_dayofweek
-              , subq_8.booking__ds_partitioned__extract_dayofyear
+              , subq_8.booking__ds_partitioned__extract_dow
+              , subq_8.booking__ds_partitioned__extract_doy
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
@@ -536,8 +536,8 @@ FROM (
               , subq_8.booking__paid_at__extract_month
               , subq_8.booking__paid_at__extract_week
               , subq_8.booking__paid_at__extract_day
-              , subq_8.booking__paid_at__extract_dayofweek
-              , subq_8.booking__paid_at__extract_dayofyear
+              , subq_8.booking__paid_at__extract_dow
+              , subq_8.booking__paid_at__extract_doy
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -548,8 +548,8 @@ FROM (
               , subq_8.ds__extract_month AS metric_time__extract_month
               , subq_8.ds__extract_week AS metric_time__extract_week
               , subq_8.ds__extract_day AS metric_time__extract_day
-              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_8.ds__extract_dow AS metric_time__extract_dow
+              , subq_8.ds__extract_doy AS metric_time__extract_doy
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
@@ -594,74 +594,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
index 35a55ef78b..3107752f3d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_4.ds__extract_month AS ds__extract_month
           , subq_4.ds__extract_week AS ds__extract_week
           , subq_4.ds__extract_day AS ds__extract_day
-          , subq_4.ds__extract_dayofweek AS ds__extract_dayofweek
-          , subq_4.ds__extract_dayofyear AS ds__extract_dayofyear
+          , subq_4.ds__extract_dow AS ds__extract_dow
+          , subq_4.ds__extract_doy AS ds__extract_doy
           , subq_4.ds_partitioned__day AS ds_partitioned__day
           , subq_4.ds_partitioned__week AS ds_partitioned__week
           , subq_4.ds_partitioned__month AS ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_4.ds_partitioned__extract_month AS ds_partitioned__extract_month
           , subq_4.ds_partitioned__extract_week AS ds_partitioned__extract_week
           , subq_4.ds_partitioned__extract_day AS ds_partitioned__extract_day
-          , subq_4.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-          , subq_4.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+          , subq_4.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+          , subq_4.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
           , subq_4.paid_at__day AS paid_at__day
           , subq_4.paid_at__week AS paid_at__week
           , subq_4.paid_at__month AS paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_4.paid_at__extract_month AS paid_at__extract_month
           , subq_4.paid_at__extract_week AS paid_at__extract_week
           , subq_4.paid_at__extract_day AS paid_at__extract_day
-          , subq_4.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-          , subq_4.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+          , subq_4.paid_at__extract_dow AS paid_at__extract_dow
+          , subq_4.paid_at__extract_doy AS paid_at__extract_doy
           , subq_4.booking__ds__day AS booking__ds__day
           , subq_4.booking__ds__week AS booking__ds__week
           , subq_4.booking__ds__month AS booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_4.booking__ds__extract_month AS booking__ds__extract_month
           , subq_4.booking__ds__extract_week AS booking__ds__extract_week
           , subq_4.booking__ds__extract_day AS booking__ds__extract_day
-          , subq_4.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-          , subq_4.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+          , subq_4.booking__ds__extract_dow AS booking__ds__extract_dow
+          , subq_4.booking__ds__extract_doy AS booking__ds__extract_doy
           , subq_4.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_4.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_4.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_4.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
           , subq_4.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
           , subq_4.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-          , subq_4.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-          , subq_4.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+          , subq_4.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+          , subq_4.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
           , subq_4.booking__paid_at__day AS booking__paid_at__day
           , subq_4.booking__paid_at__week AS booking__paid_at__week
           , subq_4.booking__paid_at__month AS booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_4.booking__paid_at__extract_month AS booking__paid_at__extract_month
           , subq_4.booking__paid_at__extract_week AS booking__paid_at__extract_week
           , subq_4.booking__paid_at__extract_day AS booking__paid_at__extract_day
-          , subq_4.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-          , subq_4.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+          , subq_4.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+          , subq_4.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
           , subq_4.listing AS listing
           , subq_4.guest AS guest
           , subq_4.host AS host
@@ -135,8 +135,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -147,8 +147,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -159,8 +159,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -171,8 +171,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -183,8 +183,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -195,8 +195,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.metric_time__week AS metric_time__week
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
@@ -206,8 +206,8 @@ FROM (
             , subq_1.metric_time__extract_month AS metric_time__extract_month
             , subq_1.metric_time__extract_week AS metric_time__extract_week
             , subq_1.metric_time__extract_day AS metric_time__extract_day
-            , subq_1.metric_time__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_1.metric_time__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_1.metric_time__extract_dow AS metric_time__extract_dow
+            , subq_1.metric_time__extract_doy AS metric_time__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -248,8 +248,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -260,8 +260,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -272,8 +272,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -284,8 +284,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -296,8 +296,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -308,8 +308,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -320,8 +320,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -366,74 +366,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 4546c94c68..666e2d3376 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_1.ds__extract_month AS ds__extract_month
           , subq_1.ds__extract_week AS ds__extract_week
           , subq_1.ds__extract_day AS ds__extract_day
-          , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-          , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+          , subq_1.ds__extract_dow AS ds__extract_dow
+          , subq_1.ds__extract_doy AS ds__extract_doy
           , subq_1.ds_partitioned__day AS ds_partitioned__day
           , subq_1.ds_partitioned__week AS ds_partitioned__week
           , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
           , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
           , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-          , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-          , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+          , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+          , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
           , subq_1.paid_at__day AS paid_at__day
           , subq_1.paid_at__week AS paid_at__week
           , subq_1.paid_at__month AS paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_1.paid_at__extract_month AS paid_at__extract_month
           , subq_1.paid_at__extract_week AS paid_at__extract_week
           , subq_1.paid_at__extract_day AS paid_at__extract_day
-          , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-          , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+          , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+          , subq_1.paid_at__extract_doy AS paid_at__extract_doy
           , subq_1.booking__ds__day AS booking__ds__day
           , subq_1.booking__ds__week AS booking__ds__week
           , subq_1.booking__ds__month AS booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_1.booking__ds__extract_month AS booking__ds__extract_month
           , subq_1.booking__ds__extract_week AS booking__ds__extract_week
           , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-          , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-          , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+          , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+          , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
           , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
           , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
           , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-          , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-          , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+          , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+          , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
           , subq_1.booking__paid_at__day AS booking__paid_at__day
           , subq_1.booking__paid_at__week AS booking__paid_at__week
           , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
           , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
           , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-          , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-          , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+          , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+          , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
           , subq_1.listing AS listing
           , subq_1.guest AS guest
           , subq_1.host AS host
@@ -134,8 +134,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -146,8 +146,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -158,8 +158,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -170,8 +170,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -182,8 +182,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -194,8 +194,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -206,8 +206,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -252,74 +252,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql
index d4f664fec9..40f6785af3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_distinct_values__plan0.sql
@@ -47,8 +47,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -59,8 +59,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -71,8 +71,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -83,8 +83,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -95,8 +95,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -107,8 +107,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -119,8 +119,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -165,74 +165,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -262,8 +262,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -274,8 +274,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -286,8 +286,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -298,8 +298,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -310,8 +310,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -335,25 +335,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -362,25 +362,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql
index ceb7438a40..a43457fcbd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_node__plan0.sql
@@ -25,74 +25,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql
index 95f3b7ed5a..a3ce23fb89 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_node__plan0.sql
@@ -31,74 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 8b1ab2a969..70919d8caa 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -53,8 +53,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -65,8 +65,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -77,8 +77,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -89,8 +89,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -101,8 +101,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -113,8 +113,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -125,8 +125,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -171,74 +171,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -268,8 +268,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -280,8 +280,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -292,8 +292,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -304,8 +304,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -316,8 +316,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -341,25 +341,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -368,25 +368,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
index 0d0160478b..6e4488a729 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_scd_dimension__plan0.sql
@@ -55,8 +55,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -67,8 +67,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -79,8 +79,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -91,8 +91,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -103,8 +103,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -115,8 +115,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -127,8 +127,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -159,74 +159,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -255,25 +255,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
-                , EXTRACT(DOY FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_from) AS window_start__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_from) AS window_start__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_from) AS window_start__extract_doy
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
-                , EXTRACT(DOY FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_to) AS window_end__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_to) AS window_end__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_to) AS window_end__extract_doy
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -282,25 +282,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
-                , EXTRACT(DOY FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
-                , EXTRACT(DOY FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 9f0330a8c4..9f23719b49 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
index a66f5d9a1e..1c6b0467ff 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
index 71b77eaf66..2093e49b0b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql
index 3ba23c2e5a..eb506ddf59 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_limit_rows__plan0.sql
@@ -31,8 +31,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -43,8 +43,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -55,8 +55,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -67,8 +67,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -79,8 +79,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -91,8 +91,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -103,8 +103,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -149,74 +149,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
index 2635220d21..d5688f0e2d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_local_dimension_using_local_entity__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.created_at__day
         , subq_0.created_at__week
         , subq_0.created_at__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.created_at__extract_month
         , subq_0.created_at__extract_week
         , subq_0.created_at__extract_day
-        , subq_0.created_at__extract_dayofweek
-        , subq_0.created_at__extract_dayofyear
+        , subq_0.created_at__extract_dow
+        , subq_0.created_at__extract_doy
         , subq_0.listing__ds__day
         , subq_0.listing__ds__week
         , subq_0.listing__ds__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.listing__ds__extract_month
         , subq_0.listing__ds__extract_week
         , subq_0.listing__ds__extract_day
-        , subq_0.listing__ds__extract_dayofweek
-        , subq_0.listing__ds__extract_dayofyear
+        , subq_0.listing__ds__extract_dow
+        , subq_0.listing__ds__extract_doy
         , subq_0.listing__created_at__day
         , subq_0.listing__created_at__week
         , subq_0.listing__created_at__month
@@ -62,8 +62,8 @@ FROM (
         , subq_0.listing__created_at__extract_month
         , subq_0.listing__created_at__extract_week
         , subq_0.listing__created_at__extract_day
-        , subq_0.listing__created_at__extract_dayofweek
-        , subq_0.listing__created_at__extract_dayofyear
+        , subq_0.listing__created_at__extract_dow
+        , subq_0.listing__created_at__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -74,8 +74,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.listing
         , subq_0.user
         , subq_0.listing__user
@@ -99,25 +99,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -126,25 +126,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql
index 97140fd5a8..dbfcb34b94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_aggregation_node__plan0.sql
@@ -35,74 +35,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql
index a3dc672f7f..e5349b0d17 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint__plan0.sql
@@ -65,8 +65,8 @@ FROM (
                     , subq_0.ds__extract_month
                     , subq_0.ds__extract_week
                     , subq_0.ds__extract_day
-                    , subq_0.ds__extract_dayofweek
-                    , subq_0.ds__extract_dayofyear
+                    , subq_0.ds__extract_dow
+                    , subq_0.ds__extract_doy
                     , subq_0.ds_partitioned__day
                     , subq_0.ds_partitioned__week
                     , subq_0.ds_partitioned__month
@@ -77,8 +77,8 @@ FROM (
                     , subq_0.ds_partitioned__extract_month
                     , subq_0.ds_partitioned__extract_week
                     , subq_0.ds_partitioned__extract_day
-                    , subq_0.ds_partitioned__extract_dayofweek
-                    , subq_0.ds_partitioned__extract_dayofyear
+                    , subq_0.ds_partitioned__extract_dow
+                    , subq_0.ds_partitioned__extract_doy
                     , subq_0.paid_at__day
                     , subq_0.paid_at__week
                     , subq_0.paid_at__month
@@ -89,8 +89,8 @@ FROM (
                     , subq_0.paid_at__extract_month
                     , subq_0.paid_at__extract_week
                     , subq_0.paid_at__extract_day
-                    , subq_0.paid_at__extract_dayofweek
-                    , subq_0.paid_at__extract_dayofyear
+                    , subq_0.paid_at__extract_dow
+                    , subq_0.paid_at__extract_doy
                     , subq_0.booking__ds__day
                     , subq_0.booking__ds__week
                     , subq_0.booking__ds__month
@@ -101,8 +101,8 @@ FROM (
                     , subq_0.booking__ds__extract_month
                     , subq_0.booking__ds__extract_week
                     , subq_0.booking__ds__extract_day
-                    , subq_0.booking__ds__extract_dayofweek
-                    , subq_0.booking__ds__extract_dayofyear
+                    , subq_0.booking__ds__extract_dow
+                    , subq_0.booking__ds__extract_doy
                     , subq_0.booking__ds_partitioned__day
                     , subq_0.booking__ds_partitioned__week
                     , subq_0.booking__ds_partitioned__month
@@ -113,8 +113,8 @@ FROM (
                     , subq_0.booking__ds_partitioned__extract_month
                     , subq_0.booking__ds_partitioned__extract_week
                     , subq_0.booking__ds_partitioned__extract_day
-                    , subq_0.booking__ds_partitioned__extract_dayofweek
-                    , subq_0.booking__ds_partitioned__extract_dayofyear
+                    , subq_0.booking__ds_partitioned__extract_dow
+                    , subq_0.booking__ds_partitioned__extract_doy
                     , subq_0.booking__paid_at__day
                     , subq_0.booking__paid_at__week
                     , subq_0.booking__paid_at__month
@@ -125,8 +125,8 @@ FROM (
                     , subq_0.booking__paid_at__extract_month
                     , subq_0.booking__paid_at__extract_week
                     , subq_0.booking__paid_at__extract_day
-                    , subq_0.booking__paid_at__extract_dayofweek
-                    , subq_0.booking__paid_at__extract_dayofyear
+                    , subq_0.booking__paid_at__extract_dow
+                    , subq_0.booking__paid_at__extract_doy
                     , subq_0.ds__day AS metric_time__day
                     , subq_0.ds__week AS metric_time__week
                     , subq_0.ds__month AS metric_time__month
@@ -137,8 +137,8 @@ FROM (
                     , subq_0.ds__extract_month AS metric_time__extract_month
                     , subq_0.ds__extract_week AS metric_time__extract_week
                     , subq_0.ds__extract_day AS metric_time__extract_day
-                    , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_0.ds__extract_dow AS metric_time__extract_dow
+                    , subq_0.ds__extract_doy AS metric_time__extract_doy
                     , subq_0.listing
                     , subq_0.guest
                     , subq_0.host
@@ -183,74 +183,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -280,8 +280,8 @@ FROM (
                     , subq_3.ds__extract_month
                     , subq_3.ds__extract_week
                     , subq_3.ds__extract_day
-                    , subq_3.ds__extract_dayofweek
-                    , subq_3.ds__extract_dayofyear
+                    , subq_3.ds__extract_dow
+                    , subq_3.ds__extract_doy
                     , subq_3.created_at__day
                     , subq_3.created_at__week
                     , subq_3.created_at__month
@@ -292,8 +292,8 @@ FROM (
                     , subq_3.created_at__extract_month
                     , subq_3.created_at__extract_week
                     , subq_3.created_at__extract_day
-                    , subq_3.created_at__extract_dayofweek
-                    , subq_3.created_at__extract_dayofyear
+                    , subq_3.created_at__extract_dow
+                    , subq_3.created_at__extract_doy
                     , subq_3.listing__ds__day
                     , subq_3.listing__ds__week
                     , subq_3.listing__ds__month
@@ -304,8 +304,8 @@ FROM (
                     , subq_3.listing__ds__extract_month
                     , subq_3.listing__ds__extract_week
                     , subq_3.listing__ds__extract_day
-                    , subq_3.listing__ds__extract_dayofweek
-                    , subq_3.listing__ds__extract_dayofyear
+                    , subq_3.listing__ds__extract_dow
+                    , subq_3.listing__ds__extract_doy
                     , subq_3.listing__created_at__day
                     , subq_3.listing__created_at__week
                     , subq_3.listing__created_at__month
@@ -316,8 +316,8 @@ FROM (
                     , subq_3.listing__created_at__extract_month
                     , subq_3.listing__created_at__extract_week
                     , subq_3.listing__created_at__extract_day
-                    , subq_3.listing__created_at__extract_dayofweek
-                    , subq_3.listing__created_at__extract_dayofyear
+                    , subq_3.listing__created_at__extract_dow
+                    , subq_3.listing__created_at__extract_doy
                     , subq_3.ds__day AS metric_time__day
                     , subq_3.ds__week AS metric_time__week
                     , subq_3.ds__month AS metric_time__month
@@ -328,8 +328,8 @@ FROM (
                     , subq_3.ds__extract_month AS metric_time__extract_month
                     , subq_3.ds__extract_week AS metric_time__extract_week
                     , subq_3.ds__extract_day AS metric_time__extract_day
-                    , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_3.ds__extract_dow AS metric_time__extract_dow
+                    , subq_3.ds__extract_doy AS metric_time__extract_doy
                     , subq_3.listing
                     , subq_3.user
                     , subq_3.listing__user
@@ -353,25 +353,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -380,25 +380,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -476,8 +476,8 @@ FROM (
                     , subq_12.ds__extract_month
                     , subq_12.ds__extract_week
                     , subq_12.ds__extract_day
-                    , subq_12.ds__extract_dayofweek
-                    , subq_12.ds__extract_dayofyear
+                    , subq_12.ds__extract_dow
+                    , subq_12.ds__extract_doy
                     , subq_12.ds_partitioned__day
                     , subq_12.ds_partitioned__week
                     , subq_12.ds_partitioned__month
@@ -488,8 +488,8 @@ FROM (
                     , subq_12.ds_partitioned__extract_month
                     , subq_12.ds_partitioned__extract_week
                     , subq_12.ds_partitioned__extract_day
-                    , subq_12.ds_partitioned__extract_dayofweek
-                    , subq_12.ds_partitioned__extract_dayofyear
+                    , subq_12.ds_partitioned__extract_dow
+                    , subq_12.ds_partitioned__extract_doy
                     , subq_12.paid_at__day
                     , subq_12.paid_at__week
                     , subq_12.paid_at__month
@@ -500,8 +500,8 @@ FROM (
                     , subq_12.paid_at__extract_month
                     , subq_12.paid_at__extract_week
                     , subq_12.paid_at__extract_day
-                    , subq_12.paid_at__extract_dayofweek
-                    , subq_12.paid_at__extract_dayofyear
+                    , subq_12.paid_at__extract_dow
+                    , subq_12.paid_at__extract_doy
                     , subq_12.booking__ds__day
                     , subq_12.booking__ds__week
                     , subq_12.booking__ds__month
@@ -512,8 +512,8 @@ FROM (
                     , subq_12.booking__ds__extract_month
                     , subq_12.booking__ds__extract_week
                     , subq_12.booking__ds__extract_day
-                    , subq_12.booking__ds__extract_dayofweek
-                    , subq_12.booking__ds__extract_dayofyear
+                    , subq_12.booking__ds__extract_dow
+                    , subq_12.booking__ds__extract_doy
                     , subq_12.booking__ds_partitioned__day
                     , subq_12.booking__ds_partitioned__week
                     , subq_12.booking__ds_partitioned__month
@@ -524,8 +524,8 @@ FROM (
                     , subq_12.booking__ds_partitioned__extract_month
                     , subq_12.booking__ds_partitioned__extract_week
                     , subq_12.booking__ds_partitioned__extract_day
-                    , subq_12.booking__ds_partitioned__extract_dayofweek
-                    , subq_12.booking__ds_partitioned__extract_dayofyear
+                    , subq_12.booking__ds_partitioned__extract_dow
+                    , subq_12.booking__ds_partitioned__extract_doy
                     , subq_12.booking__paid_at__day
                     , subq_12.booking__paid_at__week
                     , subq_12.booking__paid_at__month
@@ -536,8 +536,8 @@ FROM (
                     , subq_12.booking__paid_at__extract_month
                     , subq_12.booking__paid_at__extract_week
                     , subq_12.booking__paid_at__extract_day
-                    , subq_12.booking__paid_at__extract_dayofweek
-                    , subq_12.booking__paid_at__extract_dayofyear
+                    , subq_12.booking__paid_at__extract_dow
+                    , subq_12.booking__paid_at__extract_doy
                     , subq_12.ds__day AS metric_time__day
                     , subq_12.ds__week AS metric_time__week
                     , subq_12.ds__month AS metric_time__month
@@ -548,8 +548,8 @@ FROM (
                     , subq_12.ds__extract_month AS metric_time__extract_month
                     , subq_12.ds__extract_week AS metric_time__extract_week
                     , subq_12.ds__extract_day AS metric_time__extract_day
-                    , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_12.ds__extract_dow AS metric_time__extract_dow
+                    , subq_12.ds__extract_doy AS metric_time__extract_doy
                     , subq_12.listing
                     , subq_12.guest
                     , subq_12.host
@@ -594,74 +594,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -691,8 +691,8 @@ FROM (
                     , subq_15.ds__extract_month
                     , subq_15.ds__extract_week
                     , subq_15.ds__extract_day
-                    , subq_15.ds__extract_dayofweek
-                    , subq_15.ds__extract_dayofyear
+                    , subq_15.ds__extract_dow
+                    , subq_15.ds__extract_doy
                     , subq_15.created_at__day
                     , subq_15.created_at__week
                     , subq_15.created_at__month
@@ -703,8 +703,8 @@ FROM (
                     , subq_15.created_at__extract_month
                     , subq_15.created_at__extract_week
                     , subq_15.created_at__extract_day
-                    , subq_15.created_at__extract_dayofweek
-                    , subq_15.created_at__extract_dayofyear
+                    , subq_15.created_at__extract_dow
+                    , subq_15.created_at__extract_doy
                     , subq_15.listing__ds__day
                     , subq_15.listing__ds__week
                     , subq_15.listing__ds__month
@@ -715,8 +715,8 @@ FROM (
                     , subq_15.listing__ds__extract_month
                     , subq_15.listing__ds__extract_week
                     , subq_15.listing__ds__extract_day
-                    , subq_15.listing__ds__extract_dayofweek
-                    , subq_15.listing__ds__extract_dayofyear
+                    , subq_15.listing__ds__extract_dow
+                    , subq_15.listing__ds__extract_doy
                     , subq_15.listing__created_at__day
                     , subq_15.listing__created_at__week
                     , subq_15.listing__created_at__month
@@ -727,8 +727,8 @@ FROM (
                     , subq_15.listing__created_at__extract_month
                     , subq_15.listing__created_at__extract_week
                     , subq_15.listing__created_at__extract_day
-                    , subq_15.listing__created_at__extract_dayofweek
-                    , subq_15.listing__created_at__extract_dayofyear
+                    , subq_15.listing__created_at__extract_dow
+                    , subq_15.listing__created_at__extract_doy
                     , subq_15.ds__day AS metric_time__day
                     , subq_15.ds__week AS metric_time__week
                     , subq_15.ds__month AS metric_time__month
@@ -739,8 +739,8 @@ FROM (
                     , subq_15.ds__extract_month AS metric_time__extract_month
                     , subq_15.ds__extract_week AS metric_time__extract_week
                     , subq_15.ds__extract_day AS metric_time__extract_day
-                    , subq_15.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_15.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_15.ds__extract_dow AS metric_time__extract_dow
+                    , subq_15.ds__extract_doy AS metric_time__extract_doy
                     , subq_15.listing
                     , subq_15.user
                     , subq_15.listing__user
@@ -764,25 +764,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -791,25 +791,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -870,8 +870,8 @@ FROM (
             , subq_24.ds__extract_month
             , subq_24.ds__extract_week
             , subq_24.ds__extract_day
-            , subq_24.ds__extract_dayofweek
-            , subq_24.ds__extract_dayofyear
+            , subq_24.ds__extract_dow
+            , subq_24.ds__extract_doy
             , subq_24.ds_partitioned__day
             , subq_24.ds_partitioned__week
             , subq_24.ds_partitioned__month
@@ -882,8 +882,8 @@ FROM (
             , subq_24.ds_partitioned__extract_month
             , subq_24.ds_partitioned__extract_week
             , subq_24.ds_partitioned__extract_day
-            , subq_24.ds_partitioned__extract_dayofweek
-            , subq_24.ds_partitioned__extract_dayofyear
+            , subq_24.ds_partitioned__extract_dow
+            , subq_24.ds_partitioned__extract_doy
             , subq_24.paid_at__day
             , subq_24.paid_at__week
             , subq_24.paid_at__month
@@ -894,8 +894,8 @@ FROM (
             , subq_24.paid_at__extract_month
             , subq_24.paid_at__extract_week
             , subq_24.paid_at__extract_day
-            , subq_24.paid_at__extract_dayofweek
-            , subq_24.paid_at__extract_dayofyear
+            , subq_24.paid_at__extract_dow
+            , subq_24.paid_at__extract_doy
             , subq_24.booking__ds__day
             , subq_24.booking__ds__week
             , subq_24.booking__ds__month
@@ -906,8 +906,8 @@ FROM (
             , subq_24.booking__ds__extract_month
             , subq_24.booking__ds__extract_week
             , subq_24.booking__ds__extract_day
-            , subq_24.booking__ds__extract_dayofweek
-            , subq_24.booking__ds__extract_dayofyear
+            , subq_24.booking__ds__extract_dow
+            , subq_24.booking__ds__extract_doy
             , subq_24.booking__ds_partitioned__day
             , subq_24.booking__ds_partitioned__week
             , subq_24.booking__ds_partitioned__month
@@ -918,8 +918,8 @@ FROM (
             , subq_24.booking__ds_partitioned__extract_month
             , subq_24.booking__ds_partitioned__extract_week
             , subq_24.booking__ds_partitioned__extract_day
-            , subq_24.booking__ds_partitioned__extract_dayofweek
-            , subq_24.booking__ds_partitioned__extract_dayofyear
+            , subq_24.booking__ds_partitioned__extract_dow
+            , subq_24.booking__ds_partitioned__extract_doy
             , subq_24.booking__paid_at__day
             , subq_24.booking__paid_at__week
             , subq_24.booking__paid_at__month
@@ -930,8 +930,8 @@ FROM (
             , subq_24.booking__paid_at__extract_month
             , subq_24.booking__paid_at__extract_week
             , subq_24.booking__paid_at__extract_day
-            , subq_24.booking__paid_at__extract_dayofweek
-            , subq_24.booking__paid_at__extract_dayofyear
+            , subq_24.booking__paid_at__extract_dow
+            , subq_24.booking__paid_at__extract_doy
             , subq_24.ds__day AS metric_time__day
             , subq_24.ds__week AS metric_time__week
             , subq_24.ds__month AS metric_time__month
@@ -942,8 +942,8 @@ FROM (
             , subq_24.ds__extract_month AS metric_time__extract_month
             , subq_24.ds__extract_week AS metric_time__extract_week
             , subq_24.ds__extract_day AS metric_time__extract_day
-            , subq_24.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_24.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_24.ds__extract_dow AS metric_time__extract_dow
+            , subq_24.ds__extract_doy AS metric_time__extract_doy
             , subq_24.listing
             , subq_24.guest
             , subq_24.host
@@ -988,74 +988,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
index 2de235aece..c11754db0d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_reused_measure__plan0.sql
@@ -50,8 +50,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -62,8 +62,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -74,8 +74,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -86,8 +86,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -98,8 +98,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -110,8 +110,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -122,8 +122,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -168,74 +168,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -282,8 +282,8 @@ FROM (
             , subq_7.ds__extract_month
             , subq_7.ds__extract_week
             , subq_7.ds__extract_day
-            , subq_7.ds__extract_dayofweek
-            , subq_7.ds__extract_dayofyear
+            , subq_7.ds__extract_dow
+            , subq_7.ds__extract_doy
             , subq_7.ds_partitioned__day
             , subq_7.ds_partitioned__week
             , subq_7.ds_partitioned__month
@@ -294,8 +294,8 @@ FROM (
             , subq_7.ds_partitioned__extract_month
             , subq_7.ds_partitioned__extract_week
             , subq_7.ds_partitioned__extract_day
-            , subq_7.ds_partitioned__extract_dayofweek
-            , subq_7.ds_partitioned__extract_dayofyear
+            , subq_7.ds_partitioned__extract_dow
+            , subq_7.ds_partitioned__extract_doy
             , subq_7.paid_at__day
             , subq_7.paid_at__week
             , subq_7.paid_at__month
@@ -306,8 +306,8 @@ FROM (
             , subq_7.paid_at__extract_month
             , subq_7.paid_at__extract_week
             , subq_7.paid_at__extract_day
-            , subq_7.paid_at__extract_dayofweek
-            , subq_7.paid_at__extract_dayofyear
+            , subq_7.paid_at__extract_dow
+            , subq_7.paid_at__extract_doy
             , subq_7.booking__ds__day
             , subq_7.booking__ds__week
             , subq_7.booking__ds__month
@@ -318,8 +318,8 @@ FROM (
             , subq_7.booking__ds__extract_month
             , subq_7.booking__ds__extract_week
             , subq_7.booking__ds__extract_day
-            , subq_7.booking__ds__extract_dayofweek
-            , subq_7.booking__ds__extract_dayofyear
+            , subq_7.booking__ds__extract_dow
+            , subq_7.booking__ds__extract_doy
             , subq_7.booking__ds_partitioned__day
             , subq_7.booking__ds_partitioned__week
             , subq_7.booking__ds_partitioned__month
@@ -330,8 +330,8 @@ FROM (
             , subq_7.booking__ds_partitioned__extract_month
             , subq_7.booking__ds_partitioned__extract_week
             , subq_7.booking__ds_partitioned__extract_day
-            , subq_7.booking__ds_partitioned__extract_dayofweek
-            , subq_7.booking__ds_partitioned__extract_dayofyear
+            , subq_7.booking__ds_partitioned__extract_dow
+            , subq_7.booking__ds_partitioned__extract_doy
             , subq_7.booking__paid_at__day
             , subq_7.booking__paid_at__week
             , subq_7.booking__paid_at__month
@@ -342,8 +342,8 @@ FROM (
             , subq_7.booking__paid_at__extract_month
             , subq_7.booking__paid_at__extract_week
             , subq_7.booking__paid_at__extract_day
-            , subq_7.booking__paid_at__extract_dayofweek
-            , subq_7.booking__paid_at__extract_dayofyear
+            , subq_7.booking__paid_at__extract_dow
+            , subq_7.booking__paid_at__extract_doy
             , subq_7.ds__day AS metric_time__day
             , subq_7.ds__week AS metric_time__week
             , subq_7.ds__month AS metric_time__month
@@ -354,8 +354,8 @@ FROM (
             , subq_7.ds__extract_month AS metric_time__extract_month
             , subq_7.ds__extract_week AS metric_time__extract_week
             , subq_7.ds__extract_day AS metric_time__extract_day
-            , subq_7.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_7.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_7.ds__extract_dow AS metric_time__extract_dow
+            , subq_7.ds__extract_doy AS metric_time__extract_doy
             , subq_7.listing
             , subq_7.guest
             , subq_7.host
@@ -400,74 +400,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 5c4bf2859d..bd41d48bd9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -44,8 +44,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -56,8 +56,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -68,8 +68,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -80,8 +80,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -92,8 +92,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -104,8 +104,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -116,8 +116,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -162,74 +162,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index b75797d1e3..ecc15101fe 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -32,8 +32,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -150,74 +150,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -256,8 +256,8 @@ FROM (
             , subq_5.ds__extract_month
             , subq_5.ds__extract_week
             , subq_5.ds__extract_day
-            , subq_5.ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear
+            , subq_5.ds__extract_dow
+            , subq_5.ds__extract_doy
             , subq_5.created_at__day
             , subq_5.created_at__week
             , subq_5.created_at__month
@@ -268,8 +268,8 @@ FROM (
             , subq_5.created_at__extract_month
             , subq_5.created_at__extract_week
             , subq_5.created_at__extract_day
-            , subq_5.created_at__extract_dayofweek
-            , subq_5.created_at__extract_dayofyear
+            , subq_5.created_at__extract_dow
+            , subq_5.created_at__extract_doy
             , subq_5.listing__ds__day
             , subq_5.listing__ds__week
             , subq_5.listing__ds__month
@@ -280,8 +280,8 @@ FROM (
             , subq_5.listing__ds__extract_month
             , subq_5.listing__ds__extract_week
             , subq_5.listing__ds__extract_day
-            , subq_5.listing__ds__extract_dayofweek
-            , subq_5.listing__ds__extract_dayofyear
+            , subq_5.listing__ds__extract_dow
+            , subq_5.listing__ds__extract_doy
             , subq_5.listing__created_at__day
             , subq_5.listing__created_at__week
             , subq_5.listing__created_at__month
@@ -292,8 +292,8 @@ FROM (
             , subq_5.listing__created_at__extract_month
             , subq_5.listing__created_at__extract_week
             , subq_5.listing__created_at__extract_day
-            , subq_5.listing__created_at__extract_dayofweek
-            , subq_5.listing__created_at__extract_dayofyear
+            , subq_5.listing__created_at__extract_dow
+            , subq_5.listing__created_at__extract_doy
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -304,8 +304,8 @@ FROM (
             , subq_5.ds__extract_month AS metric_time__extract_month
             , subq_5.ds__extract_week AS metric_time__extract_week
             , subq_5.ds__extract_day AS metric_time__extract_day
-            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_5.ds__extract_dow AS metric_time__extract_dow
+            , subq_5.ds__extract_doy AS metric_time__extract_doy
             , subq_5.listing
             , subq_5.user
             , subq_5.listing__user
@@ -329,25 +329,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -356,25 +356,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
index 8430dbca74..d1740a6a39 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
@@ -45,8 +45,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -57,8 +57,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -69,8 +69,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -81,8 +81,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -93,8 +93,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -105,8 +105,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -117,8 +117,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -149,74 +149,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -250,8 +250,8 @@ FROM (
             , subq_3.window_start__extract_month AS window_start__extract_month
             , subq_3.window_start__extract_week AS window_start__extract_week
             , subq_3.window_start__extract_day AS window_start__extract_day
-            , subq_3.window_start__extract_dayofweek AS window_start__extract_dayofweek
-            , subq_3.window_start__extract_dayofyear AS window_start__extract_dayofyear
+            , subq_3.window_start__extract_dow AS window_start__extract_dow
+            , subq_3.window_start__extract_doy AS window_start__extract_doy
             , subq_3.window_end__day AS window_end__day
             , subq_3.window_end__week AS window_end__week
             , subq_3.window_end__month AS window_end__month
@@ -262,8 +262,8 @@ FROM (
             , subq_3.window_end__extract_month AS window_end__extract_month
             , subq_3.window_end__extract_week AS window_end__extract_week
             , subq_3.window_end__extract_day AS window_end__extract_day
-            , subq_3.window_end__extract_dayofweek AS window_end__extract_dayofweek
-            , subq_3.window_end__extract_dayofyear AS window_end__extract_dayofyear
+            , subq_3.window_end__extract_dow AS window_end__extract_dow
+            , subq_3.window_end__extract_doy AS window_end__extract_doy
             , subq_3.listing__window_start__day AS listing__window_start__day
             , subq_3.listing__window_start__week AS listing__window_start__week
             , subq_3.listing__window_start__month AS listing__window_start__month
@@ -274,8 +274,8 @@ FROM (
             , subq_3.listing__window_start__extract_month AS listing__window_start__extract_month
             , subq_3.listing__window_start__extract_week AS listing__window_start__extract_week
             , subq_3.listing__window_start__extract_day AS listing__window_start__extract_day
-            , subq_3.listing__window_start__extract_dayofweek AS listing__window_start__extract_dayofweek
-            , subq_3.listing__window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
+            , subq_3.listing__window_start__extract_dow AS listing__window_start__extract_dow
+            , subq_3.listing__window_start__extract_doy AS listing__window_start__extract_doy
             , subq_3.listing__window_end__day AS listing__window_end__day
             , subq_3.listing__window_end__week AS listing__window_end__week
             , subq_3.listing__window_end__month AS listing__window_end__month
@@ -286,8 +286,8 @@ FROM (
             , subq_3.listing__window_end__extract_month AS listing__window_end__extract_month
             , subq_3.listing__window_end__extract_week AS listing__window_end__extract_week
             , subq_3.listing__window_end__extract_day AS listing__window_end__extract_day
-            , subq_3.listing__window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
-            , subq_3.listing__window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
+            , subq_3.listing__window_end__extract_dow AS listing__window_end__extract_dow
+            , subq_3.listing__window_end__extract_doy AS listing__window_end__extract_doy
             , subq_5.ds__day AS user__ds__day
             , subq_5.ds__week AS user__ds__week
             , subq_5.ds__month AS user__ds__month
@@ -298,8 +298,8 @@ FROM (
             , subq_5.ds__extract_month AS user__ds__extract_month
             , subq_5.ds__extract_week AS user__ds__extract_week
             , subq_5.ds__extract_day AS user__ds__extract_day
-            , subq_5.ds__extract_dayofweek AS user__ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS user__ds__extract_dayofyear
+            , subq_5.ds__extract_dow AS user__ds__extract_dow
+            , subq_5.ds__extract_doy AS user__ds__extract_doy
             , subq_3.listing AS listing
             , subq_3.user AS user
             , subq_3.listing__user AS listing__user
@@ -318,25 +318,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
-              , EXTRACT(DOY FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_from) AS window_start__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_from) AS window_start__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_from) AS window_start__extract_doy
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
-              , EXTRACT(DOY FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_to) AS window_end__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_to) AS window_end__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_to) AS window_end__extract_doy
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -345,25 +345,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
-              , EXTRACT(DOY FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
-              , EXTRACT(DOY FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -412,8 +412,8 @@ FROM (
               , subq_4.ds__extract_month
               , subq_4.ds__extract_week
               , subq_4.ds__extract_day
-              , subq_4.ds__extract_dayofweek
-              , subq_4.ds__extract_dayofyear
+              , subq_4.ds__extract_dow
+              , subq_4.ds__extract_doy
               , subq_4.user__ds__day
               , subq_4.user__ds__week
               , subq_4.user__ds__month
@@ -424,8 +424,8 @@ FROM (
               , subq_4.user__ds__extract_month
               , subq_4.user__ds__extract_week
               , subq_4.user__ds__extract_day
-              , subq_4.user__ds__extract_dayofweek
-              , subq_4.user__ds__extract_dayofyear
+              , subq_4.user__ds__extract_dow
+              , subq_4.user__ds__extract_doy
               , subq_4.user
               , subq_4.home_state_latest
               , subq_4.user__home_state_latest
@@ -437,26 +437,26 @@ FROM (
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS ds__year
-                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dayofweek
-                , EXTRACT(DOY FROM users_latest_src_10021.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM users_latest_src_10021.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM users_latest_src_10021.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM users_latest_src_10021.ds) AS ds__extract_month
+                , EXTRACT(week FROM users_latest_src_10021.ds) AS ds__extract_week
+                , EXTRACT(day FROM users_latest_src_10021.ds) AS ds__extract_day
+                , EXTRACT(dow FROM users_latest_src_10021.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM users_latest_src_10021.ds) AS ds__extract_doy
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC('week', users_latest_src_10021.ds) AS user__ds__week
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS user__ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS user__ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS user__ds__year
-                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS user__ds__extract_year
-                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
-                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS user__ds__extract_month
-                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
-                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS user__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dayofweek
-                , EXTRACT(DOY FROM users_latest_src_10021.ds) AS user__ds__extract_dayofyear
+                , EXTRACT(year FROM users_latest_src_10021.ds) AS user__ds__extract_year
+                , EXTRACT(quarter FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
+                , EXTRACT(month FROM users_latest_src_10021.ds) AS user__ds__extract_month
+                , EXTRACT(week FROM users_latest_src_10021.ds) AS user__ds__extract_week
+                , EXTRACT(day FROM users_latest_src_10021.ds) AS user__ds__extract_day
+                , EXTRACT(dow FROM users_latest_src_10021.ds) AS user__ds__extract_dow
+                , EXTRACT(doy FROM users_latest_src_10021.ds) AS user__ds__extract_doy
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
index 8d8a7b2fed..8abc633b9a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
@@ -45,8 +45,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -57,8 +57,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -69,8 +69,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -81,8 +81,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -93,8 +93,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -105,8 +105,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -117,8 +117,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -149,74 +149,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -253,8 +253,8 @@ FROM (
             , subq_5.window_start__extract_month AS lux_listing__window_start__extract_month
             , subq_5.window_start__extract_week AS lux_listing__window_start__extract_week
             , subq_5.window_start__extract_day AS lux_listing__window_start__extract_day
-            , subq_5.window_start__extract_dayofweek AS lux_listing__window_start__extract_dayofweek
-            , subq_5.window_start__extract_dayofyear AS lux_listing__window_start__extract_dayofyear
+            , subq_5.window_start__extract_dow AS lux_listing__window_start__extract_dow
+            , subq_5.window_start__extract_doy AS lux_listing__window_start__extract_doy
             , subq_5.window_end__day AS lux_listing__window_end__day
             , subq_5.window_end__week AS lux_listing__window_end__week
             , subq_5.window_end__month AS lux_listing__window_end__month
@@ -265,8 +265,8 @@ FROM (
             , subq_5.window_end__extract_month AS lux_listing__window_end__extract_month
             , subq_5.window_end__extract_week AS lux_listing__window_end__extract_week
             , subq_5.window_end__extract_day AS lux_listing__window_end__extract_day
-            , subq_5.window_end__extract_dayofweek AS lux_listing__window_end__extract_dayofweek
-            , subq_5.window_end__extract_dayofyear AS lux_listing__window_end__extract_dayofyear
+            , subq_5.window_end__extract_dow AS lux_listing__window_end__extract_dow
+            , subq_5.window_end__extract_doy AS lux_listing__window_end__extract_doy
             , subq_3.listing AS listing
             , subq_3.lux_listing AS lux_listing
             , subq_3.listing__lux_listing AS listing__lux_listing
@@ -343,8 +343,8 @@ FROM (
               , subq_4.window_start__extract_month
               , subq_4.window_start__extract_week
               , subq_4.window_start__extract_day
-              , subq_4.window_start__extract_dayofweek
-              , subq_4.window_start__extract_dayofyear
+              , subq_4.window_start__extract_dow
+              , subq_4.window_start__extract_doy
               , subq_4.window_end__day
               , subq_4.window_end__week
               , subq_4.window_end__month
@@ -355,8 +355,8 @@ FROM (
               , subq_4.window_end__extract_month
               , subq_4.window_end__extract_week
               , subq_4.window_end__extract_day
-              , subq_4.window_end__extract_dayofweek
-              , subq_4.window_end__extract_dayofyear
+              , subq_4.window_end__extract_dow
+              , subq_4.window_end__extract_doy
               , subq_4.lux_listing__window_start__day
               , subq_4.lux_listing__window_start__week
               , subq_4.lux_listing__window_start__month
@@ -367,8 +367,8 @@ FROM (
               , subq_4.lux_listing__window_start__extract_month
               , subq_4.lux_listing__window_start__extract_week
               , subq_4.lux_listing__window_start__extract_day
-              , subq_4.lux_listing__window_start__extract_dayofweek
-              , subq_4.lux_listing__window_start__extract_dayofyear
+              , subq_4.lux_listing__window_start__extract_dow
+              , subq_4.lux_listing__window_start__extract_doy
               , subq_4.lux_listing__window_end__day
               , subq_4.lux_listing__window_end__week
               , subq_4.lux_listing__window_end__month
@@ -379,8 +379,8 @@ FROM (
               , subq_4.lux_listing__window_end__extract_month
               , subq_4.lux_listing__window_end__extract_week
               , subq_4.lux_listing__window_end__extract_day
-              , subq_4.lux_listing__window_end__extract_dayofweek
-              , subq_4.lux_listing__window_end__extract_dayofyear
+              , subq_4.lux_listing__window_end__extract_dow
+              , subq_4.lux_listing__window_end__extract_doy
               , subq_4.lux_listing
               , subq_4.is_confirmed_lux
               , subq_4.lux_listing__is_confirmed_lux
@@ -392,50 +392,50 @@ FROM (
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS window_start__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofweek
-                , EXTRACT(DOY FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_from) AS window_start__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_from) AS window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS window_end__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofweek
-                , EXTRACT(DOY FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_to) AS window_end__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_to) AS window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_from) AS lux_listing__window_start__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS lux_listing__window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS lux_listing__window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS lux_listing__window_start__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
-                , EXTRACT(DOY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS lux_listing__window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS lux_listing__window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS lux_listing__window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS lux_listing__window_end__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
-                , EXTRACT(DOY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql
index 027d1adb23..7e38380b20 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_join_node__plan0.sql
@@ -33,74 +33,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -127,25 +127,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -154,25 +154,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -201,25 +201,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -228,25 +228,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
index 5e08760139..99d4dba7cb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
@@ -41,8 +41,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.ds__day
             , subq_0.ds__week
             , subq_0.ds__month
@@ -53,8 +53,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.account_id__ds_partitioned__day
             , subq_0.account_id__ds_partitioned__week
             , subq_0.account_id__ds_partitioned__month
@@ -65,8 +65,8 @@ FROM (
             , subq_0.account_id__ds_partitioned__extract_month
             , subq_0.account_id__ds_partitioned__extract_week
             , subq_0.account_id__ds_partitioned__extract_day
-            , subq_0.account_id__ds_partitioned__extract_dayofweek
-            , subq_0.account_id__ds_partitioned__extract_dayofyear
+            , subq_0.account_id__ds_partitioned__extract_dow
+            , subq_0.account_id__ds_partitioned__extract_doy
             , subq_0.account_id__ds__day
             , subq_0.account_id__ds__week
             , subq_0.account_id__ds__month
@@ -77,8 +77,8 @@ FROM (
             , subq_0.account_id__ds__extract_month
             , subq_0.account_id__ds__extract_week
             , subq_0.account_id__ds__extract_day
-            , subq_0.account_id__ds__extract_dayofweek
-            , subq_0.account_id__ds__extract_dayofyear
+            , subq_0.account_id__ds__extract_dow
+            , subq_0.account_id__ds__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -89,8 +89,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.account_id
             , subq_0.account_month
             , subq_0.account_id__account_month
@@ -104,50 +104,50 @@ FROM (
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS ds__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM account_month_txns_src_10010.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds) AS ds__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds) AS ds__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds) AS ds__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds) AS ds__extract_doy
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS account_id__ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS account_id__ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS account_id__ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS account_id__ds__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofweek
-              , EXTRACT(DOY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_doy
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -174,8 +174,8 @@ FROM (
             , subq_3.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_3.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_3.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_3.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_3.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_3.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_3.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_3.account_id__ds_partitioned__day AS account_id__ds_partitioned__day
             , subq_3.account_id__ds_partitioned__week AS account_id__ds_partitioned__week
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
@@ -186,8 +186,8 @@ FROM (
             , subq_3.account_id__ds_partitioned__extract_month AS account_id__ds_partitioned__extract_month
             , subq_3.account_id__ds_partitioned__extract_week AS account_id__ds_partitioned__extract_week
             , subq_3.account_id__ds_partitioned__extract_day AS account_id__ds_partitioned__extract_day
-            , subq_3.account_id__ds_partitioned__extract_dayofweek AS account_id__ds_partitioned__extract_dayofweek
-            , subq_3.account_id__ds_partitioned__extract_dayofyear AS account_id__ds_partitioned__extract_dayofyear
+            , subq_3.account_id__ds_partitioned__extract_dow AS account_id__ds_partitioned__extract_dow
+            , subq_3.account_id__ds_partitioned__extract_doy AS account_id__ds_partitioned__extract_doy
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
@@ -198,8 +198,8 @@ FROM (
             , subq_5.ds_partitioned__extract_month AS customer_id__ds_partitioned__extract_month
             , subq_5.ds_partitioned__extract_week AS customer_id__ds_partitioned__extract_week
             , subq_5.ds_partitioned__extract_day AS customer_id__ds_partitioned__extract_day
-            , subq_5.ds_partitioned__extract_dayofweek AS customer_id__ds_partitioned__extract_dayofweek
-            , subq_5.ds_partitioned__extract_dayofyear AS customer_id__ds_partitioned__extract_dayofyear
+            , subq_5.ds_partitioned__extract_dow AS customer_id__ds_partitioned__extract_dow
+            , subq_5.ds_partitioned__extract_doy AS customer_id__ds_partitioned__extract_doy
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
@@ -216,26 +216,26 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_doy
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
-              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(week FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -283,8 +283,8 @@ FROM (
               , subq_4.ds_partitioned__extract_month
               , subq_4.ds_partitioned__extract_week
               , subq_4.ds_partitioned__extract_day
-              , subq_4.ds_partitioned__extract_dayofweek
-              , subq_4.ds_partitioned__extract_dayofyear
+              , subq_4.ds_partitioned__extract_dow
+              , subq_4.ds_partitioned__extract_doy
               , subq_4.customer_id__ds_partitioned__day
               , subq_4.customer_id__ds_partitioned__week
               , subq_4.customer_id__ds_partitioned__month
@@ -295,8 +295,8 @@ FROM (
               , subq_4.customer_id__ds_partitioned__extract_month
               , subq_4.customer_id__ds_partitioned__extract_week
               , subq_4.customer_id__ds_partitioned__extract_day
-              , subq_4.customer_id__ds_partitioned__extract_dayofweek
-              , subq_4.customer_id__ds_partitioned__extract_dayofyear
+              , subq_4.customer_id__ds_partitioned__extract_dow
+              , subq_4.customer_id__ds_partitioned__extract_doy
               , subq_4.customer_id
               , subq_4.customer_name
               , subq_4.customer_atomic_weight
@@ -312,13 +312,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -326,13 +326,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__year
-                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofweek
-                , EXTRACT(DOY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
+                , EXTRACT(week FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
+                , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
+                , EXTRACT(dow FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
index 7eaea2b4de..54b108dd33 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multiple_metrics_no_dimensions__plan0.sql
@@ -28,8 +28,8 @@ FROM (
           , subq_1.ds__extract_month
           , subq_1.ds__extract_week
           , subq_1.ds__extract_day
-          , subq_1.ds__extract_dayofweek
-          , subq_1.ds__extract_dayofyear
+          , subq_1.ds__extract_dow
+          , subq_1.ds__extract_doy
           , subq_1.ds_partitioned__day
           , subq_1.ds_partitioned__week
           , subq_1.ds_partitioned__month
@@ -40,8 +40,8 @@ FROM (
           , subq_1.ds_partitioned__extract_month
           , subq_1.ds_partitioned__extract_week
           , subq_1.ds_partitioned__extract_day
-          , subq_1.ds_partitioned__extract_dayofweek
-          , subq_1.ds_partitioned__extract_dayofyear
+          , subq_1.ds_partitioned__extract_dow
+          , subq_1.ds_partitioned__extract_doy
           , subq_1.paid_at__day
           , subq_1.paid_at__week
           , subq_1.paid_at__month
@@ -52,8 +52,8 @@ FROM (
           , subq_1.paid_at__extract_month
           , subq_1.paid_at__extract_week
           , subq_1.paid_at__extract_day
-          , subq_1.paid_at__extract_dayofweek
-          , subq_1.paid_at__extract_dayofyear
+          , subq_1.paid_at__extract_dow
+          , subq_1.paid_at__extract_doy
           , subq_1.booking__ds__day
           , subq_1.booking__ds__week
           , subq_1.booking__ds__month
@@ -64,8 +64,8 @@ FROM (
           , subq_1.booking__ds__extract_month
           , subq_1.booking__ds__extract_week
           , subq_1.booking__ds__extract_day
-          , subq_1.booking__ds__extract_dayofweek
-          , subq_1.booking__ds__extract_dayofyear
+          , subq_1.booking__ds__extract_dow
+          , subq_1.booking__ds__extract_doy
           , subq_1.booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month
@@ -76,8 +76,8 @@ FROM (
           , subq_1.booking__ds_partitioned__extract_month
           , subq_1.booking__ds_partitioned__extract_week
           , subq_1.booking__ds_partitioned__extract_day
-          , subq_1.booking__ds_partitioned__extract_dayofweek
-          , subq_1.booking__ds_partitioned__extract_dayofyear
+          , subq_1.booking__ds_partitioned__extract_dow
+          , subq_1.booking__ds_partitioned__extract_doy
           , subq_1.booking__paid_at__day
           , subq_1.booking__paid_at__week
           , subq_1.booking__paid_at__month
@@ -88,8 +88,8 @@ FROM (
           , subq_1.booking__paid_at__extract_month
           , subq_1.booking__paid_at__extract_week
           , subq_1.booking__paid_at__extract_day
-          , subq_1.booking__paid_at__extract_dayofweek
-          , subq_1.booking__paid_at__extract_dayofyear
+          , subq_1.booking__paid_at__extract_dow
+          , subq_1.booking__paid_at__extract_doy
           , subq_1.metric_time__day
           , subq_1.metric_time__week
           , subq_1.metric_time__month
@@ -100,8 +100,8 @@ FROM (
           , subq_1.metric_time__extract_month
           , subq_1.metric_time__extract_week
           , subq_1.metric_time__extract_day
-          , subq_1.metric_time__extract_dayofweek
-          , subq_1.metric_time__extract_dayofyear
+          , subq_1.metric_time__extract_dow
+          , subq_1.metric_time__extract_doy
           , subq_1.listing
           , subq_1.guest
           , subq_1.host
@@ -136,8 +136,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -148,8 +148,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -160,8 +160,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -172,8 +172,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -184,8 +184,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -196,8 +196,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -208,8 +208,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -254,74 +254,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -362,8 +362,8 @@ CROSS JOIN (
           , subq_7.ds__extract_month
           , subq_7.ds__extract_week
           , subq_7.ds__extract_day
-          , subq_7.ds__extract_dayofweek
-          , subq_7.ds__extract_dayofyear
+          , subq_7.ds__extract_dow
+          , subq_7.ds__extract_doy
           , subq_7.created_at__day
           , subq_7.created_at__week
           , subq_7.created_at__month
@@ -374,8 +374,8 @@ CROSS JOIN (
           , subq_7.created_at__extract_month
           , subq_7.created_at__extract_week
           , subq_7.created_at__extract_day
-          , subq_7.created_at__extract_dayofweek
-          , subq_7.created_at__extract_dayofyear
+          , subq_7.created_at__extract_dow
+          , subq_7.created_at__extract_doy
           , subq_7.listing__ds__day
           , subq_7.listing__ds__week
           , subq_7.listing__ds__month
@@ -386,8 +386,8 @@ CROSS JOIN (
           , subq_7.listing__ds__extract_month
           , subq_7.listing__ds__extract_week
           , subq_7.listing__ds__extract_day
-          , subq_7.listing__ds__extract_dayofweek
-          , subq_7.listing__ds__extract_dayofyear
+          , subq_7.listing__ds__extract_dow
+          , subq_7.listing__ds__extract_doy
           , subq_7.listing__created_at__day
           , subq_7.listing__created_at__week
           , subq_7.listing__created_at__month
@@ -398,8 +398,8 @@ CROSS JOIN (
           , subq_7.listing__created_at__extract_month
           , subq_7.listing__created_at__extract_week
           , subq_7.listing__created_at__extract_day
-          , subq_7.listing__created_at__extract_dayofweek
-          , subq_7.listing__created_at__extract_dayofyear
+          , subq_7.listing__created_at__extract_dow
+          , subq_7.listing__created_at__extract_doy
           , subq_7.metric_time__day
           , subq_7.metric_time__week
           , subq_7.metric_time__month
@@ -410,8 +410,8 @@ CROSS JOIN (
           , subq_7.metric_time__extract_month
           , subq_7.metric_time__extract_week
           , subq_7.metric_time__extract_day
-          , subq_7.metric_time__extract_dayofweek
-          , subq_7.metric_time__extract_dayofyear
+          , subq_7.metric_time__extract_dow
+          , subq_7.metric_time__extract_doy
           , subq_7.listing
           , subq_7.user
           , subq_7.listing__user
@@ -437,8 +437,8 @@ CROSS JOIN (
             , subq_6.ds__extract_month
             , subq_6.ds__extract_week
             , subq_6.ds__extract_day
-            , subq_6.ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear
+            , subq_6.ds__extract_dow
+            , subq_6.ds__extract_doy
             , subq_6.created_at__day
             , subq_6.created_at__week
             , subq_6.created_at__month
@@ -449,8 +449,8 @@ CROSS JOIN (
             , subq_6.created_at__extract_month
             , subq_6.created_at__extract_week
             , subq_6.created_at__extract_day
-            , subq_6.created_at__extract_dayofweek
-            , subq_6.created_at__extract_dayofyear
+            , subq_6.created_at__extract_dow
+            , subq_6.created_at__extract_doy
             , subq_6.listing__ds__day
             , subq_6.listing__ds__week
             , subq_6.listing__ds__month
@@ -461,8 +461,8 @@ CROSS JOIN (
             , subq_6.listing__ds__extract_month
             , subq_6.listing__ds__extract_week
             , subq_6.listing__ds__extract_day
-            , subq_6.listing__ds__extract_dayofweek
-            , subq_6.listing__ds__extract_dayofyear
+            , subq_6.listing__ds__extract_dow
+            , subq_6.listing__ds__extract_doy
             , subq_6.listing__created_at__day
             , subq_6.listing__created_at__week
             , subq_6.listing__created_at__month
@@ -473,8 +473,8 @@ CROSS JOIN (
             , subq_6.listing__created_at__extract_month
             , subq_6.listing__created_at__extract_week
             , subq_6.listing__created_at__extract_day
-            , subq_6.listing__created_at__extract_dayofweek
-            , subq_6.listing__created_at__extract_dayofyear
+            , subq_6.listing__created_at__extract_dow
+            , subq_6.listing__created_at__extract_doy
             , subq_6.ds__day AS metric_time__day
             , subq_6.ds__week AS metric_time__week
             , subq_6.ds__month AS metric_time__month
@@ -485,8 +485,8 @@ CROSS JOIN (
             , subq_6.ds__extract_month AS metric_time__extract_month
             , subq_6.ds__extract_week AS metric_time__extract_week
             , subq_6.ds__extract_day AS metric_time__extract_day
-            , subq_6.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_6.ds__extract_dow AS metric_time__extract_dow
+            , subq_6.ds__extract_doy AS metric_time__extract_doy
             , subq_6.listing
             , subq_6.user
             , subq_6.listing__user
@@ -510,25 +510,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -537,25 +537,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-              , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql
index fae92e63dc..a716977aaf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_nested_derived_metric__plan0.sql
@@ -49,8 +49,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -61,8 +61,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -73,8 +73,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -85,8 +85,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -97,8 +97,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -109,8 +109,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -121,8 +121,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -167,74 +167,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -278,8 +278,8 @@ FROM (
                 , subq_5.ds__extract_month
                 , subq_5.ds__extract_week
                 , subq_5.ds__extract_day
-                , subq_5.ds__extract_dayofweek
-                , subq_5.ds__extract_dayofyear
+                , subq_5.ds__extract_dow
+                , subq_5.ds__extract_doy
                 , subq_5.ds_partitioned__day
                 , subq_5.ds_partitioned__week
                 , subq_5.ds_partitioned__month
@@ -290,8 +290,8 @@ FROM (
                 , subq_5.ds_partitioned__extract_month
                 , subq_5.ds_partitioned__extract_week
                 , subq_5.ds_partitioned__extract_day
-                , subq_5.ds_partitioned__extract_dayofweek
-                , subq_5.ds_partitioned__extract_dayofyear
+                , subq_5.ds_partitioned__extract_dow
+                , subq_5.ds_partitioned__extract_doy
                 , subq_5.paid_at__day
                 , subq_5.paid_at__week
                 , subq_5.paid_at__month
@@ -302,8 +302,8 @@ FROM (
                 , subq_5.paid_at__extract_month
                 , subq_5.paid_at__extract_week
                 , subq_5.paid_at__extract_day
-                , subq_5.paid_at__extract_dayofweek
-                , subq_5.paid_at__extract_dayofyear
+                , subq_5.paid_at__extract_dow
+                , subq_5.paid_at__extract_doy
                 , subq_5.booking__ds__day
                 , subq_5.booking__ds__week
                 , subq_5.booking__ds__month
@@ -314,8 +314,8 @@ FROM (
                 , subq_5.booking__ds__extract_month
                 , subq_5.booking__ds__extract_week
                 , subq_5.booking__ds__extract_day
-                , subq_5.booking__ds__extract_dayofweek
-                , subq_5.booking__ds__extract_dayofyear
+                , subq_5.booking__ds__extract_dow
+                , subq_5.booking__ds__extract_doy
                 , subq_5.booking__ds_partitioned__day
                 , subq_5.booking__ds_partitioned__week
                 , subq_5.booking__ds_partitioned__month
@@ -326,8 +326,8 @@ FROM (
                 , subq_5.booking__ds_partitioned__extract_month
                 , subq_5.booking__ds_partitioned__extract_week
                 , subq_5.booking__ds_partitioned__extract_day
-                , subq_5.booking__ds_partitioned__extract_dayofweek
-                , subq_5.booking__ds_partitioned__extract_dayofyear
+                , subq_5.booking__ds_partitioned__extract_dow
+                , subq_5.booking__ds_partitioned__extract_doy
                 , subq_5.booking__paid_at__day
                 , subq_5.booking__paid_at__week
                 , subq_5.booking__paid_at__month
@@ -338,8 +338,8 @@ FROM (
                 , subq_5.booking__paid_at__extract_month
                 , subq_5.booking__paid_at__extract_week
                 , subq_5.booking__paid_at__extract_day
-                , subq_5.booking__paid_at__extract_dayofweek
-                , subq_5.booking__paid_at__extract_dayofyear
+                , subq_5.booking__paid_at__extract_dow
+                , subq_5.booking__paid_at__extract_doy
                 , subq_5.ds__day AS metric_time__day
                 , subq_5.ds__week AS metric_time__week
                 , subq_5.ds__month AS metric_time__month
@@ -350,8 +350,8 @@ FROM (
                 , subq_5.ds__extract_month AS metric_time__extract_month
                 , subq_5.ds__extract_week AS metric_time__extract_week
                 , subq_5.ds__extract_day AS metric_time__extract_day
-                , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_5.ds__extract_dow AS metric_time__extract_dow
+                , subq_5.ds__extract_doy AS metric_time__extract_doy
                 , subq_5.listing
                 , subq_5.guest
                 , subq_5.host
@@ -396,74 +396,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -519,8 +519,8 @@ FROM (
             , subq_12.ds__extract_month
             , subq_12.ds__extract_week
             , subq_12.ds__extract_day
-            , subq_12.ds__extract_dayofweek
-            , subq_12.ds__extract_dayofyear
+            , subq_12.ds__extract_dow
+            , subq_12.ds__extract_doy
             , subq_12.ds_partitioned__day
             , subq_12.ds_partitioned__week
             , subq_12.ds_partitioned__month
@@ -531,8 +531,8 @@ FROM (
             , subq_12.ds_partitioned__extract_month
             , subq_12.ds_partitioned__extract_week
             , subq_12.ds_partitioned__extract_day
-            , subq_12.ds_partitioned__extract_dayofweek
-            , subq_12.ds_partitioned__extract_dayofyear
+            , subq_12.ds_partitioned__extract_dow
+            , subq_12.ds_partitioned__extract_doy
             , subq_12.paid_at__day
             , subq_12.paid_at__week
             , subq_12.paid_at__month
@@ -543,8 +543,8 @@ FROM (
             , subq_12.paid_at__extract_month
             , subq_12.paid_at__extract_week
             , subq_12.paid_at__extract_day
-            , subq_12.paid_at__extract_dayofweek
-            , subq_12.paid_at__extract_dayofyear
+            , subq_12.paid_at__extract_dow
+            , subq_12.paid_at__extract_doy
             , subq_12.booking__ds__day
             , subq_12.booking__ds__week
             , subq_12.booking__ds__month
@@ -555,8 +555,8 @@ FROM (
             , subq_12.booking__ds__extract_month
             , subq_12.booking__ds__extract_week
             , subq_12.booking__ds__extract_day
-            , subq_12.booking__ds__extract_dayofweek
-            , subq_12.booking__ds__extract_dayofyear
+            , subq_12.booking__ds__extract_dow
+            , subq_12.booking__ds__extract_doy
             , subq_12.booking__ds_partitioned__day
             , subq_12.booking__ds_partitioned__week
             , subq_12.booking__ds_partitioned__month
@@ -567,8 +567,8 @@ FROM (
             , subq_12.booking__ds_partitioned__extract_month
             , subq_12.booking__ds_partitioned__extract_week
             , subq_12.booking__ds_partitioned__extract_day
-            , subq_12.booking__ds_partitioned__extract_dayofweek
-            , subq_12.booking__ds_partitioned__extract_dayofyear
+            , subq_12.booking__ds_partitioned__extract_dow
+            , subq_12.booking__ds_partitioned__extract_doy
             , subq_12.booking__paid_at__day
             , subq_12.booking__paid_at__week
             , subq_12.booking__paid_at__month
@@ -579,8 +579,8 @@ FROM (
             , subq_12.booking__paid_at__extract_month
             , subq_12.booking__paid_at__extract_week
             , subq_12.booking__paid_at__extract_day
-            , subq_12.booking__paid_at__extract_dayofweek
-            , subq_12.booking__paid_at__extract_dayofyear
+            , subq_12.booking__paid_at__extract_dow
+            , subq_12.booking__paid_at__extract_doy
             , subq_12.ds__day AS metric_time__day
             , subq_12.ds__week AS metric_time__week
             , subq_12.ds__month AS metric_time__month
@@ -591,8 +591,8 @@ FROM (
             , subq_12.ds__extract_month AS metric_time__extract_month
             , subq_12.ds__extract_week AS metric_time__extract_week
             , subq_12.ds__extract_day AS metric_time__extract_day
-            , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_12.ds__extract_dow AS metric_time__extract_dow
+            , subq_12.ds__extract_doy AS metric_time__extract_doy
             , subq_12.listing
             , subq_12.guest
             , subq_12.host
@@ -637,74 +637,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -758,8 +758,8 @@ FROM (
             , subq_17.ds__extract_month
             , subq_17.ds__extract_week
             , subq_17.ds__extract_day
-            , subq_17.ds__extract_dayofweek
-            , subq_17.ds__extract_dayofyear
+            , subq_17.ds__extract_dow
+            , subq_17.ds__extract_doy
             , subq_17.ds_partitioned__day
             , subq_17.ds_partitioned__week
             , subq_17.ds_partitioned__month
@@ -770,8 +770,8 @@ FROM (
             , subq_17.ds_partitioned__extract_month
             , subq_17.ds_partitioned__extract_week
             , subq_17.ds_partitioned__extract_day
-            , subq_17.ds_partitioned__extract_dayofweek
-            , subq_17.ds_partitioned__extract_dayofyear
+            , subq_17.ds_partitioned__extract_dow
+            , subq_17.ds_partitioned__extract_doy
             , subq_17.paid_at__day
             , subq_17.paid_at__week
             , subq_17.paid_at__month
@@ -782,8 +782,8 @@ FROM (
             , subq_17.paid_at__extract_month
             , subq_17.paid_at__extract_week
             , subq_17.paid_at__extract_day
-            , subq_17.paid_at__extract_dayofweek
-            , subq_17.paid_at__extract_dayofyear
+            , subq_17.paid_at__extract_dow
+            , subq_17.paid_at__extract_doy
             , subq_17.booking__ds__day
             , subq_17.booking__ds__week
             , subq_17.booking__ds__month
@@ -794,8 +794,8 @@ FROM (
             , subq_17.booking__ds__extract_month
             , subq_17.booking__ds__extract_week
             , subq_17.booking__ds__extract_day
-            , subq_17.booking__ds__extract_dayofweek
-            , subq_17.booking__ds__extract_dayofyear
+            , subq_17.booking__ds__extract_dow
+            , subq_17.booking__ds__extract_doy
             , subq_17.booking__ds_partitioned__day
             , subq_17.booking__ds_partitioned__week
             , subq_17.booking__ds_partitioned__month
@@ -806,8 +806,8 @@ FROM (
             , subq_17.booking__ds_partitioned__extract_month
             , subq_17.booking__ds_partitioned__extract_week
             , subq_17.booking__ds_partitioned__extract_day
-            , subq_17.booking__ds_partitioned__extract_dayofweek
-            , subq_17.booking__ds_partitioned__extract_dayofyear
+            , subq_17.booking__ds_partitioned__extract_dow
+            , subq_17.booking__ds_partitioned__extract_doy
             , subq_17.booking__paid_at__day
             , subq_17.booking__paid_at__week
             , subq_17.booking__paid_at__month
@@ -818,8 +818,8 @@ FROM (
             , subq_17.booking__paid_at__extract_month
             , subq_17.booking__paid_at__extract_week
             , subq_17.booking__paid_at__extract_day
-            , subq_17.booking__paid_at__extract_dayofweek
-            , subq_17.booking__paid_at__extract_dayofyear
+            , subq_17.booking__paid_at__extract_dow
+            , subq_17.booking__paid_at__extract_doy
             , subq_17.ds__day AS metric_time__day
             , subq_17.ds__week AS metric_time__week
             , subq_17.ds__month AS metric_time__month
@@ -830,8 +830,8 @@ FROM (
             , subq_17.ds__extract_month AS metric_time__extract_month
             , subq_17.ds__extract_week AS metric_time__extract_week
             , subq_17.ds__extract_day AS metric_time__extract_day
-            , subq_17.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_17.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_17.ds__extract_dow AS metric_time__extract_dow
+            , subq_17.ds__extract_doy AS metric_time__extract_doy
             , subq_17.listing
             , subq_17.guest
             , subq_17.host
@@ -876,74 +876,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql
index 3ada9bf35a..d6632b499f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_order_by_node__plan0.sql
@@ -45,74 +45,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql
index 6eeaaeaeef..44cff4ab94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_partitioned_join__plan0.sql
@@ -41,8 +41,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -53,8 +53,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.verification__ds__day
             , subq_0.verification__ds__week
             , subq_0.verification__ds__month
@@ -65,8 +65,8 @@ FROM (
             , subq_0.verification__ds__extract_month
             , subq_0.verification__ds__extract_week
             , subq_0.verification__ds__extract_day
-            , subq_0.verification__ds__extract_dayofweek
-            , subq_0.verification__ds__extract_dayofyear
+            , subq_0.verification__ds__extract_dow
+            , subq_0.verification__ds__extract_doy
             , subq_0.verification__ds_partitioned__day
             , subq_0.verification__ds_partitioned__week
             , subq_0.verification__ds_partitioned__month
@@ -77,8 +77,8 @@ FROM (
             , subq_0.verification__ds_partitioned__extract_month
             , subq_0.verification__ds_partitioned__extract_week
             , subq_0.verification__ds_partitioned__extract_day
-            , subq_0.verification__ds_partitioned__extract_dayofweek
-            , subq_0.verification__ds_partitioned__extract_dayofyear
+            , subq_0.verification__ds_partitioned__extract_dow
+            , subq_0.verification__ds_partitioned__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -89,8 +89,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.verification
             , subq_0.user
             , subq_0.verification__user
@@ -106,50 +106,50 @@ FROM (
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
-              , EXTRACT(DOY FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds) AS ds__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds) AS ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
-              , EXTRACT(DOY FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
-              , EXTRACT(DOY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -173,74 +173,74 @@ FROM (
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS ds__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dayofweek
-            , EXTRACT(DOY FROM users_ds_source_src_10007.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds) AS ds__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds) AS ds__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds) AS ds__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds) AS ds__extract_doy
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS created_at__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofweek
-            , EXTRACT(DOY FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.created_at) AS created_at__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.created_at) AS created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds) AS user__ds__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS user__ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS user__ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS user__ds__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofweek
-            , EXTRACT(DOY FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds) AS user__ds__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds) AS user__ds__extract_doy
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS user__created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS user__created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS user__created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS user__created_at__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofweek
-            , EXTRACT(DOY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql
index f26bd34521..33fc914795 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -82,26 +82,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql
index 0e5972d3ea..d90abbd294 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DOY FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DOY FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql
index fa1d4a6720..dc98b44d95 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -83,26 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index 3c78b2147d..d723157d2a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DOY FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DOY FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 3dcd0390ef..95274f2863 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -83,26 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DOY FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index e722f24125..e0c877bdf1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DOY FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DOY FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql
index e2cc098fae..9c6e0a2676 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_single_join_node__plan0.sql
@@ -31,74 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -125,25 +125,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -152,25 +152,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DOY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql
index e337bd9061..b9ae7f84a4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0.sql
@@ -20,74 +20,74 @@ SELECT
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql
index 82a5abe48e..d1560d9ab0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_source_node__plan0_optimized.sql
@@ -20,74 +20,74 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DOY FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DOY FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DOY FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DOY FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DOY FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DOY FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
index 618f5f9d28..b954d8927e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_common_semantic_model__plan0.sql
@@ -150,74 +150,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -379,74 +379,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql
index 70db1edf09..b1bf877e84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node__plan0.sql
@@ -44,74 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -138,25 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -165,25 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 350c29d01e..5373f3b9a9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -174,74 +174,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -344,25 +344,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -371,25 +371,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -519,49 +519,49 @@ FROM (
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS ds__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_doy
+                  , EXTRACT(year FROM views_source_src_10009.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds) AS ds__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds) AS ds__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds) AS ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_doy
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC('week', views_source_src_10009.ds) AS view__ds__week
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS view__ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS view__ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS view__ds__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS view__ds__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS view__ds__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS view__ds__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS view__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_doy
+                  , EXTRACT(year FROM views_source_src_10009.ds) AS view__ds__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds) AS view__ds__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds) AS view__ds__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds) AS view__ds__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds) AS view__ds__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds) AS view__ds__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds) AS view__ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_doy
+                  , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_doy
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -662,25 +662,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -689,25 +689,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index 6cae314057..1bd176c115 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -47,74 +47,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -141,25 +141,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -168,25 +168,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
index 26ccf221dd..cd879426f7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_compute_metrics_node_simple_expr__plan0.sql
@@ -44,74 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -138,25 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -165,25 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql
index 3de0908e02..5b6dd99cc4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_constrain_time_range_node__plan0.sql
@@ -38,74 +38,74 @@ FROM (
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+        , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+        , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+        , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+        , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+        , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+        , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
index ac35263413..6920a36691 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric__plan0.sql
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
index abf31492df..4080ab9420 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_grain_to_date__plan0.sql
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
index 20b5cb5156..fcf74a5947 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_ds__plan0.sql
@@ -61,25 +61,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
index aee104bfff..0143335613 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window__plan0.sql
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 7ba9208a6a..5cba3a3202 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -106,25 +106,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
index 788131918a..414159089b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -106,25 +106,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
index 09e9a7df29..5b4011175d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric__plan0.sql
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -384,74 +384,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
index 2f56bdd23c..d11a69936d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index c6aea810c4..b98d6d0f3d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
index 0596eaabd8..38aeec72e9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 27218c34d0..0ad6211336 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 539423b5b3..c987150223 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -258,74 +258,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -593,74 +593,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 62ac8e39b4..cddee48ddb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -258,74 +258,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -594,74 +594,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
index 23ad4fab94..94cf44278b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
@@ -366,74 +366,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 6c3c772ab7..6b4f9e31f9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -252,74 +252,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
index dae3f52e98..40f6785af3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_distinct_values__plan0.sql
@@ -165,74 +165,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -335,25 +335,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -362,25 +362,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql
index 395033b94a..a43457fcbd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_node__plan0.sql
@@ -25,74 +25,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
index 18c852b528..a3ce23fb89 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_node__plan0.sql
@@ -31,74 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 028e45452a..70919d8caa 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -171,74 +171,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -341,25 +341,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -368,25 +368,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
index c2f4c8e617..6e4488a729 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_scd_dimension__plan0.sql
@@ -159,74 +159,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -255,25 +255,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dow
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_doy
+                , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_from) AS window_start__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_from) AS window_start__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_from) AS window_start__extract_doy
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dow
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_doy
+                , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_to) AS window_end__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_to) AS window_end__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_to) AS window_end__extract_doy
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -282,25 +282,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
+                , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
+                , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 56ed62001f..9f23719b49 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
index 7dafb98791..406b83cae3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
index 5bf86bf052..2093e49b0b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
index 1680cc5146..eb506ddf59 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_limit_rows__plan0.sql
@@ -149,74 +149,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
index 909e22c61e..d5688f0e2d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_local_dimension_using_local_entity__plan0.sql
@@ -99,25 +99,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -126,25 +126,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql
index 65582ae31f..dbfcb34b94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_aggregation_node__plan0.sql
@@ -35,74 +35,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
index f74d279e69..e5349b0d17 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint__plan0.sql
@@ -183,74 +183,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -353,25 +353,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -380,25 +380,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -594,74 +594,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -764,25 +764,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -791,25 +791,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -988,74 +988,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
index f536c2ec12..c11754db0d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_reused_measure__plan0.sql
@@ -168,74 +168,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -400,74 +400,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 61e0a3c0e0..bd41d48bd9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -162,74 +162,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 59683b27c8..ecc15101fe 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -150,74 +150,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -329,25 +329,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -356,25 +356,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
index 3f01da6648..d1740a6a39 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
@@ -149,74 +149,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -318,25 +318,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_doy
+              , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_from) AS window_start__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_from) AS window_start__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_from) AS window_start__extract_doy
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_doy
+              , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_to) AS window_end__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_to) AS window_end__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_to) AS window_end__extract_doy
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -345,25 +345,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
+              , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
+              , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -437,26 +437,26 @@ FROM (
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS ds__year
-                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_doy
+                , EXTRACT(year FROM users_latest_src_10021.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM users_latest_src_10021.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM users_latest_src_10021.ds) AS ds__extract_month
+                , EXTRACT(week FROM users_latest_src_10021.ds) AS ds__extract_week
+                , EXTRACT(day FROM users_latest_src_10021.ds) AS ds__extract_day
+                , EXTRACT(dow FROM users_latest_src_10021.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM users_latest_src_10021.ds) AS ds__extract_doy
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC('week', users_latest_src_10021.ds) AS user__ds__week
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS user__ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS user__ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS user__ds__year
-                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS user__ds__extract_year
-                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
-                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS user__ds__extract_month
-                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
-                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS user__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_doy
+                , EXTRACT(year FROM users_latest_src_10021.ds) AS user__ds__extract_year
+                , EXTRACT(quarter FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
+                , EXTRACT(month FROM users_latest_src_10021.ds) AS user__ds__extract_month
+                , EXTRACT(week FROM users_latest_src_10021.ds) AS user__ds__extract_week
+                , EXTRACT(day FROM users_latest_src_10021.ds) AS user__ds__extract_day
+                , EXTRACT(dow FROM users_latest_src_10021.ds) AS user__ds__extract_dow
+                , EXTRACT(doy FROM users_latest_src_10021.ds) AS user__ds__extract_doy
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
index 2303464654..8abc633b9a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
@@ -149,74 +149,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -392,50 +392,50 @@ FROM (
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS window_start__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dow
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_doy
+                , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_from) AS window_start__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_from) AS window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS window_end__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dow
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_doy
+                , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_to) AS window_end__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_to) AS window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_from) AS lux_listing__window_start__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS lux_listing__window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS lux_listing__window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS lux_listing__window_start__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dow
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_doy
+                , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS lux_listing__window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS lux_listing__window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS lux_listing__window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS lux_listing__window_end__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dow
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_doy
+                , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql
index 2ef9e97902..7e38380b20 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_join_node__plan0.sql
@@ -33,74 +33,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -127,25 +127,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -154,25 +154,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -201,25 +201,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -228,25 +228,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
index 5a28324203..99d4dba7cb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
@@ -104,50 +104,50 @@ FROM (
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS ds__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_doy
+              , EXTRACT(year FROM account_month_txns_src_10010.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds) AS ds__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds) AS ds__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds) AS ds__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds) AS ds__extract_doy
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_doy
+              , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS account_id__ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS account_id__ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS account_id__ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS account_id__ds__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_doy
+              , EXTRACT(year FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_doy
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -216,26 +216,26 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_doy
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
-              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(week FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -312,13 +312,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -326,13 +326,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__year
-                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_doy
+                , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
+                , EXTRACT(week FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
+                , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
+                , EXTRACT(dow FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
index 38e701d35f..54b108dd33 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multiple_metrics_no_dimensions__plan0.sql
@@ -254,74 +254,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -510,25 +510,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -537,25 +537,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
index c84ceda6fa..a716977aaf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_nested_derived_metric__plan0.sql
@@ -167,74 +167,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -396,74 +396,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -637,74 +637,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -876,74 +876,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql
index d9c8ed0995..d6632b499f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_order_by_node__plan0.sql
@@ -45,74 +45,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
index 73a3eb36fd..44cff4ab94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_partitioned_join__plan0.sql
@@ -106,50 +106,50 @@ FROM (
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_doy
+              , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds) AS ds__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds) AS ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
+              , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
+              , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -173,74 +173,74 @@ FROM (
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS ds__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_doy
+            , EXTRACT(year FROM users_ds_source_src_10007.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds) AS ds__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds) AS ds__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds) AS ds__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds) AS ds__extract_doy
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS created_at__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_doy
+            , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.created_at) AS created_at__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.created_at) AS created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds) AS user__ds__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS user__ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS user__ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS user__ds__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_doy
+            , EXTRACT(year FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds) AS user__ds__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds) AS user__ds__extract_doy
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS user__created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS user__created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS user__created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS user__created_at__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_doy
+            , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_doy
+            , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql
index bf73140286..33fc914795 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0.sql
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -82,26 +82,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
index 37fb636c96..d90abbd294 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node__plan0_optimized.sql
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_doy
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
index 5801bf4ecd..dc98b44d95 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -83,26 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index b83343fe92..d723157d2a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_doy
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index d76c04b1c2..95274f2863 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -83,26 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index 7b9abd7ccb..e0c877bdf1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_doy
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql
index 79dbc6f87e..9c6e0a2676 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_single_join_node__plan0.sql
@@ -31,74 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -125,25 +125,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -152,25 +152,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql
index a046c27cbb..b9ae7f84a4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0.sql
@@ -20,74 +20,74 @@ SELECT
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql
index fd0050700e..d1560d9ab0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_source_node__plan0_optimized.sql
@@ -20,74 +20,74 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_doy
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_doy
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_doy
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_doy
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql
index d2a3c6afd9..b954d8927e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_common_semantic_model__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -150,74 +150,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -261,8 +261,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month
           , subq_5.ds__extract_week
           , subq_5.ds__extract_day
-          , subq_5.ds__extract_dayofweek
-          , subq_5.ds__extract_dayofyear
+          , subq_5.ds__extract_dow
+          , subq_5.ds__extract_doy
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
@@ -273,8 +273,8 @@ FULL OUTER JOIN (
           , subq_5.ds_partitioned__extract_month
           , subq_5.ds_partitioned__extract_week
           , subq_5.ds_partitioned__extract_day
-          , subq_5.ds_partitioned__extract_dayofweek
-          , subq_5.ds_partitioned__extract_dayofyear
+          , subq_5.ds_partitioned__extract_dow
+          , subq_5.ds_partitioned__extract_doy
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
@@ -285,8 +285,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month
           , subq_5.paid_at__extract_week
           , subq_5.paid_at__extract_day
-          , subq_5.paid_at__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear
+          , subq_5.paid_at__extract_dow
+          , subq_5.paid_at__extract_doy
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
@@ -297,8 +297,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds__extract_month
           , subq_5.booking__ds__extract_week
           , subq_5.booking__ds__extract_day
-          , subq_5.booking__ds__extract_dayofweek
-          , subq_5.booking__ds__extract_dayofyear
+          , subq_5.booking__ds__extract_dow
+          , subq_5.booking__ds__extract_doy
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
@@ -309,8 +309,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds_partitioned__extract_month
           , subq_5.booking__ds_partitioned__extract_week
           , subq_5.booking__ds_partitioned__extract_day
-          , subq_5.booking__ds_partitioned__extract_dayofweek
-          , subq_5.booking__ds_partitioned__extract_dayofyear
+          , subq_5.booking__ds_partitioned__extract_dow
+          , subq_5.booking__ds_partitioned__extract_doy
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
@@ -321,8 +321,8 @@ FULL OUTER JOIN (
           , subq_5.booking__paid_at__extract_month
           , subq_5.booking__paid_at__extract_week
           , subq_5.booking__paid_at__extract_day
-          , subq_5.booking__paid_at__extract_dayofweek
-          , subq_5.booking__paid_at__extract_dayofyear
+          , subq_5.booking__paid_at__extract_dow
+          , subq_5.booking__paid_at__extract_doy
           , subq_5.ds__day AS metric_time__day
           , subq_5.ds__week AS metric_time__week
           , subq_5.ds__month AS metric_time__month
@@ -333,8 +333,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month AS metric_time__extract_month
           , subq_5.ds__extract_week AS metric_time__extract_week
           , subq_5.ds__extract_day AS metric_time__extract_day
-          , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_5.ds__extract_dow AS metric_time__extract_dow
+          , subq_5.ds__extract_doy AS metric_time__extract_doy
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
@@ -379,74 +379,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql
index c80b16baf0..b1bf877e84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node__plan0.sql
@@ -44,74 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -138,25 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -165,25 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 2426067bd3..12e006e550 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -56,8 +56,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -68,8 +68,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -80,8 +80,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -92,8 +92,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -104,8 +104,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -116,8 +116,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -128,8 +128,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -174,74 +174,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -271,8 +271,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -283,8 +283,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -295,8 +295,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -307,8 +307,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -319,8 +319,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -344,25 +344,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -371,25 +371,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -455,8 +455,8 @@ FROM (
                 , subq_10.ds__extract_month
                 , subq_10.ds__extract_week
                 , subq_10.ds__extract_day
-                , subq_10.ds__extract_dayofweek
-                , subq_10.ds__extract_dayofyear
+                , subq_10.ds__extract_dow
+                , subq_10.ds__extract_doy
                 , subq_10.ds_partitioned__day
                 , subq_10.ds_partitioned__week
                 , subq_10.ds_partitioned__month
@@ -467,8 +467,8 @@ FROM (
                 , subq_10.ds_partitioned__extract_month
                 , subq_10.ds_partitioned__extract_week
                 , subq_10.ds_partitioned__extract_day
-                , subq_10.ds_partitioned__extract_dayofweek
-                , subq_10.ds_partitioned__extract_dayofyear
+                , subq_10.ds_partitioned__extract_dow
+                , subq_10.ds_partitioned__extract_doy
                 , subq_10.view__ds__day
                 , subq_10.view__ds__week
                 , subq_10.view__ds__month
@@ -479,8 +479,8 @@ FROM (
                 , subq_10.view__ds__extract_month
                 , subq_10.view__ds__extract_week
                 , subq_10.view__ds__extract_day
-                , subq_10.view__ds__extract_dayofweek
-                , subq_10.view__ds__extract_dayofyear
+                , subq_10.view__ds__extract_dow
+                , subq_10.view__ds__extract_doy
                 , subq_10.view__ds_partitioned__day
                 , subq_10.view__ds_partitioned__week
                 , subq_10.view__ds_partitioned__month
@@ -491,8 +491,8 @@ FROM (
                 , subq_10.view__ds_partitioned__extract_month
                 , subq_10.view__ds_partitioned__extract_week
                 , subq_10.view__ds_partitioned__extract_day
-                , subq_10.view__ds_partitioned__extract_dayofweek
-                , subq_10.view__ds_partitioned__extract_dayofyear
+                , subq_10.view__ds_partitioned__extract_dow
+                , subq_10.view__ds_partitioned__extract_doy
                 , subq_10.ds__day AS metric_time__day
                 , subq_10.ds__week AS metric_time__week
                 , subq_10.ds__month AS metric_time__month
@@ -503,8 +503,8 @@ FROM (
                 , subq_10.ds__extract_month AS metric_time__extract_month
                 , subq_10.ds__extract_week AS metric_time__extract_week
                 , subq_10.ds__extract_day AS metric_time__extract_day
-                , subq_10.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_10.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_10.ds__extract_dow AS metric_time__extract_dow
+                , subq_10.ds__extract_doy AS metric_time__extract_doy
                 , subq_10.listing
                 , subq_10.user
                 , subq_10.view__listing
@@ -519,49 +519,49 @@ FROM (
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS ds__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds) AS ds__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds) AS ds__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds) AS ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_doy
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC('week', views_source_src_10009.ds) AS view__ds__week
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS view__ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS view__ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS view__ds__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS view__ds__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS view__ds__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS view__ds__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS view__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds) AS view__ds__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds) AS view__ds__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds) AS view__ds__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds) AS view__ds__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds) AS view__ds__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds) AS view__ds__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds) AS view__ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_doy
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -589,8 +589,8 @@ FROM (
                 , subq_13.ds__extract_month
                 , subq_13.ds__extract_week
                 , subq_13.ds__extract_day
-                , subq_13.ds__extract_dayofweek
-                , subq_13.ds__extract_dayofyear
+                , subq_13.ds__extract_dow
+                , subq_13.ds__extract_doy
                 , subq_13.created_at__day
                 , subq_13.created_at__week
                 , subq_13.created_at__month
@@ -601,8 +601,8 @@ FROM (
                 , subq_13.created_at__extract_month
                 , subq_13.created_at__extract_week
                 , subq_13.created_at__extract_day
-                , subq_13.created_at__extract_dayofweek
-                , subq_13.created_at__extract_dayofyear
+                , subq_13.created_at__extract_dow
+                , subq_13.created_at__extract_doy
                 , subq_13.listing__ds__day
                 , subq_13.listing__ds__week
                 , subq_13.listing__ds__month
@@ -613,8 +613,8 @@ FROM (
                 , subq_13.listing__ds__extract_month
                 , subq_13.listing__ds__extract_week
                 , subq_13.listing__ds__extract_day
-                , subq_13.listing__ds__extract_dayofweek
-                , subq_13.listing__ds__extract_dayofyear
+                , subq_13.listing__ds__extract_dow
+                , subq_13.listing__ds__extract_doy
                 , subq_13.listing__created_at__day
                 , subq_13.listing__created_at__week
                 , subq_13.listing__created_at__month
@@ -625,8 +625,8 @@ FROM (
                 , subq_13.listing__created_at__extract_month
                 , subq_13.listing__created_at__extract_week
                 , subq_13.listing__created_at__extract_day
-                , subq_13.listing__created_at__extract_dayofweek
-                , subq_13.listing__created_at__extract_dayofyear
+                , subq_13.listing__created_at__extract_dow
+                , subq_13.listing__created_at__extract_doy
                 , subq_13.ds__day AS metric_time__day
                 , subq_13.ds__week AS metric_time__week
                 , subq_13.ds__month AS metric_time__month
@@ -637,8 +637,8 @@ FROM (
                 , subq_13.ds__extract_month AS metric_time__extract_month
                 , subq_13.ds__extract_week AS metric_time__extract_week
                 , subq_13.ds__extract_day AS metric_time__extract_day
-                , subq_13.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_13.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_13.ds__extract_dow AS metric_time__extract_dow
+                , subq_13.ds__extract_doy AS metric_time__extract_doy
                 , subq_13.listing
                 , subq_13.user
                 , subq_13.listing__user
@@ -662,25 +662,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -689,25 +689,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index b2d5615477..bcb36633c9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -47,74 +47,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -141,25 +141,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -168,25 +168,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql
index b6f01861d7..cd879426f7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_compute_metrics_node_simple_expr__plan0.sql
@@ -44,74 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -138,25 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -165,25 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql
index d480357663..5b6dd99cc4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_constrain_time_range_node__plan0.sql
@@ -38,74 +38,74 @@ FROM (
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
index ad08f90e35..6920a36691 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
index 8c2ab1a915..4080ab9420 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_grain_to_date__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
index 8d5b07c69a..fcf74a5947 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_ds__plan0.sql
@@ -23,8 +23,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -35,8 +35,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -47,8 +47,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -61,25 +61,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
index d98f0f554a..0143335613 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 26ab44afcc..5cba3a3202 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_1.ds__extract_month
         , subq_1.ds__extract_week
         , subq_1.ds__extract_day
-        , subq_1.ds__extract_dayofweek
-        , subq_1.ds__extract_dayofyear
+        , subq_1.ds__extract_dow
+        , subq_1.ds__extract_doy
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_1.company__ds__extract_month
         , subq_1.company__ds__extract_week
         , subq_1.company__ds__extract_day
-        , subq_1.company__ds__extract_dayofweek
-        , subq_1.company__ds__extract_dayofyear
+        , subq_1.company__ds__extract_dow
+        , subq_1.company__ds__extract_doy
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_1.metric_time__extract_month
         , subq_1.metric_time__extract_week
         , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dayofweek
-        , subq_1.metric_time__extract_dayofyear
+        , subq_1.metric_time__extract_dow
+        , subq_1.metric_time__extract_doy
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -68,8 +68,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.company__ds__extract_month
           , subq_0.company__ds__extract_week
           , subq_0.company__ds__extract_day
-          , subq_0.company__ds__extract_dayofweek
-          , subq_0.company__ds__extract_dayofyear
+          , subq_0.company__ds__extract_dow
+          , subq_0.company__ds__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
@@ -106,25 +106,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
index a670ac2189..414159089b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_1.ds__extract_month
         , subq_1.ds__extract_week
         , subq_1.ds__extract_day
-        , subq_1.ds__extract_dayofweek
-        , subq_1.ds__extract_dayofyear
+        , subq_1.ds__extract_dow
+        , subq_1.ds__extract_doy
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_1.company__ds__extract_month
         , subq_1.company__ds__extract_week
         , subq_1.company__ds__extract_day
-        , subq_1.company__ds__extract_dayofweek
-        , subq_1.company__ds__extract_dayofyear
+        , subq_1.company__ds__extract_dow
+        , subq_1.company__ds__extract_doy
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_1.metric_time__extract_month
         , subq_1.metric_time__extract_week
         , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dayofweek
-        , subq_1.metric_time__extract_dayofyear
+        , subq_1.metric_time__extract_dow
+        , subq_1.metric_time__extract_doy
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -68,8 +68,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.company__ds__extract_month
           , subq_0.company__ds__extract_week
           , subq_0.company__ds__extract_day
-          , subq_0.company__ds__extract_dayofweek
-          , subq_0.company__ds__extract_dayofyear
+          , subq_0.company__ds__extract_dow
+          , subq_0.company__ds__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
@@ -106,25 +106,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql
index 3d88c96009..5b4011175d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -266,8 +266,8 @@ FROM (
             , subq_5.ds__extract_month
             , subq_5.ds__extract_week
             , subq_5.ds__extract_day
-            , subq_5.ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear
+            , subq_5.ds__extract_dow
+            , subq_5.ds__extract_doy
             , subq_5.ds_partitioned__day
             , subq_5.ds_partitioned__week
             , subq_5.ds_partitioned__month
@@ -278,8 +278,8 @@ FROM (
             , subq_5.ds_partitioned__extract_month
             , subq_5.ds_partitioned__extract_week
             , subq_5.ds_partitioned__extract_day
-            , subq_5.ds_partitioned__extract_dayofweek
-            , subq_5.ds_partitioned__extract_dayofyear
+            , subq_5.ds_partitioned__extract_dow
+            , subq_5.ds_partitioned__extract_doy
             , subq_5.paid_at__day
             , subq_5.paid_at__week
             , subq_5.paid_at__month
@@ -290,8 +290,8 @@ FROM (
             , subq_5.paid_at__extract_month
             , subq_5.paid_at__extract_week
             , subq_5.paid_at__extract_day
-            , subq_5.paid_at__extract_dayofweek
-            , subq_5.paid_at__extract_dayofyear
+            , subq_5.paid_at__extract_dow
+            , subq_5.paid_at__extract_doy
             , subq_5.booking__ds__day
             , subq_5.booking__ds__week
             , subq_5.booking__ds__month
@@ -302,8 +302,8 @@ FROM (
             , subq_5.booking__ds__extract_month
             , subq_5.booking__ds__extract_week
             , subq_5.booking__ds__extract_day
-            , subq_5.booking__ds__extract_dayofweek
-            , subq_5.booking__ds__extract_dayofyear
+            , subq_5.booking__ds__extract_dow
+            , subq_5.booking__ds__extract_doy
             , subq_5.booking__ds_partitioned__day
             , subq_5.booking__ds_partitioned__week
             , subq_5.booking__ds_partitioned__month
@@ -314,8 +314,8 @@ FROM (
             , subq_5.booking__ds_partitioned__extract_month
             , subq_5.booking__ds_partitioned__extract_week
             , subq_5.booking__ds_partitioned__extract_day
-            , subq_5.booking__ds_partitioned__extract_dayofweek
-            , subq_5.booking__ds_partitioned__extract_dayofyear
+            , subq_5.booking__ds_partitioned__extract_dow
+            , subq_5.booking__ds_partitioned__extract_doy
             , subq_5.booking__paid_at__day
             , subq_5.booking__paid_at__week
             , subq_5.booking__paid_at__month
@@ -326,8 +326,8 @@ FROM (
             , subq_5.booking__paid_at__extract_month
             , subq_5.booking__paid_at__extract_week
             , subq_5.booking__paid_at__extract_day
-            , subq_5.booking__paid_at__extract_dayofweek
-            , subq_5.booking__paid_at__extract_dayofyear
+            , subq_5.booking__paid_at__extract_dow
+            , subq_5.booking__paid_at__extract_doy
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -338,8 +338,8 @@ FROM (
             , subq_5.ds__extract_month AS metric_time__extract_month
             , subq_5.ds__extract_week AS metric_time__extract_week
             , subq_5.ds__extract_day AS metric_time__extract_day
-            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_5.ds__extract_dow AS metric_time__extract_dow
+            , subq_5.ds__extract_doy AS metric_time__extract_doy
             , subq_5.listing
             , subq_5.guest
             , subq_5.host
@@ -384,74 +384,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
index e2ff275b47..d11a69936d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 13d462ce84..b98d6d0f3d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
index d22bf333b1..5b316563f4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 7255f068da..846598c061 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index aa40a31b84..2ca02e1c57 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -38,8 +38,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -50,8 +50,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -62,8 +62,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -74,8 +74,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -86,8 +86,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -98,8 +98,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -140,8 +140,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -152,8 +152,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -164,8 +164,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -176,8 +176,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -188,8 +188,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -200,8 +200,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -212,8 +212,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -258,74 +258,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -373,8 +373,8 @@ FROM (
             , subq_9.ds__extract_month AS ds__extract_month
             , subq_9.ds__extract_week AS ds__extract_week
             , subq_9.ds__extract_day AS ds__extract_day
-            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_9.ds__extract_dow AS ds__extract_dow
+            , subq_9.ds__extract_doy AS ds__extract_doy
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
@@ -385,8 +385,8 @@ FROM (
             , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_9.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_9.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
@@ -397,8 +397,8 @@ FROM (
             , subq_9.paid_at__extract_month AS paid_at__extract_month
             , subq_9.paid_at__extract_week AS paid_at__extract_week
             , subq_9.paid_at__extract_day AS paid_at__extract_day
-            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_9.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_9.paid_at__extract_doy AS paid_at__extract_doy
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
@@ -409,8 +409,8 @@ FROM (
             , subq_9.booking__ds__extract_month AS booking__ds__extract_month
             , subq_9.booking__ds__extract_week AS booking__ds__extract_week
             , subq_9.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_9.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_9.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -421,8 +421,8 @@ FROM (
             , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_9.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_9.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
@@ -433,8 +433,8 @@ FROM (
             , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_9.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_9.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -475,8 +475,8 @@ FROM (
               , subq_8.ds__extract_month
               , subq_8.ds__extract_week
               , subq_8.ds__extract_day
-              , subq_8.ds__extract_dayofweek
-              , subq_8.ds__extract_dayofyear
+              , subq_8.ds__extract_dow
+              , subq_8.ds__extract_doy
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
@@ -487,8 +487,8 @@ FROM (
               , subq_8.ds_partitioned__extract_month
               , subq_8.ds_partitioned__extract_week
               , subq_8.ds_partitioned__extract_day
-              , subq_8.ds_partitioned__extract_dayofweek
-              , subq_8.ds_partitioned__extract_dayofyear
+              , subq_8.ds_partitioned__extract_dow
+              , subq_8.ds_partitioned__extract_doy
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
@@ -499,8 +499,8 @@ FROM (
               , subq_8.paid_at__extract_month
               , subq_8.paid_at__extract_week
               , subq_8.paid_at__extract_day
-              , subq_8.paid_at__extract_dayofweek
-              , subq_8.paid_at__extract_dayofyear
+              , subq_8.paid_at__extract_dow
+              , subq_8.paid_at__extract_doy
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
@@ -511,8 +511,8 @@ FROM (
               , subq_8.booking__ds__extract_month
               , subq_8.booking__ds__extract_week
               , subq_8.booking__ds__extract_day
-              , subq_8.booking__ds__extract_dayofweek
-              , subq_8.booking__ds__extract_dayofyear
+              , subq_8.booking__ds__extract_dow
+              , subq_8.booking__ds__extract_doy
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
@@ -523,8 +523,8 @@ FROM (
               , subq_8.booking__ds_partitioned__extract_month
               , subq_8.booking__ds_partitioned__extract_week
               , subq_8.booking__ds_partitioned__extract_day
-              , subq_8.booking__ds_partitioned__extract_dayofweek
-              , subq_8.booking__ds_partitioned__extract_dayofyear
+              , subq_8.booking__ds_partitioned__extract_dow
+              , subq_8.booking__ds_partitioned__extract_doy
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
@@ -535,8 +535,8 @@ FROM (
               , subq_8.booking__paid_at__extract_month
               , subq_8.booking__paid_at__extract_week
               , subq_8.booking__paid_at__extract_day
-              , subq_8.booking__paid_at__extract_dayofweek
-              , subq_8.booking__paid_at__extract_dayofyear
+              , subq_8.booking__paid_at__extract_dow
+              , subq_8.booking__paid_at__extract_doy
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -547,8 +547,8 @@ FROM (
               , subq_8.ds__extract_month AS metric_time__extract_month
               , subq_8.ds__extract_week AS metric_time__extract_week
               , subq_8.ds__extract_day AS metric_time__extract_day
-              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_8.ds__extract_dow AS metric_time__extract_dow
+              , subq_8.ds__extract_doy AS metric_time__extract_doy
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
@@ -593,74 +593,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index e829053048..f744592adf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -38,8 +38,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -50,8 +50,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -62,8 +62,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -74,8 +74,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -86,8 +86,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -98,8 +98,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -140,8 +140,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -152,8 +152,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -164,8 +164,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -176,8 +176,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -188,8 +188,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -200,8 +200,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -212,8 +212,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -258,74 +258,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -374,8 +374,8 @@ FROM (
             , subq_9.ds__extract_month AS ds__extract_month
             , subq_9.ds__extract_week AS ds__extract_week
             , subq_9.ds__extract_day AS ds__extract_day
-            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_9.ds__extract_dow AS ds__extract_dow
+            , subq_9.ds__extract_doy AS ds__extract_doy
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
@@ -386,8 +386,8 @@ FROM (
             , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_9.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_9.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
@@ -398,8 +398,8 @@ FROM (
             , subq_9.paid_at__extract_month AS paid_at__extract_month
             , subq_9.paid_at__extract_week AS paid_at__extract_week
             , subq_9.paid_at__extract_day AS paid_at__extract_day
-            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_9.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_9.paid_at__extract_doy AS paid_at__extract_doy
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
@@ -410,8 +410,8 @@ FROM (
             , subq_9.booking__ds__extract_month AS booking__ds__extract_month
             , subq_9.booking__ds__extract_week AS booking__ds__extract_week
             , subq_9.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_9.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_9.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -422,8 +422,8 @@ FROM (
             , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_9.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_9.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
@@ -434,8 +434,8 @@ FROM (
             , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_9.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_9.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -476,8 +476,8 @@ FROM (
               , subq_8.ds__extract_month
               , subq_8.ds__extract_week
               , subq_8.ds__extract_day
-              , subq_8.ds__extract_dayofweek
-              , subq_8.ds__extract_dayofyear
+              , subq_8.ds__extract_dow
+              , subq_8.ds__extract_doy
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
@@ -488,8 +488,8 @@ FROM (
               , subq_8.ds_partitioned__extract_month
               , subq_8.ds_partitioned__extract_week
               , subq_8.ds_partitioned__extract_day
-              , subq_8.ds_partitioned__extract_dayofweek
-              , subq_8.ds_partitioned__extract_dayofyear
+              , subq_8.ds_partitioned__extract_dow
+              , subq_8.ds_partitioned__extract_doy
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
@@ -500,8 +500,8 @@ FROM (
               , subq_8.paid_at__extract_month
               , subq_8.paid_at__extract_week
               , subq_8.paid_at__extract_day
-              , subq_8.paid_at__extract_dayofweek
-              , subq_8.paid_at__extract_dayofyear
+              , subq_8.paid_at__extract_dow
+              , subq_8.paid_at__extract_doy
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
@@ -512,8 +512,8 @@ FROM (
               , subq_8.booking__ds__extract_month
               , subq_8.booking__ds__extract_week
               , subq_8.booking__ds__extract_day
-              , subq_8.booking__ds__extract_dayofweek
-              , subq_8.booking__ds__extract_dayofyear
+              , subq_8.booking__ds__extract_dow
+              , subq_8.booking__ds__extract_doy
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
@@ -524,8 +524,8 @@ FROM (
               , subq_8.booking__ds_partitioned__extract_month
               , subq_8.booking__ds_partitioned__extract_week
               , subq_8.booking__ds_partitioned__extract_day
-              , subq_8.booking__ds_partitioned__extract_dayofweek
-              , subq_8.booking__ds_partitioned__extract_dayofyear
+              , subq_8.booking__ds_partitioned__extract_dow
+              , subq_8.booking__ds_partitioned__extract_doy
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
@@ -536,8 +536,8 @@ FROM (
               , subq_8.booking__paid_at__extract_month
               , subq_8.booking__paid_at__extract_week
               , subq_8.booking__paid_at__extract_day
-              , subq_8.booking__paid_at__extract_dayofweek
-              , subq_8.booking__paid_at__extract_dayofyear
+              , subq_8.booking__paid_at__extract_dow
+              , subq_8.booking__paid_at__extract_doy
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -548,8 +548,8 @@ FROM (
               , subq_8.ds__extract_month AS metric_time__extract_month
               , subq_8.ds__extract_week AS metric_time__extract_week
               , subq_8.ds__extract_day AS metric_time__extract_day
-              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_8.ds__extract_dow AS metric_time__extract_dow
+              , subq_8.ds__extract_doy AS metric_time__extract_doy
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
@@ -594,74 +594,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
index 106574c4c7..9a9cd18ee2 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_4.ds__extract_month AS ds__extract_month
           , subq_4.ds__extract_week AS ds__extract_week
           , subq_4.ds__extract_day AS ds__extract_day
-          , subq_4.ds__extract_dayofweek AS ds__extract_dayofweek
-          , subq_4.ds__extract_dayofyear AS ds__extract_dayofyear
+          , subq_4.ds__extract_dow AS ds__extract_dow
+          , subq_4.ds__extract_doy AS ds__extract_doy
           , subq_4.ds_partitioned__day AS ds_partitioned__day
           , subq_4.ds_partitioned__week AS ds_partitioned__week
           , subq_4.ds_partitioned__month AS ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_4.ds_partitioned__extract_month AS ds_partitioned__extract_month
           , subq_4.ds_partitioned__extract_week AS ds_partitioned__extract_week
           , subq_4.ds_partitioned__extract_day AS ds_partitioned__extract_day
-          , subq_4.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-          , subq_4.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+          , subq_4.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+          , subq_4.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
           , subq_4.paid_at__day AS paid_at__day
           , subq_4.paid_at__week AS paid_at__week
           , subq_4.paid_at__month AS paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_4.paid_at__extract_month AS paid_at__extract_month
           , subq_4.paid_at__extract_week AS paid_at__extract_week
           , subq_4.paid_at__extract_day AS paid_at__extract_day
-          , subq_4.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-          , subq_4.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+          , subq_4.paid_at__extract_dow AS paid_at__extract_dow
+          , subq_4.paid_at__extract_doy AS paid_at__extract_doy
           , subq_4.booking__ds__day AS booking__ds__day
           , subq_4.booking__ds__week AS booking__ds__week
           , subq_4.booking__ds__month AS booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_4.booking__ds__extract_month AS booking__ds__extract_month
           , subq_4.booking__ds__extract_week AS booking__ds__extract_week
           , subq_4.booking__ds__extract_day AS booking__ds__extract_day
-          , subq_4.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-          , subq_4.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+          , subq_4.booking__ds__extract_dow AS booking__ds__extract_dow
+          , subq_4.booking__ds__extract_doy AS booking__ds__extract_doy
           , subq_4.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_4.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_4.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_4.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
           , subq_4.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
           , subq_4.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-          , subq_4.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-          , subq_4.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+          , subq_4.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+          , subq_4.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
           , subq_4.booking__paid_at__day AS booking__paid_at__day
           , subq_4.booking__paid_at__week AS booking__paid_at__week
           , subq_4.booking__paid_at__month AS booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_4.booking__paid_at__extract_month AS booking__paid_at__extract_month
           , subq_4.booking__paid_at__extract_week AS booking__paid_at__extract_week
           , subq_4.booking__paid_at__extract_day AS booking__paid_at__extract_day
-          , subq_4.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-          , subq_4.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+          , subq_4.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+          , subq_4.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
           , subq_4.listing AS listing
           , subq_4.guest AS guest
           , subq_4.host AS host
@@ -135,8 +135,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -147,8 +147,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -159,8 +159,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -171,8 +171,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -183,8 +183,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -195,8 +195,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.metric_time__week AS metric_time__week
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
@@ -206,8 +206,8 @@ FROM (
             , subq_1.metric_time__extract_month AS metric_time__extract_month
             , subq_1.metric_time__extract_week AS metric_time__extract_week
             , subq_1.metric_time__extract_day AS metric_time__extract_day
-            , subq_1.metric_time__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_1.metric_time__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_1.metric_time__extract_dow AS metric_time__extract_dow
+            , subq_1.metric_time__extract_doy AS metric_time__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -248,8 +248,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -260,8 +260,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -272,8 +272,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -284,8 +284,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -296,8 +296,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -308,8 +308,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -320,8 +320,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -366,74 +366,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 16a95d6b9f..d49d04d52c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_1.ds__extract_month AS ds__extract_month
           , subq_1.ds__extract_week AS ds__extract_week
           , subq_1.ds__extract_day AS ds__extract_day
-          , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-          , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+          , subq_1.ds__extract_dow AS ds__extract_dow
+          , subq_1.ds__extract_doy AS ds__extract_doy
           , subq_1.ds_partitioned__day AS ds_partitioned__day
           , subq_1.ds_partitioned__week AS ds_partitioned__week
           , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
           , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
           , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-          , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-          , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+          , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+          , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
           , subq_1.paid_at__day AS paid_at__day
           , subq_1.paid_at__week AS paid_at__week
           , subq_1.paid_at__month AS paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_1.paid_at__extract_month AS paid_at__extract_month
           , subq_1.paid_at__extract_week AS paid_at__extract_week
           , subq_1.paid_at__extract_day AS paid_at__extract_day
-          , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-          , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+          , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+          , subq_1.paid_at__extract_doy AS paid_at__extract_doy
           , subq_1.booking__ds__day AS booking__ds__day
           , subq_1.booking__ds__week AS booking__ds__week
           , subq_1.booking__ds__month AS booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_1.booking__ds__extract_month AS booking__ds__extract_month
           , subq_1.booking__ds__extract_week AS booking__ds__extract_week
           , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-          , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-          , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+          , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+          , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
           , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
           , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
           , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-          , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-          , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+          , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+          , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
           , subq_1.booking__paid_at__day AS booking__paid_at__day
           , subq_1.booking__paid_at__week AS booking__paid_at__week
           , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
           , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
           , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-          , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-          , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+          , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+          , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
           , subq_1.listing AS listing
           , subq_1.guest AS guest
           , subq_1.host AS host
@@ -134,8 +134,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -146,8 +146,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -158,8 +158,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -170,8 +170,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -182,8 +182,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -194,8 +194,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -206,8 +206,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -252,74 +252,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql
index 693e200db3..40f6785af3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_distinct_values__plan0.sql
@@ -47,8 +47,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -59,8 +59,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -71,8 +71,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -83,8 +83,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -95,8 +95,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -107,8 +107,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -119,8 +119,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -165,74 +165,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -262,8 +262,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -274,8 +274,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -286,8 +286,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -298,8 +298,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -310,8 +310,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -335,25 +335,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -362,25 +362,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql
index 00efad0383..a43457fcbd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_node__plan0.sql
@@ -25,74 +25,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql
index 7e0fdff19e..a3ce23fb89 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_node__plan0.sql
@@ -31,74 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 1a6844636c..70919d8caa 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -53,8 +53,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -65,8 +65,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -77,8 +77,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -89,8 +89,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -101,8 +101,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -113,8 +113,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -125,8 +125,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -171,74 +171,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -268,8 +268,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -280,8 +280,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -292,8 +292,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -304,8 +304,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -316,8 +316,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -341,25 +341,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -368,25 +368,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
index 5712e1d25c..6e4488a729 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_scd_dimension__plan0.sql
@@ -55,8 +55,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -67,8 +67,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -79,8 +79,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -91,8 +91,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -103,8 +103,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -115,8 +115,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -127,8 +127,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -159,74 +159,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -255,25 +255,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_from) AS window_start__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_from) AS window_start__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_from) AS window_start__extract_doy
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_to) AS window_end__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_to) AS window_end__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_to) AS window_end__extract_doy
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -282,25 +282,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 141c4fba09..9f23719b49 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
index abf246ee40..cb25d5128e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
index 7c85ab1cdb..2093e49b0b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql
index e89a957806..eb506ddf59 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_limit_rows__plan0.sql
@@ -31,8 +31,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -43,8 +43,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -55,8 +55,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -67,8 +67,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -79,8 +79,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -91,8 +91,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -103,8 +103,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -149,74 +149,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
index 436f0e7545..d5688f0e2d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_local_dimension_using_local_entity__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.created_at__day
         , subq_0.created_at__week
         , subq_0.created_at__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.created_at__extract_month
         , subq_0.created_at__extract_week
         , subq_0.created_at__extract_day
-        , subq_0.created_at__extract_dayofweek
-        , subq_0.created_at__extract_dayofyear
+        , subq_0.created_at__extract_dow
+        , subq_0.created_at__extract_doy
         , subq_0.listing__ds__day
         , subq_0.listing__ds__week
         , subq_0.listing__ds__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.listing__ds__extract_month
         , subq_0.listing__ds__extract_week
         , subq_0.listing__ds__extract_day
-        , subq_0.listing__ds__extract_dayofweek
-        , subq_0.listing__ds__extract_dayofyear
+        , subq_0.listing__ds__extract_dow
+        , subq_0.listing__ds__extract_doy
         , subq_0.listing__created_at__day
         , subq_0.listing__created_at__week
         , subq_0.listing__created_at__month
@@ -62,8 +62,8 @@ FROM (
         , subq_0.listing__created_at__extract_month
         , subq_0.listing__created_at__extract_week
         , subq_0.listing__created_at__extract_day
-        , subq_0.listing__created_at__extract_dayofweek
-        , subq_0.listing__created_at__extract_dayofyear
+        , subq_0.listing__created_at__extract_dow
+        , subq_0.listing__created_at__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -74,8 +74,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.listing
         , subq_0.user
         , subq_0.listing__user
@@ -99,25 +99,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -126,25 +126,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql
index b05da97264..dbfcb34b94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_aggregation_node__plan0.sql
@@ -35,74 +35,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql
index 9223eebd6e..e5349b0d17 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint__plan0.sql
@@ -65,8 +65,8 @@ FROM (
                     , subq_0.ds__extract_month
                     , subq_0.ds__extract_week
                     , subq_0.ds__extract_day
-                    , subq_0.ds__extract_dayofweek
-                    , subq_0.ds__extract_dayofyear
+                    , subq_0.ds__extract_dow
+                    , subq_0.ds__extract_doy
                     , subq_0.ds_partitioned__day
                     , subq_0.ds_partitioned__week
                     , subq_0.ds_partitioned__month
@@ -77,8 +77,8 @@ FROM (
                     , subq_0.ds_partitioned__extract_month
                     , subq_0.ds_partitioned__extract_week
                     , subq_0.ds_partitioned__extract_day
-                    , subq_0.ds_partitioned__extract_dayofweek
-                    , subq_0.ds_partitioned__extract_dayofyear
+                    , subq_0.ds_partitioned__extract_dow
+                    , subq_0.ds_partitioned__extract_doy
                     , subq_0.paid_at__day
                     , subq_0.paid_at__week
                     , subq_0.paid_at__month
@@ -89,8 +89,8 @@ FROM (
                     , subq_0.paid_at__extract_month
                     , subq_0.paid_at__extract_week
                     , subq_0.paid_at__extract_day
-                    , subq_0.paid_at__extract_dayofweek
-                    , subq_0.paid_at__extract_dayofyear
+                    , subq_0.paid_at__extract_dow
+                    , subq_0.paid_at__extract_doy
                     , subq_0.booking__ds__day
                     , subq_0.booking__ds__week
                     , subq_0.booking__ds__month
@@ -101,8 +101,8 @@ FROM (
                     , subq_0.booking__ds__extract_month
                     , subq_0.booking__ds__extract_week
                     , subq_0.booking__ds__extract_day
-                    , subq_0.booking__ds__extract_dayofweek
-                    , subq_0.booking__ds__extract_dayofyear
+                    , subq_0.booking__ds__extract_dow
+                    , subq_0.booking__ds__extract_doy
                     , subq_0.booking__ds_partitioned__day
                     , subq_0.booking__ds_partitioned__week
                     , subq_0.booking__ds_partitioned__month
@@ -113,8 +113,8 @@ FROM (
                     , subq_0.booking__ds_partitioned__extract_month
                     , subq_0.booking__ds_partitioned__extract_week
                     , subq_0.booking__ds_partitioned__extract_day
-                    , subq_0.booking__ds_partitioned__extract_dayofweek
-                    , subq_0.booking__ds_partitioned__extract_dayofyear
+                    , subq_0.booking__ds_partitioned__extract_dow
+                    , subq_0.booking__ds_partitioned__extract_doy
                     , subq_0.booking__paid_at__day
                     , subq_0.booking__paid_at__week
                     , subq_0.booking__paid_at__month
@@ -125,8 +125,8 @@ FROM (
                     , subq_0.booking__paid_at__extract_month
                     , subq_0.booking__paid_at__extract_week
                     , subq_0.booking__paid_at__extract_day
-                    , subq_0.booking__paid_at__extract_dayofweek
-                    , subq_0.booking__paid_at__extract_dayofyear
+                    , subq_0.booking__paid_at__extract_dow
+                    , subq_0.booking__paid_at__extract_doy
                     , subq_0.ds__day AS metric_time__day
                     , subq_0.ds__week AS metric_time__week
                     , subq_0.ds__month AS metric_time__month
@@ -137,8 +137,8 @@ FROM (
                     , subq_0.ds__extract_month AS metric_time__extract_month
                     , subq_0.ds__extract_week AS metric_time__extract_week
                     , subq_0.ds__extract_day AS metric_time__extract_day
-                    , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_0.ds__extract_dow AS metric_time__extract_dow
+                    , subq_0.ds__extract_doy AS metric_time__extract_doy
                     , subq_0.listing
                     , subq_0.guest
                     , subq_0.host
@@ -183,74 +183,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -280,8 +280,8 @@ FROM (
                     , subq_3.ds__extract_month
                     , subq_3.ds__extract_week
                     , subq_3.ds__extract_day
-                    , subq_3.ds__extract_dayofweek
-                    , subq_3.ds__extract_dayofyear
+                    , subq_3.ds__extract_dow
+                    , subq_3.ds__extract_doy
                     , subq_3.created_at__day
                     , subq_3.created_at__week
                     , subq_3.created_at__month
@@ -292,8 +292,8 @@ FROM (
                     , subq_3.created_at__extract_month
                     , subq_3.created_at__extract_week
                     , subq_3.created_at__extract_day
-                    , subq_3.created_at__extract_dayofweek
-                    , subq_3.created_at__extract_dayofyear
+                    , subq_3.created_at__extract_dow
+                    , subq_3.created_at__extract_doy
                     , subq_3.listing__ds__day
                     , subq_3.listing__ds__week
                     , subq_3.listing__ds__month
@@ -304,8 +304,8 @@ FROM (
                     , subq_3.listing__ds__extract_month
                     , subq_3.listing__ds__extract_week
                     , subq_3.listing__ds__extract_day
-                    , subq_3.listing__ds__extract_dayofweek
-                    , subq_3.listing__ds__extract_dayofyear
+                    , subq_3.listing__ds__extract_dow
+                    , subq_3.listing__ds__extract_doy
                     , subq_3.listing__created_at__day
                     , subq_3.listing__created_at__week
                     , subq_3.listing__created_at__month
@@ -316,8 +316,8 @@ FROM (
                     , subq_3.listing__created_at__extract_month
                     , subq_3.listing__created_at__extract_week
                     , subq_3.listing__created_at__extract_day
-                    , subq_3.listing__created_at__extract_dayofweek
-                    , subq_3.listing__created_at__extract_dayofyear
+                    , subq_3.listing__created_at__extract_dow
+                    , subq_3.listing__created_at__extract_doy
                     , subq_3.ds__day AS metric_time__day
                     , subq_3.ds__week AS metric_time__week
                     , subq_3.ds__month AS metric_time__month
@@ -328,8 +328,8 @@ FROM (
                     , subq_3.ds__extract_month AS metric_time__extract_month
                     , subq_3.ds__extract_week AS metric_time__extract_week
                     , subq_3.ds__extract_day AS metric_time__extract_day
-                    , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_3.ds__extract_dow AS metric_time__extract_dow
+                    , subq_3.ds__extract_doy AS metric_time__extract_doy
                     , subq_3.listing
                     , subq_3.user
                     , subq_3.listing__user
@@ -353,25 +353,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -380,25 +380,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -476,8 +476,8 @@ FROM (
                     , subq_12.ds__extract_month
                     , subq_12.ds__extract_week
                     , subq_12.ds__extract_day
-                    , subq_12.ds__extract_dayofweek
-                    , subq_12.ds__extract_dayofyear
+                    , subq_12.ds__extract_dow
+                    , subq_12.ds__extract_doy
                     , subq_12.ds_partitioned__day
                     , subq_12.ds_partitioned__week
                     , subq_12.ds_partitioned__month
@@ -488,8 +488,8 @@ FROM (
                     , subq_12.ds_partitioned__extract_month
                     , subq_12.ds_partitioned__extract_week
                     , subq_12.ds_partitioned__extract_day
-                    , subq_12.ds_partitioned__extract_dayofweek
-                    , subq_12.ds_partitioned__extract_dayofyear
+                    , subq_12.ds_partitioned__extract_dow
+                    , subq_12.ds_partitioned__extract_doy
                     , subq_12.paid_at__day
                     , subq_12.paid_at__week
                     , subq_12.paid_at__month
@@ -500,8 +500,8 @@ FROM (
                     , subq_12.paid_at__extract_month
                     , subq_12.paid_at__extract_week
                     , subq_12.paid_at__extract_day
-                    , subq_12.paid_at__extract_dayofweek
-                    , subq_12.paid_at__extract_dayofyear
+                    , subq_12.paid_at__extract_dow
+                    , subq_12.paid_at__extract_doy
                     , subq_12.booking__ds__day
                     , subq_12.booking__ds__week
                     , subq_12.booking__ds__month
@@ -512,8 +512,8 @@ FROM (
                     , subq_12.booking__ds__extract_month
                     , subq_12.booking__ds__extract_week
                     , subq_12.booking__ds__extract_day
-                    , subq_12.booking__ds__extract_dayofweek
-                    , subq_12.booking__ds__extract_dayofyear
+                    , subq_12.booking__ds__extract_dow
+                    , subq_12.booking__ds__extract_doy
                     , subq_12.booking__ds_partitioned__day
                     , subq_12.booking__ds_partitioned__week
                     , subq_12.booking__ds_partitioned__month
@@ -524,8 +524,8 @@ FROM (
                     , subq_12.booking__ds_partitioned__extract_month
                     , subq_12.booking__ds_partitioned__extract_week
                     , subq_12.booking__ds_partitioned__extract_day
-                    , subq_12.booking__ds_partitioned__extract_dayofweek
-                    , subq_12.booking__ds_partitioned__extract_dayofyear
+                    , subq_12.booking__ds_partitioned__extract_dow
+                    , subq_12.booking__ds_partitioned__extract_doy
                     , subq_12.booking__paid_at__day
                     , subq_12.booking__paid_at__week
                     , subq_12.booking__paid_at__month
@@ -536,8 +536,8 @@ FROM (
                     , subq_12.booking__paid_at__extract_month
                     , subq_12.booking__paid_at__extract_week
                     , subq_12.booking__paid_at__extract_day
-                    , subq_12.booking__paid_at__extract_dayofweek
-                    , subq_12.booking__paid_at__extract_dayofyear
+                    , subq_12.booking__paid_at__extract_dow
+                    , subq_12.booking__paid_at__extract_doy
                     , subq_12.ds__day AS metric_time__day
                     , subq_12.ds__week AS metric_time__week
                     , subq_12.ds__month AS metric_time__month
@@ -548,8 +548,8 @@ FROM (
                     , subq_12.ds__extract_month AS metric_time__extract_month
                     , subq_12.ds__extract_week AS metric_time__extract_week
                     , subq_12.ds__extract_day AS metric_time__extract_day
-                    , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_12.ds__extract_dow AS metric_time__extract_dow
+                    , subq_12.ds__extract_doy AS metric_time__extract_doy
                     , subq_12.listing
                     , subq_12.guest
                     , subq_12.host
@@ -594,74 +594,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -691,8 +691,8 @@ FROM (
                     , subq_15.ds__extract_month
                     , subq_15.ds__extract_week
                     , subq_15.ds__extract_day
-                    , subq_15.ds__extract_dayofweek
-                    , subq_15.ds__extract_dayofyear
+                    , subq_15.ds__extract_dow
+                    , subq_15.ds__extract_doy
                     , subq_15.created_at__day
                     , subq_15.created_at__week
                     , subq_15.created_at__month
@@ -703,8 +703,8 @@ FROM (
                     , subq_15.created_at__extract_month
                     , subq_15.created_at__extract_week
                     , subq_15.created_at__extract_day
-                    , subq_15.created_at__extract_dayofweek
-                    , subq_15.created_at__extract_dayofyear
+                    , subq_15.created_at__extract_dow
+                    , subq_15.created_at__extract_doy
                     , subq_15.listing__ds__day
                     , subq_15.listing__ds__week
                     , subq_15.listing__ds__month
@@ -715,8 +715,8 @@ FROM (
                     , subq_15.listing__ds__extract_month
                     , subq_15.listing__ds__extract_week
                     , subq_15.listing__ds__extract_day
-                    , subq_15.listing__ds__extract_dayofweek
-                    , subq_15.listing__ds__extract_dayofyear
+                    , subq_15.listing__ds__extract_dow
+                    , subq_15.listing__ds__extract_doy
                     , subq_15.listing__created_at__day
                     , subq_15.listing__created_at__week
                     , subq_15.listing__created_at__month
@@ -727,8 +727,8 @@ FROM (
                     , subq_15.listing__created_at__extract_month
                     , subq_15.listing__created_at__extract_week
                     , subq_15.listing__created_at__extract_day
-                    , subq_15.listing__created_at__extract_dayofweek
-                    , subq_15.listing__created_at__extract_dayofyear
+                    , subq_15.listing__created_at__extract_dow
+                    , subq_15.listing__created_at__extract_doy
                     , subq_15.ds__day AS metric_time__day
                     , subq_15.ds__week AS metric_time__week
                     , subq_15.ds__month AS metric_time__month
@@ -739,8 +739,8 @@ FROM (
                     , subq_15.ds__extract_month AS metric_time__extract_month
                     , subq_15.ds__extract_week AS metric_time__extract_week
                     , subq_15.ds__extract_day AS metric_time__extract_day
-                    , subq_15.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_15.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_15.ds__extract_dow AS metric_time__extract_dow
+                    , subq_15.ds__extract_doy AS metric_time__extract_doy
                     , subq_15.listing
                     , subq_15.user
                     , subq_15.listing__user
@@ -764,25 +764,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -791,25 +791,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -870,8 +870,8 @@ FROM (
             , subq_24.ds__extract_month
             , subq_24.ds__extract_week
             , subq_24.ds__extract_day
-            , subq_24.ds__extract_dayofweek
-            , subq_24.ds__extract_dayofyear
+            , subq_24.ds__extract_dow
+            , subq_24.ds__extract_doy
             , subq_24.ds_partitioned__day
             , subq_24.ds_partitioned__week
             , subq_24.ds_partitioned__month
@@ -882,8 +882,8 @@ FROM (
             , subq_24.ds_partitioned__extract_month
             , subq_24.ds_partitioned__extract_week
             , subq_24.ds_partitioned__extract_day
-            , subq_24.ds_partitioned__extract_dayofweek
-            , subq_24.ds_partitioned__extract_dayofyear
+            , subq_24.ds_partitioned__extract_dow
+            , subq_24.ds_partitioned__extract_doy
             , subq_24.paid_at__day
             , subq_24.paid_at__week
             , subq_24.paid_at__month
@@ -894,8 +894,8 @@ FROM (
             , subq_24.paid_at__extract_month
             , subq_24.paid_at__extract_week
             , subq_24.paid_at__extract_day
-            , subq_24.paid_at__extract_dayofweek
-            , subq_24.paid_at__extract_dayofyear
+            , subq_24.paid_at__extract_dow
+            , subq_24.paid_at__extract_doy
             , subq_24.booking__ds__day
             , subq_24.booking__ds__week
             , subq_24.booking__ds__month
@@ -906,8 +906,8 @@ FROM (
             , subq_24.booking__ds__extract_month
             , subq_24.booking__ds__extract_week
             , subq_24.booking__ds__extract_day
-            , subq_24.booking__ds__extract_dayofweek
-            , subq_24.booking__ds__extract_dayofyear
+            , subq_24.booking__ds__extract_dow
+            , subq_24.booking__ds__extract_doy
             , subq_24.booking__ds_partitioned__day
             , subq_24.booking__ds_partitioned__week
             , subq_24.booking__ds_partitioned__month
@@ -918,8 +918,8 @@ FROM (
             , subq_24.booking__ds_partitioned__extract_month
             , subq_24.booking__ds_partitioned__extract_week
             , subq_24.booking__ds_partitioned__extract_day
-            , subq_24.booking__ds_partitioned__extract_dayofweek
-            , subq_24.booking__ds_partitioned__extract_dayofyear
+            , subq_24.booking__ds_partitioned__extract_dow
+            , subq_24.booking__ds_partitioned__extract_doy
             , subq_24.booking__paid_at__day
             , subq_24.booking__paid_at__week
             , subq_24.booking__paid_at__month
@@ -930,8 +930,8 @@ FROM (
             , subq_24.booking__paid_at__extract_month
             , subq_24.booking__paid_at__extract_week
             , subq_24.booking__paid_at__extract_day
-            , subq_24.booking__paid_at__extract_dayofweek
-            , subq_24.booking__paid_at__extract_dayofyear
+            , subq_24.booking__paid_at__extract_dow
+            , subq_24.booking__paid_at__extract_doy
             , subq_24.ds__day AS metric_time__day
             , subq_24.ds__week AS metric_time__week
             , subq_24.ds__month AS metric_time__month
@@ -942,8 +942,8 @@ FROM (
             , subq_24.ds__extract_month AS metric_time__extract_month
             , subq_24.ds__extract_week AS metric_time__extract_week
             , subq_24.ds__extract_day AS metric_time__extract_day
-            , subq_24.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_24.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_24.ds__extract_dow AS metric_time__extract_dow
+            , subq_24.ds__extract_doy AS metric_time__extract_doy
             , subq_24.listing
             , subq_24.guest
             , subq_24.host
@@ -988,74 +988,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
index 0512790e47..61d8df3842 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_reused_measure__plan0.sql
@@ -50,8 +50,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -62,8 +62,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -74,8 +74,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -86,8 +86,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -98,8 +98,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -110,8 +110,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -122,8 +122,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -168,74 +168,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -282,8 +282,8 @@ FROM (
             , subq_7.ds__extract_month
             , subq_7.ds__extract_week
             , subq_7.ds__extract_day
-            , subq_7.ds__extract_dayofweek
-            , subq_7.ds__extract_dayofyear
+            , subq_7.ds__extract_dow
+            , subq_7.ds__extract_doy
             , subq_7.ds_partitioned__day
             , subq_7.ds_partitioned__week
             , subq_7.ds_partitioned__month
@@ -294,8 +294,8 @@ FROM (
             , subq_7.ds_partitioned__extract_month
             , subq_7.ds_partitioned__extract_week
             , subq_7.ds_partitioned__extract_day
-            , subq_7.ds_partitioned__extract_dayofweek
-            , subq_7.ds_partitioned__extract_dayofyear
+            , subq_7.ds_partitioned__extract_dow
+            , subq_7.ds_partitioned__extract_doy
             , subq_7.paid_at__day
             , subq_7.paid_at__week
             , subq_7.paid_at__month
@@ -306,8 +306,8 @@ FROM (
             , subq_7.paid_at__extract_month
             , subq_7.paid_at__extract_week
             , subq_7.paid_at__extract_day
-            , subq_7.paid_at__extract_dayofweek
-            , subq_7.paid_at__extract_dayofyear
+            , subq_7.paid_at__extract_dow
+            , subq_7.paid_at__extract_doy
             , subq_7.booking__ds__day
             , subq_7.booking__ds__week
             , subq_7.booking__ds__month
@@ -318,8 +318,8 @@ FROM (
             , subq_7.booking__ds__extract_month
             , subq_7.booking__ds__extract_week
             , subq_7.booking__ds__extract_day
-            , subq_7.booking__ds__extract_dayofweek
-            , subq_7.booking__ds__extract_dayofyear
+            , subq_7.booking__ds__extract_dow
+            , subq_7.booking__ds__extract_doy
             , subq_7.booking__ds_partitioned__day
             , subq_7.booking__ds_partitioned__week
             , subq_7.booking__ds_partitioned__month
@@ -330,8 +330,8 @@ FROM (
             , subq_7.booking__ds_partitioned__extract_month
             , subq_7.booking__ds_partitioned__extract_week
             , subq_7.booking__ds_partitioned__extract_day
-            , subq_7.booking__ds_partitioned__extract_dayofweek
-            , subq_7.booking__ds_partitioned__extract_dayofyear
+            , subq_7.booking__ds_partitioned__extract_dow
+            , subq_7.booking__ds_partitioned__extract_doy
             , subq_7.booking__paid_at__day
             , subq_7.booking__paid_at__week
             , subq_7.booking__paid_at__month
@@ -342,8 +342,8 @@ FROM (
             , subq_7.booking__paid_at__extract_month
             , subq_7.booking__paid_at__extract_week
             , subq_7.booking__paid_at__extract_day
-            , subq_7.booking__paid_at__extract_dayofweek
-            , subq_7.booking__paid_at__extract_dayofyear
+            , subq_7.booking__paid_at__extract_dow
+            , subq_7.booking__paid_at__extract_doy
             , subq_7.ds__day AS metric_time__day
             , subq_7.ds__week AS metric_time__week
             , subq_7.ds__month AS metric_time__month
@@ -354,8 +354,8 @@ FROM (
             , subq_7.ds__extract_month AS metric_time__extract_month
             , subq_7.ds__extract_week AS metric_time__extract_week
             , subq_7.ds__extract_day AS metric_time__extract_day
-            , subq_7.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_7.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_7.ds__extract_dow AS metric_time__extract_dow
+            , subq_7.ds__extract_doy AS metric_time__extract_doy
             , subq_7.listing
             , subq_7.guest
             , subq_7.host
@@ -400,74 +400,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 2d8a10e755..bd41d48bd9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -44,8 +44,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -56,8 +56,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -68,8 +68,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -80,8 +80,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -92,8 +92,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -104,8 +104,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -116,8 +116,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -162,74 +162,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index f000943d3d..edfbb1483f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -32,8 +32,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -150,74 +150,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -256,8 +256,8 @@ FROM (
             , subq_5.ds__extract_month
             , subq_5.ds__extract_week
             , subq_5.ds__extract_day
-            , subq_5.ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear
+            , subq_5.ds__extract_dow
+            , subq_5.ds__extract_doy
             , subq_5.created_at__day
             , subq_5.created_at__week
             , subq_5.created_at__month
@@ -268,8 +268,8 @@ FROM (
             , subq_5.created_at__extract_month
             , subq_5.created_at__extract_week
             , subq_5.created_at__extract_day
-            , subq_5.created_at__extract_dayofweek
-            , subq_5.created_at__extract_dayofyear
+            , subq_5.created_at__extract_dow
+            , subq_5.created_at__extract_doy
             , subq_5.listing__ds__day
             , subq_5.listing__ds__week
             , subq_5.listing__ds__month
@@ -280,8 +280,8 @@ FROM (
             , subq_5.listing__ds__extract_month
             , subq_5.listing__ds__extract_week
             , subq_5.listing__ds__extract_day
-            , subq_5.listing__ds__extract_dayofweek
-            , subq_5.listing__ds__extract_dayofyear
+            , subq_5.listing__ds__extract_dow
+            , subq_5.listing__ds__extract_doy
             , subq_5.listing__created_at__day
             , subq_5.listing__created_at__week
             , subq_5.listing__created_at__month
@@ -292,8 +292,8 @@ FROM (
             , subq_5.listing__created_at__extract_month
             , subq_5.listing__created_at__extract_week
             , subq_5.listing__created_at__extract_day
-            , subq_5.listing__created_at__extract_dayofweek
-            , subq_5.listing__created_at__extract_dayofyear
+            , subq_5.listing__created_at__extract_dow
+            , subq_5.listing__created_at__extract_doy
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -304,8 +304,8 @@ FROM (
             , subq_5.ds__extract_month AS metric_time__extract_month
             , subq_5.ds__extract_week AS metric_time__extract_week
             , subq_5.ds__extract_day AS metric_time__extract_day
-            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_5.ds__extract_dow AS metric_time__extract_dow
+            , subq_5.ds__extract_doy AS metric_time__extract_doy
             , subq_5.listing
             , subq_5.user
             , subq_5.listing__user
@@ -329,25 +329,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -356,25 +356,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
index db50a9f2c8..d1740a6a39 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
@@ -45,8 +45,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -57,8 +57,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -69,8 +69,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -81,8 +81,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -93,8 +93,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -105,8 +105,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -117,8 +117,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -149,74 +149,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -250,8 +250,8 @@ FROM (
             , subq_3.window_start__extract_month AS window_start__extract_month
             , subq_3.window_start__extract_week AS window_start__extract_week
             , subq_3.window_start__extract_day AS window_start__extract_day
-            , subq_3.window_start__extract_dayofweek AS window_start__extract_dayofweek
-            , subq_3.window_start__extract_dayofyear AS window_start__extract_dayofyear
+            , subq_3.window_start__extract_dow AS window_start__extract_dow
+            , subq_3.window_start__extract_doy AS window_start__extract_doy
             , subq_3.window_end__day AS window_end__day
             , subq_3.window_end__week AS window_end__week
             , subq_3.window_end__month AS window_end__month
@@ -262,8 +262,8 @@ FROM (
             , subq_3.window_end__extract_month AS window_end__extract_month
             , subq_3.window_end__extract_week AS window_end__extract_week
             , subq_3.window_end__extract_day AS window_end__extract_day
-            , subq_3.window_end__extract_dayofweek AS window_end__extract_dayofweek
-            , subq_3.window_end__extract_dayofyear AS window_end__extract_dayofyear
+            , subq_3.window_end__extract_dow AS window_end__extract_dow
+            , subq_3.window_end__extract_doy AS window_end__extract_doy
             , subq_3.listing__window_start__day AS listing__window_start__day
             , subq_3.listing__window_start__week AS listing__window_start__week
             , subq_3.listing__window_start__month AS listing__window_start__month
@@ -274,8 +274,8 @@ FROM (
             , subq_3.listing__window_start__extract_month AS listing__window_start__extract_month
             , subq_3.listing__window_start__extract_week AS listing__window_start__extract_week
             , subq_3.listing__window_start__extract_day AS listing__window_start__extract_day
-            , subq_3.listing__window_start__extract_dayofweek AS listing__window_start__extract_dayofweek
-            , subq_3.listing__window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
+            , subq_3.listing__window_start__extract_dow AS listing__window_start__extract_dow
+            , subq_3.listing__window_start__extract_doy AS listing__window_start__extract_doy
             , subq_3.listing__window_end__day AS listing__window_end__day
             , subq_3.listing__window_end__week AS listing__window_end__week
             , subq_3.listing__window_end__month AS listing__window_end__month
@@ -286,8 +286,8 @@ FROM (
             , subq_3.listing__window_end__extract_month AS listing__window_end__extract_month
             , subq_3.listing__window_end__extract_week AS listing__window_end__extract_week
             , subq_3.listing__window_end__extract_day AS listing__window_end__extract_day
-            , subq_3.listing__window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
-            , subq_3.listing__window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
+            , subq_3.listing__window_end__extract_dow AS listing__window_end__extract_dow
+            , subq_3.listing__window_end__extract_doy AS listing__window_end__extract_doy
             , subq_5.ds__day AS user__ds__day
             , subq_5.ds__week AS user__ds__week
             , subq_5.ds__month AS user__ds__month
@@ -298,8 +298,8 @@ FROM (
             , subq_5.ds__extract_month AS user__ds__extract_month
             , subq_5.ds__extract_week AS user__ds__extract_week
             , subq_5.ds__extract_day AS user__ds__extract_day
-            , subq_5.ds__extract_dayofweek AS user__ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS user__ds__extract_dayofyear
+            , subq_5.ds__extract_dow AS user__ds__extract_dow
+            , subq_5.ds__extract_doy AS user__ds__extract_doy
             , subq_3.listing AS listing
             , subq_3.user AS user
             , subq_3.listing__user AS listing__user
@@ -318,25 +318,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_from) AS window_start__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_from) AS window_start__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_from) AS window_start__extract_doy
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_to) AS window_end__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_to) AS window_end__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_to) AS window_end__extract_doy
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -345,25 +345,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -412,8 +412,8 @@ FROM (
               , subq_4.ds__extract_month
               , subq_4.ds__extract_week
               , subq_4.ds__extract_day
-              , subq_4.ds__extract_dayofweek
-              , subq_4.ds__extract_dayofyear
+              , subq_4.ds__extract_dow
+              , subq_4.ds__extract_doy
               , subq_4.user__ds__day
               , subq_4.user__ds__week
               , subq_4.user__ds__month
@@ -424,8 +424,8 @@ FROM (
               , subq_4.user__ds__extract_month
               , subq_4.user__ds__extract_week
               , subq_4.user__ds__extract_day
-              , subq_4.user__ds__extract_dayofweek
-              , subq_4.user__ds__extract_dayofyear
+              , subq_4.user__ds__extract_dow
+              , subq_4.user__ds__extract_doy
               , subq_4.user
               , subq_4.home_state_latest
               , subq_4.user__home_state_latest
@@ -437,26 +437,26 @@ FROM (
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS ds__year
-                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM users_latest_src_10021.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM users_latest_src_10021.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM users_latest_src_10021.ds) AS ds__extract_month
+                , EXTRACT(week FROM users_latest_src_10021.ds) AS ds__extract_week
+                , EXTRACT(day FROM users_latest_src_10021.ds) AS ds__extract_day
+                , EXTRACT(dow FROM users_latest_src_10021.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM users_latest_src_10021.ds) AS ds__extract_doy
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC('week', users_latest_src_10021.ds) AS user__ds__week
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS user__ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS user__ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS user__ds__year
-                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS user__ds__extract_year
-                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
-                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS user__ds__extract_month
-                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
-                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS user__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_dayofyear
+                , EXTRACT(year FROM users_latest_src_10021.ds) AS user__ds__extract_year
+                , EXTRACT(quarter FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
+                , EXTRACT(month FROM users_latest_src_10021.ds) AS user__ds__extract_month
+                , EXTRACT(week FROM users_latest_src_10021.ds) AS user__ds__extract_week
+                , EXTRACT(day FROM users_latest_src_10021.ds) AS user__ds__extract_day
+                , EXTRACT(dow FROM users_latest_src_10021.ds) AS user__ds__extract_dow
+                , EXTRACT(doy FROM users_latest_src_10021.ds) AS user__ds__extract_doy
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
index adaf16cf58..8abc633b9a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
@@ -45,8 +45,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -57,8 +57,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -69,8 +69,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -81,8 +81,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -93,8 +93,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -105,8 +105,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -117,8 +117,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -149,74 +149,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -253,8 +253,8 @@ FROM (
             , subq_5.window_start__extract_month AS lux_listing__window_start__extract_month
             , subq_5.window_start__extract_week AS lux_listing__window_start__extract_week
             , subq_5.window_start__extract_day AS lux_listing__window_start__extract_day
-            , subq_5.window_start__extract_dayofweek AS lux_listing__window_start__extract_dayofweek
-            , subq_5.window_start__extract_dayofyear AS lux_listing__window_start__extract_dayofyear
+            , subq_5.window_start__extract_dow AS lux_listing__window_start__extract_dow
+            , subq_5.window_start__extract_doy AS lux_listing__window_start__extract_doy
             , subq_5.window_end__day AS lux_listing__window_end__day
             , subq_5.window_end__week AS lux_listing__window_end__week
             , subq_5.window_end__month AS lux_listing__window_end__month
@@ -265,8 +265,8 @@ FROM (
             , subq_5.window_end__extract_month AS lux_listing__window_end__extract_month
             , subq_5.window_end__extract_week AS lux_listing__window_end__extract_week
             , subq_5.window_end__extract_day AS lux_listing__window_end__extract_day
-            , subq_5.window_end__extract_dayofweek AS lux_listing__window_end__extract_dayofweek
-            , subq_5.window_end__extract_dayofyear AS lux_listing__window_end__extract_dayofyear
+            , subq_5.window_end__extract_dow AS lux_listing__window_end__extract_dow
+            , subq_5.window_end__extract_doy AS lux_listing__window_end__extract_doy
             , subq_3.listing AS listing
             , subq_3.lux_listing AS lux_listing
             , subq_3.listing__lux_listing AS listing__lux_listing
@@ -343,8 +343,8 @@ FROM (
               , subq_4.window_start__extract_month
               , subq_4.window_start__extract_week
               , subq_4.window_start__extract_day
-              , subq_4.window_start__extract_dayofweek
-              , subq_4.window_start__extract_dayofyear
+              , subq_4.window_start__extract_dow
+              , subq_4.window_start__extract_doy
               , subq_4.window_end__day
               , subq_4.window_end__week
               , subq_4.window_end__month
@@ -355,8 +355,8 @@ FROM (
               , subq_4.window_end__extract_month
               , subq_4.window_end__extract_week
               , subq_4.window_end__extract_day
-              , subq_4.window_end__extract_dayofweek
-              , subq_4.window_end__extract_dayofyear
+              , subq_4.window_end__extract_dow
+              , subq_4.window_end__extract_doy
               , subq_4.lux_listing__window_start__day
               , subq_4.lux_listing__window_start__week
               , subq_4.lux_listing__window_start__month
@@ -367,8 +367,8 @@ FROM (
               , subq_4.lux_listing__window_start__extract_month
               , subq_4.lux_listing__window_start__extract_week
               , subq_4.lux_listing__window_start__extract_day
-              , subq_4.lux_listing__window_start__extract_dayofweek
-              , subq_4.lux_listing__window_start__extract_dayofyear
+              , subq_4.lux_listing__window_start__extract_dow
+              , subq_4.lux_listing__window_start__extract_doy
               , subq_4.lux_listing__window_end__day
               , subq_4.lux_listing__window_end__week
               , subq_4.lux_listing__window_end__month
@@ -379,8 +379,8 @@ FROM (
               , subq_4.lux_listing__window_end__extract_month
               , subq_4.lux_listing__window_end__extract_week
               , subq_4.lux_listing__window_end__extract_day
-              , subq_4.lux_listing__window_end__extract_dayofweek
-              , subq_4.lux_listing__window_end__extract_dayofyear
+              , subq_4.lux_listing__window_end__extract_dow
+              , subq_4.lux_listing__window_end__extract_doy
               , subq_4.lux_listing
               , subq_4.is_confirmed_lux
               , subq_4.lux_listing__is_confirmed_lux
@@ -392,50 +392,50 @@ FROM (
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS window_start__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_from) AS window_start__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_from) AS window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS window_end__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_to) AS window_end__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_to) AS window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_from) AS lux_listing__window_start__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS lux_listing__window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS lux_listing__window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS lux_listing__window_start__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS lux_listing__window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS lux_listing__window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS lux_listing__window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS lux_listing__window_end__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql
index cb9670f074..7e38380b20 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_join_node__plan0.sql
@@ -33,74 +33,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -127,25 +127,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -154,25 +154,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -201,25 +201,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -228,25 +228,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
index 7638105966..99d4dba7cb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
@@ -41,8 +41,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.ds__day
             , subq_0.ds__week
             , subq_0.ds__month
@@ -53,8 +53,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.account_id__ds_partitioned__day
             , subq_0.account_id__ds_partitioned__week
             , subq_0.account_id__ds_partitioned__month
@@ -65,8 +65,8 @@ FROM (
             , subq_0.account_id__ds_partitioned__extract_month
             , subq_0.account_id__ds_partitioned__extract_week
             , subq_0.account_id__ds_partitioned__extract_day
-            , subq_0.account_id__ds_partitioned__extract_dayofweek
-            , subq_0.account_id__ds_partitioned__extract_dayofyear
+            , subq_0.account_id__ds_partitioned__extract_dow
+            , subq_0.account_id__ds_partitioned__extract_doy
             , subq_0.account_id__ds__day
             , subq_0.account_id__ds__week
             , subq_0.account_id__ds__month
@@ -77,8 +77,8 @@ FROM (
             , subq_0.account_id__ds__extract_month
             , subq_0.account_id__ds__extract_week
             , subq_0.account_id__ds__extract_day
-            , subq_0.account_id__ds__extract_dayofweek
-            , subq_0.account_id__ds__extract_dayofyear
+            , subq_0.account_id__ds__extract_dow
+            , subq_0.account_id__ds__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -89,8 +89,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.account_id
             , subq_0.account_month
             , subq_0.account_id__account_month
@@ -104,50 +104,50 @@ FROM (
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS ds__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds) AS ds__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds) AS ds__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds) AS ds__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds) AS ds__extract_doy
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS account_id__ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS account_id__ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS account_id__ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS account_id__ds__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_doy
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -174,8 +174,8 @@ FROM (
             , subq_3.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_3.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_3.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_3.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_3.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_3.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_3.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_3.account_id__ds_partitioned__day AS account_id__ds_partitioned__day
             , subq_3.account_id__ds_partitioned__week AS account_id__ds_partitioned__week
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
@@ -186,8 +186,8 @@ FROM (
             , subq_3.account_id__ds_partitioned__extract_month AS account_id__ds_partitioned__extract_month
             , subq_3.account_id__ds_partitioned__extract_week AS account_id__ds_partitioned__extract_week
             , subq_3.account_id__ds_partitioned__extract_day AS account_id__ds_partitioned__extract_day
-            , subq_3.account_id__ds_partitioned__extract_dayofweek AS account_id__ds_partitioned__extract_dayofweek
-            , subq_3.account_id__ds_partitioned__extract_dayofyear AS account_id__ds_partitioned__extract_dayofyear
+            , subq_3.account_id__ds_partitioned__extract_dow AS account_id__ds_partitioned__extract_dow
+            , subq_3.account_id__ds_partitioned__extract_doy AS account_id__ds_partitioned__extract_doy
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
@@ -198,8 +198,8 @@ FROM (
             , subq_5.ds_partitioned__extract_month AS customer_id__ds_partitioned__extract_month
             , subq_5.ds_partitioned__extract_week AS customer_id__ds_partitioned__extract_week
             , subq_5.ds_partitioned__extract_day AS customer_id__ds_partitioned__extract_day
-            , subq_5.ds_partitioned__extract_dayofweek AS customer_id__ds_partitioned__extract_dayofweek
-            , subq_5.ds_partitioned__extract_dayofyear AS customer_id__ds_partitioned__extract_dayofyear
+            , subq_5.ds_partitioned__extract_dow AS customer_id__ds_partitioned__extract_dow
+            , subq_5.ds_partitioned__extract_doy AS customer_id__ds_partitioned__extract_doy
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
@@ -216,26 +216,26 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_doy
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
-              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(week FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -283,8 +283,8 @@ FROM (
               , subq_4.ds_partitioned__extract_month
               , subq_4.ds_partitioned__extract_week
               , subq_4.ds_partitioned__extract_day
-              , subq_4.ds_partitioned__extract_dayofweek
-              , subq_4.ds_partitioned__extract_dayofyear
+              , subq_4.ds_partitioned__extract_dow
+              , subq_4.ds_partitioned__extract_doy
               , subq_4.customer_id__ds_partitioned__day
               , subq_4.customer_id__ds_partitioned__week
               , subq_4.customer_id__ds_partitioned__month
@@ -295,8 +295,8 @@ FROM (
               , subq_4.customer_id__ds_partitioned__extract_month
               , subq_4.customer_id__ds_partitioned__extract_week
               , subq_4.customer_id__ds_partitioned__extract_day
-              , subq_4.customer_id__ds_partitioned__extract_dayofweek
-              , subq_4.customer_id__ds_partitioned__extract_dayofyear
+              , subq_4.customer_id__ds_partitioned__extract_dow
+              , subq_4.customer_id__ds_partitioned__extract_doy
               , subq_4.customer_id
               , subq_4.customer_name
               , subq_4.customer_atomic_weight
@@ -312,13 +312,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -326,13 +326,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__year
-                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
+                , EXTRACT(week FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
+                , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
+                , EXTRACT(dow FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
index 3d8fba9b22..54b108dd33 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multiple_metrics_no_dimensions__plan0.sql
@@ -28,8 +28,8 @@ FROM (
           , subq_1.ds__extract_month
           , subq_1.ds__extract_week
           , subq_1.ds__extract_day
-          , subq_1.ds__extract_dayofweek
-          , subq_1.ds__extract_dayofyear
+          , subq_1.ds__extract_dow
+          , subq_1.ds__extract_doy
           , subq_1.ds_partitioned__day
           , subq_1.ds_partitioned__week
           , subq_1.ds_partitioned__month
@@ -40,8 +40,8 @@ FROM (
           , subq_1.ds_partitioned__extract_month
           , subq_1.ds_partitioned__extract_week
           , subq_1.ds_partitioned__extract_day
-          , subq_1.ds_partitioned__extract_dayofweek
-          , subq_1.ds_partitioned__extract_dayofyear
+          , subq_1.ds_partitioned__extract_dow
+          , subq_1.ds_partitioned__extract_doy
           , subq_1.paid_at__day
           , subq_1.paid_at__week
           , subq_1.paid_at__month
@@ -52,8 +52,8 @@ FROM (
           , subq_1.paid_at__extract_month
           , subq_1.paid_at__extract_week
           , subq_1.paid_at__extract_day
-          , subq_1.paid_at__extract_dayofweek
-          , subq_1.paid_at__extract_dayofyear
+          , subq_1.paid_at__extract_dow
+          , subq_1.paid_at__extract_doy
           , subq_1.booking__ds__day
           , subq_1.booking__ds__week
           , subq_1.booking__ds__month
@@ -64,8 +64,8 @@ FROM (
           , subq_1.booking__ds__extract_month
           , subq_1.booking__ds__extract_week
           , subq_1.booking__ds__extract_day
-          , subq_1.booking__ds__extract_dayofweek
-          , subq_1.booking__ds__extract_dayofyear
+          , subq_1.booking__ds__extract_dow
+          , subq_1.booking__ds__extract_doy
           , subq_1.booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month
@@ -76,8 +76,8 @@ FROM (
           , subq_1.booking__ds_partitioned__extract_month
           , subq_1.booking__ds_partitioned__extract_week
           , subq_1.booking__ds_partitioned__extract_day
-          , subq_1.booking__ds_partitioned__extract_dayofweek
-          , subq_1.booking__ds_partitioned__extract_dayofyear
+          , subq_1.booking__ds_partitioned__extract_dow
+          , subq_1.booking__ds_partitioned__extract_doy
           , subq_1.booking__paid_at__day
           , subq_1.booking__paid_at__week
           , subq_1.booking__paid_at__month
@@ -88,8 +88,8 @@ FROM (
           , subq_1.booking__paid_at__extract_month
           , subq_1.booking__paid_at__extract_week
           , subq_1.booking__paid_at__extract_day
-          , subq_1.booking__paid_at__extract_dayofweek
-          , subq_1.booking__paid_at__extract_dayofyear
+          , subq_1.booking__paid_at__extract_dow
+          , subq_1.booking__paid_at__extract_doy
           , subq_1.metric_time__day
           , subq_1.metric_time__week
           , subq_1.metric_time__month
@@ -100,8 +100,8 @@ FROM (
           , subq_1.metric_time__extract_month
           , subq_1.metric_time__extract_week
           , subq_1.metric_time__extract_day
-          , subq_1.metric_time__extract_dayofweek
-          , subq_1.metric_time__extract_dayofyear
+          , subq_1.metric_time__extract_dow
+          , subq_1.metric_time__extract_doy
           , subq_1.listing
           , subq_1.guest
           , subq_1.host
@@ -136,8 +136,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -148,8 +148,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -160,8 +160,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -172,8 +172,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -184,8 +184,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -196,8 +196,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -208,8 +208,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -254,74 +254,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -362,8 +362,8 @@ CROSS JOIN (
           , subq_7.ds__extract_month
           , subq_7.ds__extract_week
           , subq_7.ds__extract_day
-          , subq_7.ds__extract_dayofweek
-          , subq_7.ds__extract_dayofyear
+          , subq_7.ds__extract_dow
+          , subq_7.ds__extract_doy
           , subq_7.created_at__day
           , subq_7.created_at__week
           , subq_7.created_at__month
@@ -374,8 +374,8 @@ CROSS JOIN (
           , subq_7.created_at__extract_month
           , subq_7.created_at__extract_week
           , subq_7.created_at__extract_day
-          , subq_7.created_at__extract_dayofweek
-          , subq_7.created_at__extract_dayofyear
+          , subq_7.created_at__extract_dow
+          , subq_7.created_at__extract_doy
           , subq_7.listing__ds__day
           , subq_7.listing__ds__week
           , subq_7.listing__ds__month
@@ -386,8 +386,8 @@ CROSS JOIN (
           , subq_7.listing__ds__extract_month
           , subq_7.listing__ds__extract_week
           , subq_7.listing__ds__extract_day
-          , subq_7.listing__ds__extract_dayofweek
-          , subq_7.listing__ds__extract_dayofyear
+          , subq_7.listing__ds__extract_dow
+          , subq_7.listing__ds__extract_doy
           , subq_7.listing__created_at__day
           , subq_7.listing__created_at__week
           , subq_7.listing__created_at__month
@@ -398,8 +398,8 @@ CROSS JOIN (
           , subq_7.listing__created_at__extract_month
           , subq_7.listing__created_at__extract_week
           , subq_7.listing__created_at__extract_day
-          , subq_7.listing__created_at__extract_dayofweek
-          , subq_7.listing__created_at__extract_dayofyear
+          , subq_7.listing__created_at__extract_dow
+          , subq_7.listing__created_at__extract_doy
           , subq_7.metric_time__day
           , subq_7.metric_time__week
           , subq_7.metric_time__month
@@ -410,8 +410,8 @@ CROSS JOIN (
           , subq_7.metric_time__extract_month
           , subq_7.metric_time__extract_week
           , subq_7.metric_time__extract_day
-          , subq_7.metric_time__extract_dayofweek
-          , subq_7.metric_time__extract_dayofyear
+          , subq_7.metric_time__extract_dow
+          , subq_7.metric_time__extract_doy
           , subq_7.listing
           , subq_7.user
           , subq_7.listing__user
@@ -437,8 +437,8 @@ CROSS JOIN (
             , subq_6.ds__extract_month
             , subq_6.ds__extract_week
             , subq_6.ds__extract_day
-            , subq_6.ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear
+            , subq_6.ds__extract_dow
+            , subq_6.ds__extract_doy
             , subq_6.created_at__day
             , subq_6.created_at__week
             , subq_6.created_at__month
@@ -449,8 +449,8 @@ CROSS JOIN (
             , subq_6.created_at__extract_month
             , subq_6.created_at__extract_week
             , subq_6.created_at__extract_day
-            , subq_6.created_at__extract_dayofweek
-            , subq_6.created_at__extract_dayofyear
+            , subq_6.created_at__extract_dow
+            , subq_6.created_at__extract_doy
             , subq_6.listing__ds__day
             , subq_6.listing__ds__week
             , subq_6.listing__ds__month
@@ -461,8 +461,8 @@ CROSS JOIN (
             , subq_6.listing__ds__extract_month
             , subq_6.listing__ds__extract_week
             , subq_6.listing__ds__extract_day
-            , subq_6.listing__ds__extract_dayofweek
-            , subq_6.listing__ds__extract_dayofyear
+            , subq_6.listing__ds__extract_dow
+            , subq_6.listing__ds__extract_doy
             , subq_6.listing__created_at__day
             , subq_6.listing__created_at__week
             , subq_6.listing__created_at__month
@@ -473,8 +473,8 @@ CROSS JOIN (
             , subq_6.listing__created_at__extract_month
             , subq_6.listing__created_at__extract_week
             , subq_6.listing__created_at__extract_day
-            , subq_6.listing__created_at__extract_dayofweek
-            , subq_6.listing__created_at__extract_dayofyear
+            , subq_6.listing__created_at__extract_dow
+            , subq_6.listing__created_at__extract_doy
             , subq_6.ds__day AS metric_time__day
             , subq_6.ds__week AS metric_time__week
             , subq_6.ds__month AS metric_time__month
@@ -485,8 +485,8 @@ CROSS JOIN (
             , subq_6.ds__extract_month AS metric_time__extract_month
             , subq_6.ds__extract_week AS metric_time__extract_week
             , subq_6.ds__extract_day AS metric_time__extract_day
-            , subq_6.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_6.ds__extract_dow AS metric_time__extract_dow
+            , subq_6.ds__extract_doy AS metric_time__extract_doy
             , subq_6.listing
             , subq_6.user
             , subq_6.listing__user
@@ -510,25 +510,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -537,25 +537,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql
index 138d3b47ca..a716977aaf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_nested_derived_metric__plan0.sql
@@ -49,8 +49,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -61,8 +61,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -73,8 +73,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -85,8 +85,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -97,8 +97,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -109,8 +109,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -121,8 +121,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -167,74 +167,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -278,8 +278,8 @@ FROM (
                 , subq_5.ds__extract_month
                 , subq_5.ds__extract_week
                 , subq_5.ds__extract_day
-                , subq_5.ds__extract_dayofweek
-                , subq_5.ds__extract_dayofyear
+                , subq_5.ds__extract_dow
+                , subq_5.ds__extract_doy
                 , subq_5.ds_partitioned__day
                 , subq_5.ds_partitioned__week
                 , subq_5.ds_partitioned__month
@@ -290,8 +290,8 @@ FROM (
                 , subq_5.ds_partitioned__extract_month
                 , subq_5.ds_partitioned__extract_week
                 , subq_5.ds_partitioned__extract_day
-                , subq_5.ds_partitioned__extract_dayofweek
-                , subq_5.ds_partitioned__extract_dayofyear
+                , subq_5.ds_partitioned__extract_dow
+                , subq_5.ds_partitioned__extract_doy
                 , subq_5.paid_at__day
                 , subq_5.paid_at__week
                 , subq_5.paid_at__month
@@ -302,8 +302,8 @@ FROM (
                 , subq_5.paid_at__extract_month
                 , subq_5.paid_at__extract_week
                 , subq_5.paid_at__extract_day
-                , subq_5.paid_at__extract_dayofweek
-                , subq_5.paid_at__extract_dayofyear
+                , subq_5.paid_at__extract_dow
+                , subq_5.paid_at__extract_doy
                 , subq_5.booking__ds__day
                 , subq_5.booking__ds__week
                 , subq_5.booking__ds__month
@@ -314,8 +314,8 @@ FROM (
                 , subq_5.booking__ds__extract_month
                 , subq_5.booking__ds__extract_week
                 , subq_5.booking__ds__extract_day
-                , subq_5.booking__ds__extract_dayofweek
-                , subq_5.booking__ds__extract_dayofyear
+                , subq_5.booking__ds__extract_dow
+                , subq_5.booking__ds__extract_doy
                 , subq_5.booking__ds_partitioned__day
                 , subq_5.booking__ds_partitioned__week
                 , subq_5.booking__ds_partitioned__month
@@ -326,8 +326,8 @@ FROM (
                 , subq_5.booking__ds_partitioned__extract_month
                 , subq_5.booking__ds_partitioned__extract_week
                 , subq_5.booking__ds_partitioned__extract_day
-                , subq_5.booking__ds_partitioned__extract_dayofweek
-                , subq_5.booking__ds_partitioned__extract_dayofyear
+                , subq_5.booking__ds_partitioned__extract_dow
+                , subq_5.booking__ds_partitioned__extract_doy
                 , subq_5.booking__paid_at__day
                 , subq_5.booking__paid_at__week
                 , subq_5.booking__paid_at__month
@@ -338,8 +338,8 @@ FROM (
                 , subq_5.booking__paid_at__extract_month
                 , subq_5.booking__paid_at__extract_week
                 , subq_5.booking__paid_at__extract_day
-                , subq_5.booking__paid_at__extract_dayofweek
-                , subq_5.booking__paid_at__extract_dayofyear
+                , subq_5.booking__paid_at__extract_dow
+                , subq_5.booking__paid_at__extract_doy
                 , subq_5.ds__day AS metric_time__day
                 , subq_5.ds__week AS metric_time__week
                 , subq_5.ds__month AS metric_time__month
@@ -350,8 +350,8 @@ FROM (
                 , subq_5.ds__extract_month AS metric_time__extract_month
                 , subq_5.ds__extract_week AS metric_time__extract_week
                 , subq_5.ds__extract_day AS metric_time__extract_day
-                , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_5.ds__extract_dow AS metric_time__extract_dow
+                , subq_5.ds__extract_doy AS metric_time__extract_doy
                 , subq_5.listing
                 , subq_5.guest
                 , subq_5.host
@@ -396,74 +396,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -519,8 +519,8 @@ FROM (
             , subq_12.ds__extract_month
             , subq_12.ds__extract_week
             , subq_12.ds__extract_day
-            , subq_12.ds__extract_dayofweek
-            , subq_12.ds__extract_dayofyear
+            , subq_12.ds__extract_dow
+            , subq_12.ds__extract_doy
             , subq_12.ds_partitioned__day
             , subq_12.ds_partitioned__week
             , subq_12.ds_partitioned__month
@@ -531,8 +531,8 @@ FROM (
             , subq_12.ds_partitioned__extract_month
             , subq_12.ds_partitioned__extract_week
             , subq_12.ds_partitioned__extract_day
-            , subq_12.ds_partitioned__extract_dayofweek
-            , subq_12.ds_partitioned__extract_dayofyear
+            , subq_12.ds_partitioned__extract_dow
+            , subq_12.ds_partitioned__extract_doy
             , subq_12.paid_at__day
             , subq_12.paid_at__week
             , subq_12.paid_at__month
@@ -543,8 +543,8 @@ FROM (
             , subq_12.paid_at__extract_month
             , subq_12.paid_at__extract_week
             , subq_12.paid_at__extract_day
-            , subq_12.paid_at__extract_dayofweek
-            , subq_12.paid_at__extract_dayofyear
+            , subq_12.paid_at__extract_dow
+            , subq_12.paid_at__extract_doy
             , subq_12.booking__ds__day
             , subq_12.booking__ds__week
             , subq_12.booking__ds__month
@@ -555,8 +555,8 @@ FROM (
             , subq_12.booking__ds__extract_month
             , subq_12.booking__ds__extract_week
             , subq_12.booking__ds__extract_day
-            , subq_12.booking__ds__extract_dayofweek
-            , subq_12.booking__ds__extract_dayofyear
+            , subq_12.booking__ds__extract_dow
+            , subq_12.booking__ds__extract_doy
             , subq_12.booking__ds_partitioned__day
             , subq_12.booking__ds_partitioned__week
             , subq_12.booking__ds_partitioned__month
@@ -567,8 +567,8 @@ FROM (
             , subq_12.booking__ds_partitioned__extract_month
             , subq_12.booking__ds_partitioned__extract_week
             , subq_12.booking__ds_partitioned__extract_day
-            , subq_12.booking__ds_partitioned__extract_dayofweek
-            , subq_12.booking__ds_partitioned__extract_dayofyear
+            , subq_12.booking__ds_partitioned__extract_dow
+            , subq_12.booking__ds_partitioned__extract_doy
             , subq_12.booking__paid_at__day
             , subq_12.booking__paid_at__week
             , subq_12.booking__paid_at__month
@@ -579,8 +579,8 @@ FROM (
             , subq_12.booking__paid_at__extract_month
             , subq_12.booking__paid_at__extract_week
             , subq_12.booking__paid_at__extract_day
-            , subq_12.booking__paid_at__extract_dayofweek
-            , subq_12.booking__paid_at__extract_dayofyear
+            , subq_12.booking__paid_at__extract_dow
+            , subq_12.booking__paid_at__extract_doy
             , subq_12.ds__day AS metric_time__day
             , subq_12.ds__week AS metric_time__week
             , subq_12.ds__month AS metric_time__month
@@ -591,8 +591,8 @@ FROM (
             , subq_12.ds__extract_month AS metric_time__extract_month
             , subq_12.ds__extract_week AS metric_time__extract_week
             , subq_12.ds__extract_day AS metric_time__extract_day
-            , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_12.ds__extract_dow AS metric_time__extract_dow
+            , subq_12.ds__extract_doy AS metric_time__extract_doy
             , subq_12.listing
             , subq_12.guest
             , subq_12.host
@@ -637,74 +637,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -758,8 +758,8 @@ FROM (
             , subq_17.ds__extract_month
             , subq_17.ds__extract_week
             , subq_17.ds__extract_day
-            , subq_17.ds__extract_dayofweek
-            , subq_17.ds__extract_dayofyear
+            , subq_17.ds__extract_dow
+            , subq_17.ds__extract_doy
             , subq_17.ds_partitioned__day
             , subq_17.ds_partitioned__week
             , subq_17.ds_partitioned__month
@@ -770,8 +770,8 @@ FROM (
             , subq_17.ds_partitioned__extract_month
             , subq_17.ds_partitioned__extract_week
             , subq_17.ds_partitioned__extract_day
-            , subq_17.ds_partitioned__extract_dayofweek
-            , subq_17.ds_partitioned__extract_dayofyear
+            , subq_17.ds_partitioned__extract_dow
+            , subq_17.ds_partitioned__extract_doy
             , subq_17.paid_at__day
             , subq_17.paid_at__week
             , subq_17.paid_at__month
@@ -782,8 +782,8 @@ FROM (
             , subq_17.paid_at__extract_month
             , subq_17.paid_at__extract_week
             , subq_17.paid_at__extract_day
-            , subq_17.paid_at__extract_dayofweek
-            , subq_17.paid_at__extract_dayofyear
+            , subq_17.paid_at__extract_dow
+            , subq_17.paid_at__extract_doy
             , subq_17.booking__ds__day
             , subq_17.booking__ds__week
             , subq_17.booking__ds__month
@@ -794,8 +794,8 @@ FROM (
             , subq_17.booking__ds__extract_month
             , subq_17.booking__ds__extract_week
             , subq_17.booking__ds__extract_day
-            , subq_17.booking__ds__extract_dayofweek
-            , subq_17.booking__ds__extract_dayofyear
+            , subq_17.booking__ds__extract_dow
+            , subq_17.booking__ds__extract_doy
             , subq_17.booking__ds_partitioned__day
             , subq_17.booking__ds_partitioned__week
             , subq_17.booking__ds_partitioned__month
@@ -806,8 +806,8 @@ FROM (
             , subq_17.booking__ds_partitioned__extract_month
             , subq_17.booking__ds_partitioned__extract_week
             , subq_17.booking__ds_partitioned__extract_day
-            , subq_17.booking__ds_partitioned__extract_dayofweek
-            , subq_17.booking__ds_partitioned__extract_dayofyear
+            , subq_17.booking__ds_partitioned__extract_dow
+            , subq_17.booking__ds_partitioned__extract_doy
             , subq_17.booking__paid_at__day
             , subq_17.booking__paid_at__week
             , subq_17.booking__paid_at__month
@@ -818,8 +818,8 @@ FROM (
             , subq_17.booking__paid_at__extract_month
             , subq_17.booking__paid_at__extract_week
             , subq_17.booking__paid_at__extract_day
-            , subq_17.booking__paid_at__extract_dayofweek
-            , subq_17.booking__paid_at__extract_dayofyear
+            , subq_17.booking__paid_at__extract_dow
+            , subq_17.booking__paid_at__extract_doy
             , subq_17.ds__day AS metric_time__day
             , subq_17.ds__week AS metric_time__week
             , subq_17.ds__month AS metric_time__month
@@ -830,8 +830,8 @@ FROM (
             , subq_17.ds__extract_month AS metric_time__extract_month
             , subq_17.ds__extract_week AS metric_time__extract_week
             , subq_17.ds__extract_day AS metric_time__extract_day
-            , subq_17.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_17.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_17.ds__extract_dow AS metric_time__extract_dow
+            , subq_17.ds__extract_doy AS metric_time__extract_doy
             , subq_17.listing
             , subq_17.guest
             , subq_17.host
@@ -876,74 +876,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql
index 63116a5458..d6632b499f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_order_by_node__plan0.sql
@@ -45,74 +45,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql
index e43e265eff..44cff4ab94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_partitioned_join__plan0.sql
@@ -41,8 +41,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -53,8 +53,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.verification__ds__day
             , subq_0.verification__ds__week
             , subq_0.verification__ds__month
@@ -65,8 +65,8 @@ FROM (
             , subq_0.verification__ds__extract_month
             , subq_0.verification__ds__extract_week
             , subq_0.verification__ds__extract_day
-            , subq_0.verification__ds__extract_dayofweek
-            , subq_0.verification__ds__extract_dayofyear
+            , subq_0.verification__ds__extract_dow
+            , subq_0.verification__ds__extract_doy
             , subq_0.verification__ds_partitioned__day
             , subq_0.verification__ds_partitioned__week
             , subq_0.verification__ds_partitioned__month
@@ -77,8 +77,8 @@ FROM (
             , subq_0.verification__ds_partitioned__extract_month
             , subq_0.verification__ds_partitioned__extract_week
             , subq_0.verification__ds_partitioned__extract_day
-            , subq_0.verification__ds_partitioned__extract_dayofweek
-            , subq_0.verification__ds_partitioned__extract_dayofyear
+            , subq_0.verification__ds_partitioned__extract_dow
+            , subq_0.verification__ds_partitioned__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -89,8 +89,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.verification
             , subq_0.user
             , subq_0.verification__user
@@ -106,50 +106,50 @@ FROM (
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds) AS ds__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds) AS ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -173,74 +173,74 @@ FROM (
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS ds__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds) AS ds__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds) AS ds__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds) AS ds__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds) AS ds__extract_doy
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS created_at__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.created_at) AS created_at__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.created_at) AS created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds) AS user__ds__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS user__ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS user__ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS user__ds__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds) AS user__ds__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds) AS user__ds__extract_doy
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS user__created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS user__created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS user__created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS user__created_at__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql
index d88d2d32f3..33fc914795 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -82,26 +82,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql
index 094486f462..d90abbd294 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql
index a8a26c9899..dc98b44d95 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -83,26 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index c400372dd4..d723157d2a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 30ab4c1851..95274f2863 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -83,26 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index ef337f422c..e0c877bdf1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql
index 16b897731d..9c6e0a2676 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_single_join_node__plan0.sql
@@ -31,74 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -125,25 +125,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -152,25 +152,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql
index 7dd5c3b39d..b9ae7f84a4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0.sql
@@ -20,74 +20,74 @@ SELECT
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql
index e240956212..d1560d9ab0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_source_node__plan0_optimized.sql
@@ -20,74 +20,74 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql
index d2a3c6afd9..b954d8927e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_common_semantic_model__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -150,74 +150,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -261,8 +261,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month
           , subq_5.ds__extract_week
           , subq_5.ds__extract_day
-          , subq_5.ds__extract_dayofweek
-          , subq_5.ds__extract_dayofyear
+          , subq_5.ds__extract_dow
+          , subq_5.ds__extract_doy
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
@@ -273,8 +273,8 @@ FULL OUTER JOIN (
           , subq_5.ds_partitioned__extract_month
           , subq_5.ds_partitioned__extract_week
           , subq_5.ds_partitioned__extract_day
-          , subq_5.ds_partitioned__extract_dayofweek
-          , subq_5.ds_partitioned__extract_dayofyear
+          , subq_5.ds_partitioned__extract_dow
+          , subq_5.ds_partitioned__extract_doy
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
@@ -285,8 +285,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month
           , subq_5.paid_at__extract_week
           , subq_5.paid_at__extract_day
-          , subq_5.paid_at__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear
+          , subq_5.paid_at__extract_dow
+          , subq_5.paid_at__extract_doy
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
@@ -297,8 +297,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds__extract_month
           , subq_5.booking__ds__extract_week
           , subq_5.booking__ds__extract_day
-          , subq_5.booking__ds__extract_dayofweek
-          , subq_5.booking__ds__extract_dayofyear
+          , subq_5.booking__ds__extract_dow
+          , subq_5.booking__ds__extract_doy
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
@@ -309,8 +309,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds_partitioned__extract_month
           , subq_5.booking__ds_partitioned__extract_week
           , subq_5.booking__ds_partitioned__extract_day
-          , subq_5.booking__ds_partitioned__extract_dayofweek
-          , subq_5.booking__ds_partitioned__extract_dayofyear
+          , subq_5.booking__ds_partitioned__extract_dow
+          , subq_5.booking__ds_partitioned__extract_doy
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
@@ -321,8 +321,8 @@ FULL OUTER JOIN (
           , subq_5.booking__paid_at__extract_month
           , subq_5.booking__paid_at__extract_week
           , subq_5.booking__paid_at__extract_day
-          , subq_5.booking__paid_at__extract_dayofweek
-          , subq_5.booking__paid_at__extract_dayofyear
+          , subq_5.booking__paid_at__extract_dow
+          , subq_5.booking__paid_at__extract_doy
           , subq_5.ds__day AS metric_time__day
           , subq_5.ds__week AS metric_time__week
           , subq_5.ds__month AS metric_time__month
@@ -333,8 +333,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month AS metric_time__extract_month
           , subq_5.ds__extract_week AS metric_time__extract_week
           , subq_5.ds__extract_day AS metric_time__extract_day
-          , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_5.ds__extract_dow AS metric_time__extract_dow
+          , subq_5.ds__extract_doy AS metric_time__extract_doy
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
@@ -379,74 +379,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql
index c80b16baf0..b1bf877e84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node__plan0.sql
@@ -44,74 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -138,25 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -165,25 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index 2426067bd3..12e006e550 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -56,8 +56,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -68,8 +68,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -80,8 +80,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -92,8 +92,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -104,8 +104,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -116,8 +116,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -128,8 +128,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -174,74 +174,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -271,8 +271,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -283,8 +283,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -295,8 +295,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -307,8 +307,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -319,8 +319,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -344,25 +344,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -371,25 +371,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -455,8 +455,8 @@ FROM (
                 , subq_10.ds__extract_month
                 , subq_10.ds__extract_week
                 , subq_10.ds__extract_day
-                , subq_10.ds__extract_dayofweek
-                , subq_10.ds__extract_dayofyear
+                , subq_10.ds__extract_dow
+                , subq_10.ds__extract_doy
                 , subq_10.ds_partitioned__day
                 , subq_10.ds_partitioned__week
                 , subq_10.ds_partitioned__month
@@ -467,8 +467,8 @@ FROM (
                 , subq_10.ds_partitioned__extract_month
                 , subq_10.ds_partitioned__extract_week
                 , subq_10.ds_partitioned__extract_day
-                , subq_10.ds_partitioned__extract_dayofweek
-                , subq_10.ds_partitioned__extract_dayofyear
+                , subq_10.ds_partitioned__extract_dow
+                , subq_10.ds_partitioned__extract_doy
                 , subq_10.view__ds__day
                 , subq_10.view__ds__week
                 , subq_10.view__ds__month
@@ -479,8 +479,8 @@ FROM (
                 , subq_10.view__ds__extract_month
                 , subq_10.view__ds__extract_week
                 , subq_10.view__ds__extract_day
-                , subq_10.view__ds__extract_dayofweek
-                , subq_10.view__ds__extract_dayofyear
+                , subq_10.view__ds__extract_dow
+                , subq_10.view__ds__extract_doy
                 , subq_10.view__ds_partitioned__day
                 , subq_10.view__ds_partitioned__week
                 , subq_10.view__ds_partitioned__month
@@ -491,8 +491,8 @@ FROM (
                 , subq_10.view__ds_partitioned__extract_month
                 , subq_10.view__ds_partitioned__extract_week
                 , subq_10.view__ds_partitioned__extract_day
-                , subq_10.view__ds_partitioned__extract_dayofweek
-                , subq_10.view__ds_partitioned__extract_dayofyear
+                , subq_10.view__ds_partitioned__extract_dow
+                , subq_10.view__ds_partitioned__extract_doy
                 , subq_10.ds__day AS metric_time__day
                 , subq_10.ds__week AS metric_time__week
                 , subq_10.ds__month AS metric_time__month
@@ -503,8 +503,8 @@ FROM (
                 , subq_10.ds__extract_month AS metric_time__extract_month
                 , subq_10.ds__extract_week AS metric_time__extract_week
                 , subq_10.ds__extract_day AS metric_time__extract_day
-                , subq_10.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_10.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_10.ds__extract_dow AS metric_time__extract_dow
+                , subq_10.ds__extract_doy AS metric_time__extract_doy
                 , subq_10.listing
                 , subq_10.user
                 , subq_10.view__listing
@@ -519,49 +519,49 @@ FROM (
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS ds__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds) AS ds__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds) AS ds__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds) AS ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_doy
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC('week', views_source_src_10009.ds) AS view__ds__week
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS view__ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS view__ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS view__ds__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS view__ds__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS view__ds__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS view__ds__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS view__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds) AS view__ds__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds) AS view__ds__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds) AS view__ds__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds) AS view__ds__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds) AS view__ds__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds) AS view__ds__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds) AS view__ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_doy
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -589,8 +589,8 @@ FROM (
                 , subq_13.ds__extract_month
                 , subq_13.ds__extract_week
                 , subq_13.ds__extract_day
-                , subq_13.ds__extract_dayofweek
-                , subq_13.ds__extract_dayofyear
+                , subq_13.ds__extract_dow
+                , subq_13.ds__extract_doy
                 , subq_13.created_at__day
                 , subq_13.created_at__week
                 , subq_13.created_at__month
@@ -601,8 +601,8 @@ FROM (
                 , subq_13.created_at__extract_month
                 , subq_13.created_at__extract_week
                 , subq_13.created_at__extract_day
-                , subq_13.created_at__extract_dayofweek
-                , subq_13.created_at__extract_dayofyear
+                , subq_13.created_at__extract_dow
+                , subq_13.created_at__extract_doy
                 , subq_13.listing__ds__day
                 , subq_13.listing__ds__week
                 , subq_13.listing__ds__month
@@ -613,8 +613,8 @@ FROM (
                 , subq_13.listing__ds__extract_month
                 , subq_13.listing__ds__extract_week
                 , subq_13.listing__ds__extract_day
-                , subq_13.listing__ds__extract_dayofweek
-                , subq_13.listing__ds__extract_dayofyear
+                , subq_13.listing__ds__extract_dow
+                , subq_13.listing__ds__extract_doy
                 , subq_13.listing__created_at__day
                 , subq_13.listing__created_at__week
                 , subq_13.listing__created_at__month
@@ -625,8 +625,8 @@ FROM (
                 , subq_13.listing__created_at__extract_month
                 , subq_13.listing__created_at__extract_week
                 , subq_13.listing__created_at__extract_day
-                , subq_13.listing__created_at__extract_dayofweek
-                , subq_13.listing__created_at__extract_dayofyear
+                , subq_13.listing__created_at__extract_dow
+                , subq_13.listing__created_at__extract_doy
                 , subq_13.ds__day AS metric_time__day
                 , subq_13.ds__week AS metric_time__week
                 , subq_13.ds__month AS metric_time__month
@@ -637,8 +637,8 @@ FROM (
                 , subq_13.ds__extract_month AS metric_time__extract_month
                 , subq_13.ds__extract_week AS metric_time__extract_week
                 , subq_13.ds__extract_day AS metric_time__extract_day
-                , subq_13.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_13.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_13.ds__extract_dow AS metric_time__extract_dow
+                , subq_13.ds__extract_doy AS metric_time__extract_doy
                 , subq_13.listing
                 , subq_13.user
                 , subq_13.listing__user
@@ -662,25 +662,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -689,25 +689,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index b2d5615477..bcb36633c9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -47,74 +47,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -141,25 +141,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -168,25 +168,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql
index b6f01861d7..cd879426f7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_compute_metrics_node_simple_expr__plan0.sql
@@ -44,74 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -138,25 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -165,25 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql
index d480357663..5b6dd99cc4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_constrain_time_range_node__plan0.sql
@@ -38,74 +38,74 @@ FROM (
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
index ad08f90e35..6920a36691 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
index 8c2ab1a915..4080ab9420 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_grain_to_date__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
index 8d5b07c69a..fcf74a5947 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_ds__plan0.sql
@@ -23,8 +23,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -35,8 +35,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -47,8 +47,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -61,25 +61,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
index d98f0f554a..0143335613 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 26ab44afcc..5cba3a3202 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_1.ds__extract_month
         , subq_1.ds__extract_week
         , subq_1.ds__extract_day
-        , subq_1.ds__extract_dayofweek
-        , subq_1.ds__extract_dayofyear
+        , subq_1.ds__extract_dow
+        , subq_1.ds__extract_doy
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_1.company__ds__extract_month
         , subq_1.company__ds__extract_week
         , subq_1.company__ds__extract_day
-        , subq_1.company__ds__extract_dayofweek
-        , subq_1.company__ds__extract_dayofyear
+        , subq_1.company__ds__extract_dow
+        , subq_1.company__ds__extract_doy
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_1.metric_time__extract_month
         , subq_1.metric_time__extract_week
         , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dayofweek
-        , subq_1.metric_time__extract_dayofyear
+        , subq_1.metric_time__extract_dow
+        , subq_1.metric_time__extract_doy
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -68,8 +68,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.company__ds__extract_month
           , subq_0.company__ds__extract_week
           , subq_0.company__ds__extract_day
-          , subq_0.company__ds__extract_dayofweek
-          , subq_0.company__ds__extract_dayofyear
+          , subq_0.company__ds__extract_dow
+          , subq_0.company__ds__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
@@ -106,25 +106,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
index a670ac2189..414159089b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_1.ds__extract_month
         , subq_1.ds__extract_week
         , subq_1.ds__extract_day
-        , subq_1.ds__extract_dayofweek
-        , subq_1.ds__extract_dayofyear
+        , subq_1.ds__extract_dow
+        , subq_1.ds__extract_doy
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_1.company__ds__extract_month
         , subq_1.company__ds__extract_week
         , subq_1.company__ds__extract_day
-        , subq_1.company__ds__extract_dayofweek
-        , subq_1.company__ds__extract_dayofyear
+        , subq_1.company__ds__extract_dow
+        , subq_1.company__ds__extract_doy
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_1.metric_time__extract_month
         , subq_1.metric_time__extract_week
         , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dayofweek
-        , subq_1.metric_time__extract_dayofyear
+        , subq_1.metric_time__extract_dow
+        , subq_1.metric_time__extract_doy
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -68,8 +68,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.company__ds__extract_month
           , subq_0.company__ds__extract_week
           , subq_0.company__ds__extract_day
-          , subq_0.company__ds__extract_dayofweek
-          , subq_0.company__ds__extract_dayofyear
+          , subq_0.company__ds__extract_dow
+          , subq_0.company__ds__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
@@ -106,25 +106,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql
index 3d88c96009..5b4011175d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -266,8 +266,8 @@ FROM (
             , subq_5.ds__extract_month
             , subq_5.ds__extract_week
             , subq_5.ds__extract_day
-            , subq_5.ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear
+            , subq_5.ds__extract_dow
+            , subq_5.ds__extract_doy
             , subq_5.ds_partitioned__day
             , subq_5.ds_partitioned__week
             , subq_5.ds_partitioned__month
@@ -278,8 +278,8 @@ FROM (
             , subq_5.ds_partitioned__extract_month
             , subq_5.ds_partitioned__extract_week
             , subq_5.ds_partitioned__extract_day
-            , subq_5.ds_partitioned__extract_dayofweek
-            , subq_5.ds_partitioned__extract_dayofyear
+            , subq_5.ds_partitioned__extract_dow
+            , subq_5.ds_partitioned__extract_doy
             , subq_5.paid_at__day
             , subq_5.paid_at__week
             , subq_5.paid_at__month
@@ -290,8 +290,8 @@ FROM (
             , subq_5.paid_at__extract_month
             , subq_5.paid_at__extract_week
             , subq_5.paid_at__extract_day
-            , subq_5.paid_at__extract_dayofweek
-            , subq_5.paid_at__extract_dayofyear
+            , subq_5.paid_at__extract_dow
+            , subq_5.paid_at__extract_doy
             , subq_5.booking__ds__day
             , subq_5.booking__ds__week
             , subq_5.booking__ds__month
@@ -302,8 +302,8 @@ FROM (
             , subq_5.booking__ds__extract_month
             , subq_5.booking__ds__extract_week
             , subq_5.booking__ds__extract_day
-            , subq_5.booking__ds__extract_dayofweek
-            , subq_5.booking__ds__extract_dayofyear
+            , subq_5.booking__ds__extract_dow
+            , subq_5.booking__ds__extract_doy
             , subq_5.booking__ds_partitioned__day
             , subq_5.booking__ds_partitioned__week
             , subq_5.booking__ds_partitioned__month
@@ -314,8 +314,8 @@ FROM (
             , subq_5.booking__ds_partitioned__extract_month
             , subq_5.booking__ds_partitioned__extract_week
             , subq_5.booking__ds_partitioned__extract_day
-            , subq_5.booking__ds_partitioned__extract_dayofweek
-            , subq_5.booking__ds_partitioned__extract_dayofyear
+            , subq_5.booking__ds_partitioned__extract_dow
+            , subq_5.booking__ds_partitioned__extract_doy
             , subq_5.booking__paid_at__day
             , subq_5.booking__paid_at__week
             , subq_5.booking__paid_at__month
@@ -326,8 +326,8 @@ FROM (
             , subq_5.booking__paid_at__extract_month
             , subq_5.booking__paid_at__extract_week
             , subq_5.booking__paid_at__extract_day
-            , subq_5.booking__paid_at__extract_dayofweek
-            , subq_5.booking__paid_at__extract_dayofyear
+            , subq_5.booking__paid_at__extract_dow
+            , subq_5.booking__paid_at__extract_doy
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -338,8 +338,8 @@ FROM (
             , subq_5.ds__extract_month AS metric_time__extract_month
             , subq_5.ds__extract_week AS metric_time__extract_week
             , subq_5.ds__extract_day AS metric_time__extract_day
-            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_5.ds__extract_dow AS metric_time__extract_dow
+            , subq_5.ds__extract_doy AS metric_time__extract_doy
             , subq_5.listing
             , subq_5.guest
             , subq_5.host
@@ -384,74 +384,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
index e2ff275b47..d11a69936d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 13d462ce84..b98d6d0f3d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
index e3607ad97a..9139bc862d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 71e89d4432..0022a4f526 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 9967c13e88..10bb6c0450 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -38,8 +38,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -50,8 +50,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -62,8 +62,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -74,8 +74,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -86,8 +86,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -98,8 +98,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -140,8 +140,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -152,8 +152,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -164,8 +164,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -176,8 +176,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -188,8 +188,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -200,8 +200,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -212,8 +212,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -258,74 +258,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -373,8 +373,8 @@ FROM (
             , subq_9.ds__extract_month AS ds__extract_month
             , subq_9.ds__extract_week AS ds__extract_week
             , subq_9.ds__extract_day AS ds__extract_day
-            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_9.ds__extract_dow AS ds__extract_dow
+            , subq_9.ds__extract_doy AS ds__extract_doy
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
@@ -385,8 +385,8 @@ FROM (
             , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_9.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_9.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
@@ -397,8 +397,8 @@ FROM (
             , subq_9.paid_at__extract_month AS paid_at__extract_month
             , subq_9.paid_at__extract_week AS paid_at__extract_week
             , subq_9.paid_at__extract_day AS paid_at__extract_day
-            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_9.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_9.paid_at__extract_doy AS paid_at__extract_doy
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
@@ -409,8 +409,8 @@ FROM (
             , subq_9.booking__ds__extract_month AS booking__ds__extract_month
             , subq_9.booking__ds__extract_week AS booking__ds__extract_week
             , subq_9.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_9.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_9.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -421,8 +421,8 @@ FROM (
             , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_9.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_9.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
@@ -433,8 +433,8 @@ FROM (
             , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_9.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_9.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -475,8 +475,8 @@ FROM (
               , subq_8.ds__extract_month
               , subq_8.ds__extract_week
               , subq_8.ds__extract_day
-              , subq_8.ds__extract_dayofweek
-              , subq_8.ds__extract_dayofyear
+              , subq_8.ds__extract_dow
+              , subq_8.ds__extract_doy
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
@@ -487,8 +487,8 @@ FROM (
               , subq_8.ds_partitioned__extract_month
               , subq_8.ds_partitioned__extract_week
               , subq_8.ds_partitioned__extract_day
-              , subq_8.ds_partitioned__extract_dayofweek
-              , subq_8.ds_partitioned__extract_dayofyear
+              , subq_8.ds_partitioned__extract_dow
+              , subq_8.ds_partitioned__extract_doy
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
@@ -499,8 +499,8 @@ FROM (
               , subq_8.paid_at__extract_month
               , subq_8.paid_at__extract_week
               , subq_8.paid_at__extract_day
-              , subq_8.paid_at__extract_dayofweek
-              , subq_8.paid_at__extract_dayofyear
+              , subq_8.paid_at__extract_dow
+              , subq_8.paid_at__extract_doy
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
@@ -511,8 +511,8 @@ FROM (
               , subq_8.booking__ds__extract_month
               , subq_8.booking__ds__extract_week
               , subq_8.booking__ds__extract_day
-              , subq_8.booking__ds__extract_dayofweek
-              , subq_8.booking__ds__extract_dayofyear
+              , subq_8.booking__ds__extract_dow
+              , subq_8.booking__ds__extract_doy
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
@@ -523,8 +523,8 @@ FROM (
               , subq_8.booking__ds_partitioned__extract_month
               , subq_8.booking__ds_partitioned__extract_week
               , subq_8.booking__ds_partitioned__extract_day
-              , subq_8.booking__ds_partitioned__extract_dayofweek
-              , subq_8.booking__ds_partitioned__extract_dayofyear
+              , subq_8.booking__ds_partitioned__extract_dow
+              , subq_8.booking__ds_partitioned__extract_doy
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
@@ -535,8 +535,8 @@ FROM (
               , subq_8.booking__paid_at__extract_month
               , subq_8.booking__paid_at__extract_week
               , subq_8.booking__paid_at__extract_day
-              , subq_8.booking__paid_at__extract_dayofweek
-              , subq_8.booking__paid_at__extract_dayofyear
+              , subq_8.booking__paid_at__extract_dow
+              , subq_8.booking__paid_at__extract_doy
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -547,8 +547,8 @@ FROM (
               , subq_8.ds__extract_month AS metric_time__extract_month
               , subq_8.ds__extract_week AS metric_time__extract_week
               , subq_8.ds__extract_day AS metric_time__extract_day
-              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_8.ds__extract_dow AS metric_time__extract_dow
+              , subq_8.ds__extract_doy AS metric_time__extract_doy
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
@@ -593,74 +593,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index b76e01d113..1aaa96b40a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -38,8 +38,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -50,8 +50,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -62,8 +62,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -74,8 +74,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -86,8 +86,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -98,8 +98,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -140,8 +140,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -152,8 +152,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -164,8 +164,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -176,8 +176,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -188,8 +188,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -200,8 +200,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -212,8 +212,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -258,74 +258,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -374,8 +374,8 @@ FROM (
             , subq_9.ds__extract_month AS ds__extract_month
             , subq_9.ds__extract_week AS ds__extract_week
             , subq_9.ds__extract_day AS ds__extract_day
-            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_9.ds__extract_dow AS ds__extract_dow
+            , subq_9.ds__extract_doy AS ds__extract_doy
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
@@ -386,8 +386,8 @@ FROM (
             , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_9.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_9.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
@@ -398,8 +398,8 @@ FROM (
             , subq_9.paid_at__extract_month AS paid_at__extract_month
             , subq_9.paid_at__extract_week AS paid_at__extract_week
             , subq_9.paid_at__extract_day AS paid_at__extract_day
-            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_9.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_9.paid_at__extract_doy AS paid_at__extract_doy
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
@@ -410,8 +410,8 @@ FROM (
             , subq_9.booking__ds__extract_month AS booking__ds__extract_month
             , subq_9.booking__ds__extract_week AS booking__ds__extract_week
             , subq_9.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_9.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_9.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -422,8 +422,8 @@ FROM (
             , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_9.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_9.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
@@ -434,8 +434,8 @@ FROM (
             , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_9.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_9.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -476,8 +476,8 @@ FROM (
               , subq_8.ds__extract_month
               , subq_8.ds__extract_week
               , subq_8.ds__extract_day
-              , subq_8.ds__extract_dayofweek
-              , subq_8.ds__extract_dayofyear
+              , subq_8.ds__extract_dow
+              , subq_8.ds__extract_doy
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
@@ -488,8 +488,8 @@ FROM (
               , subq_8.ds_partitioned__extract_month
               , subq_8.ds_partitioned__extract_week
               , subq_8.ds_partitioned__extract_day
-              , subq_8.ds_partitioned__extract_dayofweek
-              , subq_8.ds_partitioned__extract_dayofyear
+              , subq_8.ds_partitioned__extract_dow
+              , subq_8.ds_partitioned__extract_doy
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
@@ -500,8 +500,8 @@ FROM (
               , subq_8.paid_at__extract_month
               , subq_8.paid_at__extract_week
               , subq_8.paid_at__extract_day
-              , subq_8.paid_at__extract_dayofweek
-              , subq_8.paid_at__extract_dayofyear
+              , subq_8.paid_at__extract_dow
+              , subq_8.paid_at__extract_doy
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
@@ -512,8 +512,8 @@ FROM (
               , subq_8.booking__ds__extract_month
               , subq_8.booking__ds__extract_week
               , subq_8.booking__ds__extract_day
-              , subq_8.booking__ds__extract_dayofweek
-              , subq_8.booking__ds__extract_dayofyear
+              , subq_8.booking__ds__extract_dow
+              , subq_8.booking__ds__extract_doy
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
@@ -524,8 +524,8 @@ FROM (
               , subq_8.booking__ds_partitioned__extract_month
               , subq_8.booking__ds_partitioned__extract_week
               , subq_8.booking__ds_partitioned__extract_day
-              , subq_8.booking__ds_partitioned__extract_dayofweek
-              , subq_8.booking__ds_partitioned__extract_dayofyear
+              , subq_8.booking__ds_partitioned__extract_dow
+              , subq_8.booking__ds_partitioned__extract_doy
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
@@ -536,8 +536,8 @@ FROM (
               , subq_8.booking__paid_at__extract_month
               , subq_8.booking__paid_at__extract_week
               , subq_8.booking__paid_at__extract_day
-              , subq_8.booking__paid_at__extract_dayofweek
-              , subq_8.booking__paid_at__extract_dayofyear
+              , subq_8.booking__paid_at__extract_dow
+              , subq_8.booking__paid_at__extract_doy
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -548,8 +548,8 @@ FROM (
               , subq_8.ds__extract_month AS metric_time__extract_month
               , subq_8.ds__extract_week AS metric_time__extract_week
               , subq_8.ds__extract_day AS metric_time__extract_day
-              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_8.ds__extract_dow AS metric_time__extract_dow
+              , subq_8.ds__extract_doy AS metric_time__extract_doy
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
@@ -594,74 +594,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
index 615aae3ac7..3107752f3d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_4.ds__extract_month AS ds__extract_month
           , subq_4.ds__extract_week AS ds__extract_week
           , subq_4.ds__extract_day AS ds__extract_day
-          , subq_4.ds__extract_dayofweek AS ds__extract_dayofweek
-          , subq_4.ds__extract_dayofyear AS ds__extract_dayofyear
+          , subq_4.ds__extract_dow AS ds__extract_dow
+          , subq_4.ds__extract_doy AS ds__extract_doy
           , subq_4.ds_partitioned__day AS ds_partitioned__day
           , subq_4.ds_partitioned__week AS ds_partitioned__week
           , subq_4.ds_partitioned__month AS ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_4.ds_partitioned__extract_month AS ds_partitioned__extract_month
           , subq_4.ds_partitioned__extract_week AS ds_partitioned__extract_week
           , subq_4.ds_partitioned__extract_day AS ds_partitioned__extract_day
-          , subq_4.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-          , subq_4.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+          , subq_4.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+          , subq_4.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
           , subq_4.paid_at__day AS paid_at__day
           , subq_4.paid_at__week AS paid_at__week
           , subq_4.paid_at__month AS paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_4.paid_at__extract_month AS paid_at__extract_month
           , subq_4.paid_at__extract_week AS paid_at__extract_week
           , subq_4.paid_at__extract_day AS paid_at__extract_day
-          , subq_4.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-          , subq_4.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+          , subq_4.paid_at__extract_dow AS paid_at__extract_dow
+          , subq_4.paid_at__extract_doy AS paid_at__extract_doy
           , subq_4.booking__ds__day AS booking__ds__day
           , subq_4.booking__ds__week AS booking__ds__week
           , subq_4.booking__ds__month AS booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_4.booking__ds__extract_month AS booking__ds__extract_month
           , subq_4.booking__ds__extract_week AS booking__ds__extract_week
           , subq_4.booking__ds__extract_day AS booking__ds__extract_day
-          , subq_4.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-          , subq_4.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+          , subq_4.booking__ds__extract_dow AS booking__ds__extract_dow
+          , subq_4.booking__ds__extract_doy AS booking__ds__extract_doy
           , subq_4.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_4.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_4.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_4.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
           , subq_4.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
           , subq_4.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-          , subq_4.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-          , subq_4.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+          , subq_4.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+          , subq_4.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
           , subq_4.booking__paid_at__day AS booking__paid_at__day
           , subq_4.booking__paid_at__week AS booking__paid_at__week
           , subq_4.booking__paid_at__month AS booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_4.booking__paid_at__extract_month AS booking__paid_at__extract_month
           , subq_4.booking__paid_at__extract_week AS booking__paid_at__extract_week
           , subq_4.booking__paid_at__extract_day AS booking__paid_at__extract_day
-          , subq_4.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-          , subq_4.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+          , subq_4.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+          , subq_4.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
           , subq_4.listing AS listing
           , subq_4.guest AS guest
           , subq_4.host AS host
@@ -135,8 +135,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -147,8 +147,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -159,8 +159,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -171,8 +171,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -183,8 +183,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -195,8 +195,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.metric_time__week AS metric_time__week
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
@@ -206,8 +206,8 @@ FROM (
             , subq_1.metric_time__extract_month AS metric_time__extract_month
             , subq_1.metric_time__extract_week AS metric_time__extract_week
             , subq_1.metric_time__extract_day AS metric_time__extract_day
-            , subq_1.metric_time__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_1.metric_time__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_1.metric_time__extract_dow AS metric_time__extract_dow
+            , subq_1.metric_time__extract_doy AS metric_time__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -248,8 +248,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -260,8 +260,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -272,8 +272,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -284,8 +284,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -296,8 +296,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -308,8 +308,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -320,8 +320,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -366,74 +366,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 6f115474ac..666e2d3376 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_1.ds__extract_month AS ds__extract_month
           , subq_1.ds__extract_week AS ds__extract_week
           , subq_1.ds__extract_day AS ds__extract_day
-          , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-          , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+          , subq_1.ds__extract_dow AS ds__extract_dow
+          , subq_1.ds__extract_doy AS ds__extract_doy
           , subq_1.ds_partitioned__day AS ds_partitioned__day
           , subq_1.ds_partitioned__week AS ds_partitioned__week
           , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
           , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
           , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-          , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-          , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+          , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+          , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
           , subq_1.paid_at__day AS paid_at__day
           , subq_1.paid_at__week AS paid_at__week
           , subq_1.paid_at__month AS paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_1.paid_at__extract_month AS paid_at__extract_month
           , subq_1.paid_at__extract_week AS paid_at__extract_week
           , subq_1.paid_at__extract_day AS paid_at__extract_day
-          , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-          , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+          , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+          , subq_1.paid_at__extract_doy AS paid_at__extract_doy
           , subq_1.booking__ds__day AS booking__ds__day
           , subq_1.booking__ds__week AS booking__ds__week
           , subq_1.booking__ds__month AS booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_1.booking__ds__extract_month AS booking__ds__extract_month
           , subq_1.booking__ds__extract_week AS booking__ds__extract_week
           , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-          , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-          , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+          , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+          , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
           , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
           , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
           , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-          , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-          , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+          , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+          , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
           , subq_1.booking__paid_at__day AS booking__paid_at__day
           , subq_1.booking__paid_at__week AS booking__paid_at__week
           , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
           , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
           , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-          , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-          , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+          , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+          , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
           , subq_1.listing AS listing
           , subq_1.guest AS guest
           , subq_1.host AS host
@@ -134,8 +134,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -146,8 +146,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -158,8 +158,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -170,8 +170,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -182,8 +182,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -194,8 +194,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -206,8 +206,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -252,74 +252,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql
index 693e200db3..40f6785af3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_distinct_values__plan0.sql
@@ -47,8 +47,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -59,8 +59,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -71,8 +71,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -83,8 +83,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -95,8 +95,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -107,8 +107,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -119,8 +119,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -165,74 +165,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -262,8 +262,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -274,8 +274,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -286,8 +286,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -298,8 +298,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -310,8 +310,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -335,25 +335,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -362,25 +362,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql
index 00efad0383..a43457fcbd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_node__plan0.sql
@@ -25,74 +25,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql
index 7e0fdff19e..a3ce23fb89 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_node__plan0.sql
@@ -31,74 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 1a6844636c..70919d8caa 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -53,8 +53,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -65,8 +65,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -77,8 +77,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -89,8 +89,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -101,8 +101,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -113,8 +113,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -125,8 +125,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -171,74 +171,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -268,8 +268,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -280,8 +280,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -292,8 +292,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -304,8 +304,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -316,8 +316,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -341,25 +341,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -368,25 +368,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
index 5712e1d25c..6e4488a729 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_scd_dimension__plan0.sql
@@ -55,8 +55,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -67,8 +67,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -79,8 +79,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -91,8 +91,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -103,8 +103,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -115,8 +115,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -127,8 +127,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -159,74 +159,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -255,25 +255,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_from) AS window_start__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_from) AS window_start__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_from) AS window_start__extract_doy
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_to) AS window_end__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_to) AS window_end__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_to) AS window_end__extract_doy
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -282,25 +282,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 141c4fba09..9f23719b49 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
index a2adc126d3..1c6b0467ff 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
index 7c85ab1cdb..2093e49b0b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql
index e89a957806..eb506ddf59 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_limit_rows__plan0.sql
@@ -31,8 +31,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -43,8 +43,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -55,8 +55,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -67,8 +67,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -79,8 +79,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -91,8 +91,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -103,8 +103,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -149,74 +149,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
index 436f0e7545..d5688f0e2d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_local_dimension_using_local_entity__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.created_at__day
         , subq_0.created_at__week
         , subq_0.created_at__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.created_at__extract_month
         , subq_0.created_at__extract_week
         , subq_0.created_at__extract_day
-        , subq_0.created_at__extract_dayofweek
-        , subq_0.created_at__extract_dayofyear
+        , subq_0.created_at__extract_dow
+        , subq_0.created_at__extract_doy
         , subq_0.listing__ds__day
         , subq_0.listing__ds__week
         , subq_0.listing__ds__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.listing__ds__extract_month
         , subq_0.listing__ds__extract_week
         , subq_0.listing__ds__extract_day
-        , subq_0.listing__ds__extract_dayofweek
-        , subq_0.listing__ds__extract_dayofyear
+        , subq_0.listing__ds__extract_dow
+        , subq_0.listing__ds__extract_doy
         , subq_0.listing__created_at__day
         , subq_0.listing__created_at__week
         , subq_0.listing__created_at__month
@@ -62,8 +62,8 @@ FROM (
         , subq_0.listing__created_at__extract_month
         , subq_0.listing__created_at__extract_week
         , subq_0.listing__created_at__extract_day
-        , subq_0.listing__created_at__extract_dayofweek
-        , subq_0.listing__created_at__extract_dayofyear
+        , subq_0.listing__created_at__extract_dow
+        , subq_0.listing__created_at__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -74,8 +74,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.listing
         , subq_0.user
         , subq_0.listing__user
@@ -99,25 +99,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -126,25 +126,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql
index b05da97264..dbfcb34b94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_aggregation_node__plan0.sql
@@ -35,74 +35,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql
index 9223eebd6e..e5349b0d17 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint__plan0.sql
@@ -65,8 +65,8 @@ FROM (
                     , subq_0.ds__extract_month
                     , subq_0.ds__extract_week
                     , subq_0.ds__extract_day
-                    , subq_0.ds__extract_dayofweek
-                    , subq_0.ds__extract_dayofyear
+                    , subq_0.ds__extract_dow
+                    , subq_0.ds__extract_doy
                     , subq_0.ds_partitioned__day
                     , subq_0.ds_partitioned__week
                     , subq_0.ds_partitioned__month
@@ -77,8 +77,8 @@ FROM (
                     , subq_0.ds_partitioned__extract_month
                     , subq_0.ds_partitioned__extract_week
                     , subq_0.ds_partitioned__extract_day
-                    , subq_0.ds_partitioned__extract_dayofweek
-                    , subq_0.ds_partitioned__extract_dayofyear
+                    , subq_0.ds_partitioned__extract_dow
+                    , subq_0.ds_partitioned__extract_doy
                     , subq_0.paid_at__day
                     , subq_0.paid_at__week
                     , subq_0.paid_at__month
@@ -89,8 +89,8 @@ FROM (
                     , subq_0.paid_at__extract_month
                     , subq_0.paid_at__extract_week
                     , subq_0.paid_at__extract_day
-                    , subq_0.paid_at__extract_dayofweek
-                    , subq_0.paid_at__extract_dayofyear
+                    , subq_0.paid_at__extract_dow
+                    , subq_0.paid_at__extract_doy
                     , subq_0.booking__ds__day
                     , subq_0.booking__ds__week
                     , subq_0.booking__ds__month
@@ -101,8 +101,8 @@ FROM (
                     , subq_0.booking__ds__extract_month
                     , subq_0.booking__ds__extract_week
                     , subq_0.booking__ds__extract_day
-                    , subq_0.booking__ds__extract_dayofweek
-                    , subq_0.booking__ds__extract_dayofyear
+                    , subq_0.booking__ds__extract_dow
+                    , subq_0.booking__ds__extract_doy
                     , subq_0.booking__ds_partitioned__day
                     , subq_0.booking__ds_partitioned__week
                     , subq_0.booking__ds_partitioned__month
@@ -113,8 +113,8 @@ FROM (
                     , subq_0.booking__ds_partitioned__extract_month
                     , subq_0.booking__ds_partitioned__extract_week
                     , subq_0.booking__ds_partitioned__extract_day
-                    , subq_0.booking__ds_partitioned__extract_dayofweek
-                    , subq_0.booking__ds_partitioned__extract_dayofyear
+                    , subq_0.booking__ds_partitioned__extract_dow
+                    , subq_0.booking__ds_partitioned__extract_doy
                     , subq_0.booking__paid_at__day
                     , subq_0.booking__paid_at__week
                     , subq_0.booking__paid_at__month
@@ -125,8 +125,8 @@ FROM (
                     , subq_0.booking__paid_at__extract_month
                     , subq_0.booking__paid_at__extract_week
                     , subq_0.booking__paid_at__extract_day
-                    , subq_0.booking__paid_at__extract_dayofweek
-                    , subq_0.booking__paid_at__extract_dayofyear
+                    , subq_0.booking__paid_at__extract_dow
+                    , subq_0.booking__paid_at__extract_doy
                     , subq_0.ds__day AS metric_time__day
                     , subq_0.ds__week AS metric_time__week
                     , subq_0.ds__month AS metric_time__month
@@ -137,8 +137,8 @@ FROM (
                     , subq_0.ds__extract_month AS metric_time__extract_month
                     , subq_0.ds__extract_week AS metric_time__extract_week
                     , subq_0.ds__extract_day AS metric_time__extract_day
-                    , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_0.ds__extract_dow AS metric_time__extract_dow
+                    , subq_0.ds__extract_doy AS metric_time__extract_doy
                     , subq_0.listing
                     , subq_0.guest
                     , subq_0.host
@@ -183,74 +183,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -280,8 +280,8 @@ FROM (
                     , subq_3.ds__extract_month
                     , subq_3.ds__extract_week
                     , subq_3.ds__extract_day
-                    , subq_3.ds__extract_dayofweek
-                    , subq_3.ds__extract_dayofyear
+                    , subq_3.ds__extract_dow
+                    , subq_3.ds__extract_doy
                     , subq_3.created_at__day
                     , subq_3.created_at__week
                     , subq_3.created_at__month
@@ -292,8 +292,8 @@ FROM (
                     , subq_3.created_at__extract_month
                     , subq_3.created_at__extract_week
                     , subq_3.created_at__extract_day
-                    , subq_3.created_at__extract_dayofweek
-                    , subq_3.created_at__extract_dayofyear
+                    , subq_3.created_at__extract_dow
+                    , subq_3.created_at__extract_doy
                     , subq_3.listing__ds__day
                     , subq_3.listing__ds__week
                     , subq_3.listing__ds__month
@@ -304,8 +304,8 @@ FROM (
                     , subq_3.listing__ds__extract_month
                     , subq_3.listing__ds__extract_week
                     , subq_3.listing__ds__extract_day
-                    , subq_3.listing__ds__extract_dayofweek
-                    , subq_3.listing__ds__extract_dayofyear
+                    , subq_3.listing__ds__extract_dow
+                    , subq_3.listing__ds__extract_doy
                     , subq_3.listing__created_at__day
                     , subq_3.listing__created_at__week
                     , subq_3.listing__created_at__month
@@ -316,8 +316,8 @@ FROM (
                     , subq_3.listing__created_at__extract_month
                     , subq_3.listing__created_at__extract_week
                     , subq_3.listing__created_at__extract_day
-                    , subq_3.listing__created_at__extract_dayofweek
-                    , subq_3.listing__created_at__extract_dayofyear
+                    , subq_3.listing__created_at__extract_dow
+                    , subq_3.listing__created_at__extract_doy
                     , subq_3.ds__day AS metric_time__day
                     , subq_3.ds__week AS metric_time__week
                     , subq_3.ds__month AS metric_time__month
@@ -328,8 +328,8 @@ FROM (
                     , subq_3.ds__extract_month AS metric_time__extract_month
                     , subq_3.ds__extract_week AS metric_time__extract_week
                     , subq_3.ds__extract_day AS metric_time__extract_day
-                    , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_3.ds__extract_dow AS metric_time__extract_dow
+                    , subq_3.ds__extract_doy AS metric_time__extract_doy
                     , subq_3.listing
                     , subq_3.user
                     , subq_3.listing__user
@@ -353,25 +353,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -380,25 +380,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -476,8 +476,8 @@ FROM (
                     , subq_12.ds__extract_month
                     , subq_12.ds__extract_week
                     , subq_12.ds__extract_day
-                    , subq_12.ds__extract_dayofweek
-                    , subq_12.ds__extract_dayofyear
+                    , subq_12.ds__extract_dow
+                    , subq_12.ds__extract_doy
                     , subq_12.ds_partitioned__day
                     , subq_12.ds_partitioned__week
                     , subq_12.ds_partitioned__month
@@ -488,8 +488,8 @@ FROM (
                     , subq_12.ds_partitioned__extract_month
                     , subq_12.ds_partitioned__extract_week
                     , subq_12.ds_partitioned__extract_day
-                    , subq_12.ds_partitioned__extract_dayofweek
-                    , subq_12.ds_partitioned__extract_dayofyear
+                    , subq_12.ds_partitioned__extract_dow
+                    , subq_12.ds_partitioned__extract_doy
                     , subq_12.paid_at__day
                     , subq_12.paid_at__week
                     , subq_12.paid_at__month
@@ -500,8 +500,8 @@ FROM (
                     , subq_12.paid_at__extract_month
                     , subq_12.paid_at__extract_week
                     , subq_12.paid_at__extract_day
-                    , subq_12.paid_at__extract_dayofweek
-                    , subq_12.paid_at__extract_dayofyear
+                    , subq_12.paid_at__extract_dow
+                    , subq_12.paid_at__extract_doy
                     , subq_12.booking__ds__day
                     , subq_12.booking__ds__week
                     , subq_12.booking__ds__month
@@ -512,8 +512,8 @@ FROM (
                     , subq_12.booking__ds__extract_month
                     , subq_12.booking__ds__extract_week
                     , subq_12.booking__ds__extract_day
-                    , subq_12.booking__ds__extract_dayofweek
-                    , subq_12.booking__ds__extract_dayofyear
+                    , subq_12.booking__ds__extract_dow
+                    , subq_12.booking__ds__extract_doy
                     , subq_12.booking__ds_partitioned__day
                     , subq_12.booking__ds_partitioned__week
                     , subq_12.booking__ds_partitioned__month
@@ -524,8 +524,8 @@ FROM (
                     , subq_12.booking__ds_partitioned__extract_month
                     , subq_12.booking__ds_partitioned__extract_week
                     , subq_12.booking__ds_partitioned__extract_day
-                    , subq_12.booking__ds_partitioned__extract_dayofweek
-                    , subq_12.booking__ds_partitioned__extract_dayofyear
+                    , subq_12.booking__ds_partitioned__extract_dow
+                    , subq_12.booking__ds_partitioned__extract_doy
                     , subq_12.booking__paid_at__day
                     , subq_12.booking__paid_at__week
                     , subq_12.booking__paid_at__month
@@ -536,8 +536,8 @@ FROM (
                     , subq_12.booking__paid_at__extract_month
                     , subq_12.booking__paid_at__extract_week
                     , subq_12.booking__paid_at__extract_day
-                    , subq_12.booking__paid_at__extract_dayofweek
-                    , subq_12.booking__paid_at__extract_dayofyear
+                    , subq_12.booking__paid_at__extract_dow
+                    , subq_12.booking__paid_at__extract_doy
                     , subq_12.ds__day AS metric_time__day
                     , subq_12.ds__week AS metric_time__week
                     , subq_12.ds__month AS metric_time__month
@@ -548,8 +548,8 @@ FROM (
                     , subq_12.ds__extract_month AS metric_time__extract_month
                     , subq_12.ds__extract_week AS metric_time__extract_week
                     , subq_12.ds__extract_day AS metric_time__extract_day
-                    , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_12.ds__extract_dow AS metric_time__extract_dow
+                    , subq_12.ds__extract_doy AS metric_time__extract_doy
                     , subq_12.listing
                     , subq_12.guest
                     , subq_12.host
@@ -594,74 +594,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -691,8 +691,8 @@ FROM (
                     , subq_15.ds__extract_month
                     , subq_15.ds__extract_week
                     , subq_15.ds__extract_day
-                    , subq_15.ds__extract_dayofweek
-                    , subq_15.ds__extract_dayofyear
+                    , subq_15.ds__extract_dow
+                    , subq_15.ds__extract_doy
                     , subq_15.created_at__day
                     , subq_15.created_at__week
                     , subq_15.created_at__month
@@ -703,8 +703,8 @@ FROM (
                     , subq_15.created_at__extract_month
                     , subq_15.created_at__extract_week
                     , subq_15.created_at__extract_day
-                    , subq_15.created_at__extract_dayofweek
-                    , subq_15.created_at__extract_dayofyear
+                    , subq_15.created_at__extract_dow
+                    , subq_15.created_at__extract_doy
                     , subq_15.listing__ds__day
                     , subq_15.listing__ds__week
                     , subq_15.listing__ds__month
@@ -715,8 +715,8 @@ FROM (
                     , subq_15.listing__ds__extract_month
                     , subq_15.listing__ds__extract_week
                     , subq_15.listing__ds__extract_day
-                    , subq_15.listing__ds__extract_dayofweek
-                    , subq_15.listing__ds__extract_dayofyear
+                    , subq_15.listing__ds__extract_dow
+                    , subq_15.listing__ds__extract_doy
                     , subq_15.listing__created_at__day
                     , subq_15.listing__created_at__week
                     , subq_15.listing__created_at__month
@@ -727,8 +727,8 @@ FROM (
                     , subq_15.listing__created_at__extract_month
                     , subq_15.listing__created_at__extract_week
                     , subq_15.listing__created_at__extract_day
-                    , subq_15.listing__created_at__extract_dayofweek
-                    , subq_15.listing__created_at__extract_dayofyear
+                    , subq_15.listing__created_at__extract_dow
+                    , subq_15.listing__created_at__extract_doy
                     , subq_15.ds__day AS metric_time__day
                     , subq_15.ds__week AS metric_time__week
                     , subq_15.ds__month AS metric_time__month
@@ -739,8 +739,8 @@ FROM (
                     , subq_15.ds__extract_month AS metric_time__extract_month
                     , subq_15.ds__extract_week AS metric_time__extract_week
                     , subq_15.ds__extract_day AS metric_time__extract_day
-                    , subq_15.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_15.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_15.ds__extract_dow AS metric_time__extract_dow
+                    , subq_15.ds__extract_doy AS metric_time__extract_doy
                     , subq_15.listing
                     , subq_15.user
                     , subq_15.listing__user
@@ -764,25 +764,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -791,25 +791,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -870,8 +870,8 @@ FROM (
             , subq_24.ds__extract_month
             , subq_24.ds__extract_week
             , subq_24.ds__extract_day
-            , subq_24.ds__extract_dayofweek
-            , subq_24.ds__extract_dayofyear
+            , subq_24.ds__extract_dow
+            , subq_24.ds__extract_doy
             , subq_24.ds_partitioned__day
             , subq_24.ds_partitioned__week
             , subq_24.ds_partitioned__month
@@ -882,8 +882,8 @@ FROM (
             , subq_24.ds_partitioned__extract_month
             , subq_24.ds_partitioned__extract_week
             , subq_24.ds_partitioned__extract_day
-            , subq_24.ds_partitioned__extract_dayofweek
-            , subq_24.ds_partitioned__extract_dayofyear
+            , subq_24.ds_partitioned__extract_dow
+            , subq_24.ds_partitioned__extract_doy
             , subq_24.paid_at__day
             , subq_24.paid_at__week
             , subq_24.paid_at__month
@@ -894,8 +894,8 @@ FROM (
             , subq_24.paid_at__extract_month
             , subq_24.paid_at__extract_week
             , subq_24.paid_at__extract_day
-            , subq_24.paid_at__extract_dayofweek
-            , subq_24.paid_at__extract_dayofyear
+            , subq_24.paid_at__extract_dow
+            , subq_24.paid_at__extract_doy
             , subq_24.booking__ds__day
             , subq_24.booking__ds__week
             , subq_24.booking__ds__month
@@ -906,8 +906,8 @@ FROM (
             , subq_24.booking__ds__extract_month
             , subq_24.booking__ds__extract_week
             , subq_24.booking__ds__extract_day
-            , subq_24.booking__ds__extract_dayofweek
-            , subq_24.booking__ds__extract_dayofyear
+            , subq_24.booking__ds__extract_dow
+            , subq_24.booking__ds__extract_doy
             , subq_24.booking__ds_partitioned__day
             , subq_24.booking__ds_partitioned__week
             , subq_24.booking__ds_partitioned__month
@@ -918,8 +918,8 @@ FROM (
             , subq_24.booking__ds_partitioned__extract_month
             , subq_24.booking__ds_partitioned__extract_week
             , subq_24.booking__ds_partitioned__extract_day
-            , subq_24.booking__ds_partitioned__extract_dayofweek
-            , subq_24.booking__ds_partitioned__extract_dayofyear
+            , subq_24.booking__ds_partitioned__extract_dow
+            , subq_24.booking__ds_partitioned__extract_doy
             , subq_24.booking__paid_at__day
             , subq_24.booking__paid_at__week
             , subq_24.booking__paid_at__month
@@ -930,8 +930,8 @@ FROM (
             , subq_24.booking__paid_at__extract_month
             , subq_24.booking__paid_at__extract_week
             , subq_24.booking__paid_at__extract_day
-            , subq_24.booking__paid_at__extract_dayofweek
-            , subq_24.booking__paid_at__extract_dayofyear
+            , subq_24.booking__paid_at__extract_dow
+            , subq_24.booking__paid_at__extract_doy
             , subq_24.ds__day AS metric_time__day
             , subq_24.ds__week AS metric_time__week
             , subq_24.ds__month AS metric_time__month
@@ -942,8 +942,8 @@ FROM (
             , subq_24.ds__extract_month AS metric_time__extract_month
             , subq_24.ds__extract_week AS metric_time__extract_week
             , subq_24.ds__extract_day AS metric_time__extract_day
-            , subq_24.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_24.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_24.ds__extract_dow AS metric_time__extract_dow
+            , subq_24.ds__extract_doy AS metric_time__extract_doy
             , subq_24.listing
             , subq_24.guest
             , subq_24.host
@@ -988,74 +988,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
index 0512790e47..61d8df3842 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_reused_measure__plan0.sql
@@ -50,8 +50,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -62,8 +62,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -74,8 +74,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -86,8 +86,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -98,8 +98,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -110,8 +110,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -122,8 +122,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -168,74 +168,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -282,8 +282,8 @@ FROM (
             , subq_7.ds__extract_month
             , subq_7.ds__extract_week
             , subq_7.ds__extract_day
-            , subq_7.ds__extract_dayofweek
-            , subq_7.ds__extract_dayofyear
+            , subq_7.ds__extract_dow
+            , subq_7.ds__extract_doy
             , subq_7.ds_partitioned__day
             , subq_7.ds_partitioned__week
             , subq_7.ds_partitioned__month
@@ -294,8 +294,8 @@ FROM (
             , subq_7.ds_partitioned__extract_month
             , subq_7.ds_partitioned__extract_week
             , subq_7.ds_partitioned__extract_day
-            , subq_7.ds_partitioned__extract_dayofweek
-            , subq_7.ds_partitioned__extract_dayofyear
+            , subq_7.ds_partitioned__extract_dow
+            , subq_7.ds_partitioned__extract_doy
             , subq_7.paid_at__day
             , subq_7.paid_at__week
             , subq_7.paid_at__month
@@ -306,8 +306,8 @@ FROM (
             , subq_7.paid_at__extract_month
             , subq_7.paid_at__extract_week
             , subq_7.paid_at__extract_day
-            , subq_7.paid_at__extract_dayofweek
-            , subq_7.paid_at__extract_dayofyear
+            , subq_7.paid_at__extract_dow
+            , subq_7.paid_at__extract_doy
             , subq_7.booking__ds__day
             , subq_7.booking__ds__week
             , subq_7.booking__ds__month
@@ -318,8 +318,8 @@ FROM (
             , subq_7.booking__ds__extract_month
             , subq_7.booking__ds__extract_week
             , subq_7.booking__ds__extract_day
-            , subq_7.booking__ds__extract_dayofweek
-            , subq_7.booking__ds__extract_dayofyear
+            , subq_7.booking__ds__extract_dow
+            , subq_7.booking__ds__extract_doy
             , subq_7.booking__ds_partitioned__day
             , subq_7.booking__ds_partitioned__week
             , subq_7.booking__ds_partitioned__month
@@ -330,8 +330,8 @@ FROM (
             , subq_7.booking__ds_partitioned__extract_month
             , subq_7.booking__ds_partitioned__extract_week
             , subq_7.booking__ds_partitioned__extract_day
-            , subq_7.booking__ds_partitioned__extract_dayofweek
-            , subq_7.booking__ds_partitioned__extract_dayofyear
+            , subq_7.booking__ds_partitioned__extract_dow
+            , subq_7.booking__ds_partitioned__extract_doy
             , subq_7.booking__paid_at__day
             , subq_7.booking__paid_at__week
             , subq_7.booking__paid_at__month
@@ -342,8 +342,8 @@ FROM (
             , subq_7.booking__paid_at__extract_month
             , subq_7.booking__paid_at__extract_week
             , subq_7.booking__paid_at__extract_day
-            , subq_7.booking__paid_at__extract_dayofweek
-            , subq_7.booking__paid_at__extract_dayofyear
+            , subq_7.booking__paid_at__extract_dow
+            , subq_7.booking__paid_at__extract_doy
             , subq_7.ds__day AS metric_time__day
             , subq_7.ds__week AS metric_time__week
             , subq_7.ds__month AS metric_time__month
@@ -354,8 +354,8 @@ FROM (
             , subq_7.ds__extract_month AS metric_time__extract_month
             , subq_7.ds__extract_week AS metric_time__extract_week
             , subq_7.ds__extract_day AS metric_time__extract_day
-            , subq_7.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_7.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_7.ds__extract_dow AS metric_time__extract_dow
+            , subq_7.ds__extract_doy AS metric_time__extract_doy
             , subq_7.listing
             , subq_7.guest
             , subq_7.host
@@ -400,74 +400,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 2d8a10e755..bd41d48bd9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -44,8 +44,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -56,8 +56,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -68,8 +68,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -80,8 +80,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -92,8 +92,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -104,8 +104,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -116,8 +116,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -162,74 +162,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index f000943d3d..edfbb1483f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -32,8 +32,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -150,74 +150,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -256,8 +256,8 @@ FROM (
             , subq_5.ds__extract_month
             , subq_5.ds__extract_week
             , subq_5.ds__extract_day
-            , subq_5.ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear
+            , subq_5.ds__extract_dow
+            , subq_5.ds__extract_doy
             , subq_5.created_at__day
             , subq_5.created_at__week
             , subq_5.created_at__month
@@ -268,8 +268,8 @@ FROM (
             , subq_5.created_at__extract_month
             , subq_5.created_at__extract_week
             , subq_5.created_at__extract_day
-            , subq_5.created_at__extract_dayofweek
-            , subq_5.created_at__extract_dayofyear
+            , subq_5.created_at__extract_dow
+            , subq_5.created_at__extract_doy
             , subq_5.listing__ds__day
             , subq_5.listing__ds__week
             , subq_5.listing__ds__month
@@ -280,8 +280,8 @@ FROM (
             , subq_5.listing__ds__extract_month
             , subq_5.listing__ds__extract_week
             , subq_5.listing__ds__extract_day
-            , subq_5.listing__ds__extract_dayofweek
-            , subq_5.listing__ds__extract_dayofyear
+            , subq_5.listing__ds__extract_dow
+            , subq_5.listing__ds__extract_doy
             , subq_5.listing__created_at__day
             , subq_5.listing__created_at__week
             , subq_5.listing__created_at__month
@@ -292,8 +292,8 @@ FROM (
             , subq_5.listing__created_at__extract_month
             , subq_5.listing__created_at__extract_week
             , subq_5.listing__created_at__extract_day
-            , subq_5.listing__created_at__extract_dayofweek
-            , subq_5.listing__created_at__extract_dayofyear
+            , subq_5.listing__created_at__extract_dow
+            , subq_5.listing__created_at__extract_doy
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -304,8 +304,8 @@ FROM (
             , subq_5.ds__extract_month AS metric_time__extract_month
             , subq_5.ds__extract_week AS metric_time__extract_week
             , subq_5.ds__extract_day AS metric_time__extract_day
-            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_5.ds__extract_dow AS metric_time__extract_dow
+            , subq_5.ds__extract_doy AS metric_time__extract_doy
             , subq_5.listing
             , subq_5.user
             , subq_5.listing__user
@@ -329,25 +329,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -356,25 +356,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
index db50a9f2c8..d1740a6a39 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
@@ -45,8 +45,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -57,8 +57,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -69,8 +69,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -81,8 +81,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -93,8 +93,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -105,8 +105,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -117,8 +117,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -149,74 +149,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -250,8 +250,8 @@ FROM (
             , subq_3.window_start__extract_month AS window_start__extract_month
             , subq_3.window_start__extract_week AS window_start__extract_week
             , subq_3.window_start__extract_day AS window_start__extract_day
-            , subq_3.window_start__extract_dayofweek AS window_start__extract_dayofweek
-            , subq_3.window_start__extract_dayofyear AS window_start__extract_dayofyear
+            , subq_3.window_start__extract_dow AS window_start__extract_dow
+            , subq_3.window_start__extract_doy AS window_start__extract_doy
             , subq_3.window_end__day AS window_end__day
             , subq_3.window_end__week AS window_end__week
             , subq_3.window_end__month AS window_end__month
@@ -262,8 +262,8 @@ FROM (
             , subq_3.window_end__extract_month AS window_end__extract_month
             , subq_3.window_end__extract_week AS window_end__extract_week
             , subq_3.window_end__extract_day AS window_end__extract_day
-            , subq_3.window_end__extract_dayofweek AS window_end__extract_dayofweek
-            , subq_3.window_end__extract_dayofyear AS window_end__extract_dayofyear
+            , subq_3.window_end__extract_dow AS window_end__extract_dow
+            , subq_3.window_end__extract_doy AS window_end__extract_doy
             , subq_3.listing__window_start__day AS listing__window_start__day
             , subq_3.listing__window_start__week AS listing__window_start__week
             , subq_3.listing__window_start__month AS listing__window_start__month
@@ -274,8 +274,8 @@ FROM (
             , subq_3.listing__window_start__extract_month AS listing__window_start__extract_month
             , subq_3.listing__window_start__extract_week AS listing__window_start__extract_week
             , subq_3.listing__window_start__extract_day AS listing__window_start__extract_day
-            , subq_3.listing__window_start__extract_dayofweek AS listing__window_start__extract_dayofweek
-            , subq_3.listing__window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
+            , subq_3.listing__window_start__extract_dow AS listing__window_start__extract_dow
+            , subq_3.listing__window_start__extract_doy AS listing__window_start__extract_doy
             , subq_3.listing__window_end__day AS listing__window_end__day
             , subq_3.listing__window_end__week AS listing__window_end__week
             , subq_3.listing__window_end__month AS listing__window_end__month
@@ -286,8 +286,8 @@ FROM (
             , subq_3.listing__window_end__extract_month AS listing__window_end__extract_month
             , subq_3.listing__window_end__extract_week AS listing__window_end__extract_week
             , subq_3.listing__window_end__extract_day AS listing__window_end__extract_day
-            , subq_3.listing__window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
-            , subq_3.listing__window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
+            , subq_3.listing__window_end__extract_dow AS listing__window_end__extract_dow
+            , subq_3.listing__window_end__extract_doy AS listing__window_end__extract_doy
             , subq_5.ds__day AS user__ds__day
             , subq_5.ds__week AS user__ds__week
             , subq_5.ds__month AS user__ds__month
@@ -298,8 +298,8 @@ FROM (
             , subq_5.ds__extract_month AS user__ds__extract_month
             , subq_5.ds__extract_week AS user__ds__extract_week
             , subq_5.ds__extract_day AS user__ds__extract_day
-            , subq_5.ds__extract_dayofweek AS user__ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS user__ds__extract_dayofyear
+            , subq_5.ds__extract_dow AS user__ds__extract_dow
+            , subq_5.ds__extract_doy AS user__ds__extract_doy
             , subq_3.listing AS listing
             , subq_3.user AS user
             , subq_3.listing__user AS listing__user
@@ -318,25 +318,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_from) AS window_start__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_from) AS window_start__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_from) AS window_start__extract_doy
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_to) AS window_end__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_to) AS window_end__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_to) AS window_end__extract_doy
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -345,25 +345,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -412,8 +412,8 @@ FROM (
               , subq_4.ds__extract_month
               , subq_4.ds__extract_week
               , subq_4.ds__extract_day
-              , subq_4.ds__extract_dayofweek
-              , subq_4.ds__extract_dayofyear
+              , subq_4.ds__extract_dow
+              , subq_4.ds__extract_doy
               , subq_4.user__ds__day
               , subq_4.user__ds__week
               , subq_4.user__ds__month
@@ -424,8 +424,8 @@ FROM (
               , subq_4.user__ds__extract_month
               , subq_4.user__ds__extract_week
               , subq_4.user__ds__extract_day
-              , subq_4.user__ds__extract_dayofweek
-              , subq_4.user__ds__extract_dayofyear
+              , subq_4.user__ds__extract_dow
+              , subq_4.user__ds__extract_doy
               , subq_4.user
               , subq_4.home_state_latest
               , subq_4.user__home_state_latest
@@ -437,26 +437,26 @@ FROM (
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS ds__year
-                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM users_latest_src_10021.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM users_latest_src_10021.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM users_latest_src_10021.ds) AS ds__extract_month
+                , EXTRACT(week FROM users_latest_src_10021.ds) AS ds__extract_week
+                , EXTRACT(day FROM users_latest_src_10021.ds) AS ds__extract_day
+                , EXTRACT(dow FROM users_latest_src_10021.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM users_latest_src_10021.ds) AS ds__extract_doy
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC('week', users_latest_src_10021.ds) AS user__ds__week
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS user__ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS user__ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS user__ds__year
-                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS user__ds__extract_year
-                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
-                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS user__ds__extract_month
-                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
-                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS user__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_dayofyear
+                , EXTRACT(year FROM users_latest_src_10021.ds) AS user__ds__extract_year
+                , EXTRACT(quarter FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
+                , EXTRACT(month FROM users_latest_src_10021.ds) AS user__ds__extract_month
+                , EXTRACT(week FROM users_latest_src_10021.ds) AS user__ds__extract_week
+                , EXTRACT(day FROM users_latest_src_10021.ds) AS user__ds__extract_day
+                , EXTRACT(dow FROM users_latest_src_10021.ds) AS user__ds__extract_dow
+                , EXTRACT(doy FROM users_latest_src_10021.ds) AS user__ds__extract_doy
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
index adaf16cf58..8abc633b9a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
@@ -45,8 +45,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -57,8 +57,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -69,8 +69,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -81,8 +81,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -93,8 +93,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -105,8 +105,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -117,8 +117,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -149,74 +149,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -253,8 +253,8 @@ FROM (
             , subq_5.window_start__extract_month AS lux_listing__window_start__extract_month
             , subq_5.window_start__extract_week AS lux_listing__window_start__extract_week
             , subq_5.window_start__extract_day AS lux_listing__window_start__extract_day
-            , subq_5.window_start__extract_dayofweek AS lux_listing__window_start__extract_dayofweek
-            , subq_5.window_start__extract_dayofyear AS lux_listing__window_start__extract_dayofyear
+            , subq_5.window_start__extract_dow AS lux_listing__window_start__extract_dow
+            , subq_5.window_start__extract_doy AS lux_listing__window_start__extract_doy
             , subq_5.window_end__day AS lux_listing__window_end__day
             , subq_5.window_end__week AS lux_listing__window_end__week
             , subq_5.window_end__month AS lux_listing__window_end__month
@@ -265,8 +265,8 @@ FROM (
             , subq_5.window_end__extract_month AS lux_listing__window_end__extract_month
             , subq_5.window_end__extract_week AS lux_listing__window_end__extract_week
             , subq_5.window_end__extract_day AS lux_listing__window_end__extract_day
-            , subq_5.window_end__extract_dayofweek AS lux_listing__window_end__extract_dayofweek
-            , subq_5.window_end__extract_dayofyear AS lux_listing__window_end__extract_dayofyear
+            , subq_5.window_end__extract_dow AS lux_listing__window_end__extract_dow
+            , subq_5.window_end__extract_doy AS lux_listing__window_end__extract_doy
             , subq_3.listing AS listing
             , subq_3.lux_listing AS lux_listing
             , subq_3.listing__lux_listing AS listing__lux_listing
@@ -343,8 +343,8 @@ FROM (
               , subq_4.window_start__extract_month
               , subq_4.window_start__extract_week
               , subq_4.window_start__extract_day
-              , subq_4.window_start__extract_dayofweek
-              , subq_4.window_start__extract_dayofyear
+              , subq_4.window_start__extract_dow
+              , subq_4.window_start__extract_doy
               , subq_4.window_end__day
               , subq_4.window_end__week
               , subq_4.window_end__month
@@ -355,8 +355,8 @@ FROM (
               , subq_4.window_end__extract_month
               , subq_4.window_end__extract_week
               , subq_4.window_end__extract_day
-              , subq_4.window_end__extract_dayofweek
-              , subq_4.window_end__extract_dayofyear
+              , subq_4.window_end__extract_dow
+              , subq_4.window_end__extract_doy
               , subq_4.lux_listing__window_start__day
               , subq_4.lux_listing__window_start__week
               , subq_4.lux_listing__window_start__month
@@ -367,8 +367,8 @@ FROM (
               , subq_4.lux_listing__window_start__extract_month
               , subq_4.lux_listing__window_start__extract_week
               , subq_4.lux_listing__window_start__extract_day
-              , subq_4.lux_listing__window_start__extract_dayofweek
-              , subq_4.lux_listing__window_start__extract_dayofyear
+              , subq_4.lux_listing__window_start__extract_dow
+              , subq_4.lux_listing__window_start__extract_doy
               , subq_4.lux_listing__window_end__day
               , subq_4.lux_listing__window_end__week
               , subq_4.lux_listing__window_end__month
@@ -379,8 +379,8 @@ FROM (
               , subq_4.lux_listing__window_end__extract_month
               , subq_4.lux_listing__window_end__extract_week
               , subq_4.lux_listing__window_end__extract_day
-              , subq_4.lux_listing__window_end__extract_dayofweek
-              , subq_4.lux_listing__window_end__extract_dayofyear
+              , subq_4.lux_listing__window_end__extract_dow
+              , subq_4.lux_listing__window_end__extract_doy
               , subq_4.lux_listing
               , subq_4.is_confirmed_lux
               , subq_4.lux_listing__is_confirmed_lux
@@ -392,50 +392,50 @@ FROM (
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS window_start__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_from) AS window_start__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_from) AS window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS window_end__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_to) AS window_end__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_to) AS window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_from) AS lux_listing__window_start__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS lux_listing__window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS lux_listing__window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS lux_listing__window_start__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS lux_listing__window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS lux_listing__window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS lux_listing__window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS lux_listing__window_end__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql
index cb9670f074..7e38380b20 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_join_node__plan0.sql
@@ -33,74 +33,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -127,25 +127,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -154,25 +154,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -201,25 +201,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -228,25 +228,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
index 7638105966..99d4dba7cb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
@@ -41,8 +41,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.ds__day
             , subq_0.ds__week
             , subq_0.ds__month
@@ -53,8 +53,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.account_id__ds_partitioned__day
             , subq_0.account_id__ds_partitioned__week
             , subq_0.account_id__ds_partitioned__month
@@ -65,8 +65,8 @@ FROM (
             , subq_0.account_id__ds_partitioned__extract_month
             , subq_0.account_id__ds_partitioned__extract_week
             , subq_0.account_id__ds_partitioned__extract_day
-            , subq_0.account_id__ds_partitioned__extract_dayofweek
-            , subq_0.account_id__ds_partitioned__extract_dayofyear
+            , subq_0.account_id__ds_partitioned__extract_dow
+            , subq_0.account_id__ds_partitioned__extract_doy
             , subq_0.account_id__ds__day
             , subq_0.account_id__ds__week
             , subq_0.account_id__ds__month
@@ -77,8 +77,8 @@ FROM (
             , subq_0.account_id__ds__extract_month
             , subq_0.account_id__ds__extract_week
             , subq_0.account_id__ds__extract_day
-            , subq_0.account_id__ds__extract_dayofweek
-            , subq_0.account_id__ds__extract_dayofyear
+            , subq_0.account_id__ds__extract_dow
+            , subq_0.account_id__ds__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -89,8 +89,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.account_id
             , subq_0.account_month
             , subq_0.account_id__account_month
@@ -104,50 +104,50 @@ FROM (
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS ds__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds) AS ds__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds) AS ds__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds) AS ds__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds) AS ds__extract_doy
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS account_id__ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS account_id__ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS account_id__ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS account_id__ds__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_doy
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -174,8 +174,8 @@ FROM (
             , subq_3.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_3.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_3.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_3.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_3.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_3.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_3.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_3.account_id__ds_partitioned__day AS account_id__ds_partitioned__day
             , subq_3.account_id__ds_partitioned__week AS account_id__ds_partitioned__week
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
@@ -186,8 +186,8 @@ FROM (
             , subq_3.account_id__ds_partitioned__extract_month AS account_id__ds_partitioned__extract_month
             , subq_3.account_id__ds_partitioned__extract_week AS account_id__ds_partitioned__extract_week
             , subq_3.account_id__ds_partitioned__extract_day AS account_id__ds_partitioned__extract_day
-            , subq_3.account_id__ds_partitioned__extract_dayofweek AS account_id__ds_partitioned__extract_dayofweek
-            , subq_3.account_id__ds_partitioned__extract_dayofyear AS account_id__ds_partitioned__extract_dayofyear
+            , subq_3.account_id__ds_partitioned__extract_dow AS account_id__ds_partitioned__extract_dow
+            , subq_3.account_id__ds_partitioned__extract_doy AS account_id__ds_partitioned__extract_doy
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
@@ -198,8 +198,8 @@ FROM (
             , subq_5.ds_partitioned__extract_month AS customer_id__ds_partitioned__extract_month
             , subq_5.ds_partitioned__extract_week AS customer_id__ds_partitioned__extract_week
             , subq_5.ds_partitioned__extract_day AS customer_id__ds_partitioned__extract_day
-            , subq_5.ds_partitioned__extract_dayofweek AS customer_id__ds_partitioned__extract_dayofweek
-            , subq_5.ds_partitioned__extract_dayofyear AS customer_id__ds_partitioned__extract_dayofyear
+            , subq_5.ds_partitioned__extract_dow AS customer_id__ds_partitioned__extract_dow
+            , subq_5.ds_partitioned__extract_doy AS customer_id__ds_partitioned__extract_doy
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
@@ -216,26 +216,26 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_doy
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
-              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(week FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -283,8 +283,8 @@ FROM (
               , subq_4.ds_partitioned__extract_month
               , subq_4.ds_partitioned__extract_week
               , subq_4.ds_partitioned__extract_day
-              , subq_4.ds_partitioned__extract_dayofweek
-              , subq_4.ds_partitioned__extract_dayofyear
+              , subq_4.ds_partitioned__extract_dow
+              , subq_4.ds_partitioned__extract_doy
               , subq_4.customer_id__ds_partitioned__day
               , subq_4.customer_id__ds_partitioned__week
               , subq_4.customer_id__ds_partitioned__month
@@ -295,8 +295,8 @@ FROM (
               , subq_4.customer_id__ds_partitioned__extract_month
               , subq_4.customer_id__ds_partitioned__extract_week
               , subq_4.customer_id__ds_partitioned__extract_day
-              , subq_4.customer_id__ds_partitioned__extract_dayofweek
-              , subq_4.customer_id__ds_partitioned__extract_dayofyear
+              , subq_4.customer_id__ds_partitioned__extract_dow
+              , subq_4.customer_id__ds_partitioned__extract_doy
               , subq_4.customer_id
               , subq_4.customer_name
               , subq_4.customer_atomic_weight
@@ -312,13 +312,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -326,13 +326,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__year
-                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
+                , EXTRACT(week FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
+                , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
+                , EXTRACT(dow FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
index 3d8fba9b22..54b108dd33 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multiple_metrics_no_dimensions__plan0.sql
@@ -28,8 +28,8 @@ FROM (
           , subq_1.ds__extract_month
           , subq_1.ds__extract_week
           , subq_1.ds__extract_day
-          , subq_1.ds__extract_dayofweek
-          , subq_1.ds__extract_dayofyear
+          , subq_1.ds__extract_dow
+          , subq_1.ds__extract_doy
           , subq_1.ds_partitioned__day
           , subq_1.ds_partitioned__week
           , subq_1.ds_partitioned__month
@@ -40,8 +40,8 @@ FROM (
           , subq_1.ds_partitioned__extract_month
           , subq_1.ds_partitioned__extract_week
           , subq_1.ds_partitioned__extract_day
-          , subq_1.ds_partitioned__extract_dayofweek
-          , subq_1.ds_partitioned__extract_dayofyear
+          , subq_1.ds_partitioned__extract_dow
+          , subq_1.ds_partitioned__extract_doy
           , subq_1.paid_at__day
           , subq_1.paid_at__week
           , subq_1.paid_at__month
@@ -52,8 +52,8 @@ FROM (
           , subq_1.paid_at__extract_month
           , subq_1.paid_at__extract_week
           , subq_1.paid_at__extract_day
-          , subq_1.paid_at__extract_dayofweek
-          , subq_1.paid_at__extract_dayofyear
+          , subq_1.paid_at__extract_dow
+          , subq_1.paid_at__extract_doy
           , subq_1.booking__ds__day
           , subq_1.booking__ds__week
           , subq_1.booking__ds__month
@@ -64,8 +64,8 @@ FROM (
           , subq_1.booking__ds__extract_month
           , subq_1.booking__ds__extract_week
           , subq_1.booking__ds__extract_day
-          , subq_1.booking__ds__extract_dayofweek
-          , subq_1.booking__ds__extract_dayofyear
+          , subq_1.booking__ds__extract_dow
+          , subq_1.booking__ds__extract_doy
           , subq_1.booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month
@@ -76,8 +76,8 @@ FROM (
           , subq_1.booking__ds_partitioned__extract_month
           , subq_1.booking__ds_partitioned__extract_week
           , subq_1.booking__ds_partitioned__extract_day
-          , subq_1.booking__ds_partitioned__extract_dayofweek
-          , subq_1.booking__ds_partitioned__extract_dayofyear
+          , subq_1.booking__ds_partitioned__extract_dow
+          , subq_1.booking__ds_partitioned__extract_doy
           , subq_1.booking__paid_at__day
           , subq_1.booking__paid_at__week
           , subq_1.booking__paid_at__month
@@ -88,8 +88,8 @@ FROM (
           , subq_1.booking__paid_at__extract_month
           , subq_1.booking__paid_at__extract_week
           , subq_1.booking__paid_at__extract_day
-          , subq_1.booking__paid_at__extract_dayofweek
-          , subq_1.booking__paid_at__extract_dayofyear
+          , subq_1.booking__paid_at__extract_dow
+          , subq_1.booking__paid_at__extract_doy
           , subq_1.metric_time__day
           , subq_1.metric_time__week
           , subq_1.metric_time__month
@@ -100,8 +100,8 @@ FROM (
           , subq_1.metric_time__extract_month
           , subq_1.metric_time__extract_week
           , subq_1.metric_time__extract_day
-          , subq_1.metric_time__extract_dayofweek
-          , subq_1.metric_time__extract_dayofyear
+          , subq_1.metric_time__extract_dow
+          , subq_1.metric_time__extract_doy
           , subq_1.listing
           , subq_1.guest
           , subq_1.host
@@ -136,8 +136,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -148,8 +148,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -160,8 +160,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -172,8 +172,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -184,8 +184,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -196,8 +196,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -208,8 +208,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -254,74 +254,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -362,8 +362,8 @@ CROSS JOIN (
           , subq_7.ds__extract_month
           , subq_7.ds__extract_week
           , subq_7.ds__extract_day
-          , subq_7.ds__extract_dayofweek
-          , subq_7.ds__extract_dayofyear
+          , subq_7.ds__extract_dow
+          , subq_7.ds__extract_doy
           , subq_7.created_at__day
           , subq_7.created_at__week
           , subq_7.created_at__month
@@ -374,8 +374,8 @@ CROSS JOIN (
           , subq_7.created_at__extract_month
           , subq_7.created_at__extract_week
           , subq_7.created_at__extract_day
-          , subq_7.created_at__extract_dayofweek
-          , subq_7.created_at__extract_dayofyear
+          , subq_7.created_at__extract_dow
+          , subq_7.created_at__extract_doy
           , subq_7.listing__ds__day
           , subq_7.listing__ds__week
           , subq_7.listing__ds__month
@@ -386,8 +386,8 @@ CROSS JOIN (
           , subq_7.listing__ds__extract_month
           , subq_7.listing__ds__extract_week
           , subq_7.listing__ds__extract_day
-          , subq_7.listing__ds__extract_dayofweek
-          , subq_7.listing__ds__extract_dayofyear
+          , subq_7.listing__ds__extract_dow
+          , subq_7.listing__ds__extract_doy
           , subq_7.listing__created_at__day
           , subq_7.listing__created_at__week
           , subq_7.listing__created_at__month
@@ -398,8 +398,8 @@ CROSS JOIN (
           , subq_7.listing__created_at__extract_month
           , subq_7.listing__created_at__extract_week
           , subq_7.listing__created_at__extract_day
-          , subq_7.listing__created_at__extract_dayofweek
-          , subq_7.listing__created_at__extract_dayofyear
+          , subq_7.listing__created_at__extract_dow
+          , subq_7.listing__created_at__extract_doy
           , subq_7.metric_time__day
           , subq_7.metric_time__week
           , subq_7.metric_time__month
@@ -410,8 +410,8 @@ CROSS JOIN (
           , subq_7.metric_time__extract_month
           , subq_7.metric_time__extract_week
           , subq_7.metric_time__extract_day
-          , subq_7.metric_time__extract_dayofweek
-          , subq_7.metric_time__extract_dayofyear
+          , subq_7.metric_time__extract_dow
+          , subq_7.metric_time__extract_doy
           , subq_7.listing
           , subq_7.user
           , subq_7.listing__user
@@ -437,8 +437,8 @@ CROSS JOIN (
             , subq_6.ds__extract_month
             , subq_6.ds__extract_week
             , subq_6.ds__extract_day
-            , subq_6.ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear
+            , subq_6.ds__extract_dow
+            , subq_6.ds__extract_doy
             , subq_6.created_at__day
             , subq_6.created_at__week
             , subq_6.created_at__month
@@ -449,8 +449,8 @@ CROSS JOIN (
             , subq_6.created_at__extract_month
             , subq_6.created_at__extract_week
             , subq_6.created_at__extract_day
-            , subq_6.created_at__extract_dayofweek
-            , subq_6.created_at__extract_dayofyear
+            , subq_6.created_at__extract_dow
+            , subq_6.created_at__extract_doy
             , subq_6.listing__ds__day
             , subq_6.listing__ds__week
             , subq_6.listing__ds__month
@@ -461,8 +461,8 @@ CROSS JOIN (
             , subq_6.listing__ds__extract_month
             , subq_6.listing__ds__extract_week
             , subq_6.listing__ds__extract_day
-            , subq_6.listing__ds__extract_dayofweek
-            , subq_6.listing__ds__extract_dayofyear
+            , subq_6.listing__ds__extract_dow
+            , subq_6.listing__ds__extract_doy
             , subq_6.listing__created_at__day
             , subq_6.listing__created_at__week
             , subq_6.listing__created_at__month
@@ -473,8 +473,8 @@ CROSS JOIN (
             , subq_6.listing__created_at__extract_month
             , subq_6.listing__created_at__extract_week
             , subq_6.listing__created_at__extract_day
-            , subq_6.listing__created_at__extract_dayofweek
-            , subq_6.listing__created_at__extract_dayofyear
+            , subq_6.listing__created_at__extract_dow
+            , subq_6.listing__created_at__extract_doy
             , subq_6.ds__day AS metric_time__day
             , subq_6.ds__week AS metric_time__week
             , subq_6.ds__month AS metric_time__month
@@ -485,8 +485,8 @@ CROSS JOIN (
             , subq_6.ds__extract_month AS metric_time__extract_month
             , subq_6.ds__extract_week AS metric_time__extract_week
             , subq_6.ds__extract_day AS metric_time__extract_day
-            , subq_6.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_6.ds__extract_dow AS metric_time__extract_dow
+            , subq_6.ds__extract_doy AS metric_time__extract_doy
             , subq_6.listing
             , subq_6.user
             , subq_6.listing__user
@@ -510,25 +510,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -537,25 +537,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql
index 138d3b47ca..a716977aaf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_nested_derived_metric__plan0.sql
@@ -49,8 +49,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -61,8 +61,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -73,8 +73,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -85,8 +85,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -97,8 +97,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -109,8 +109,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -121,8 +121,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -167,74 +167,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -278,8 +278,8 @@ FROM (
                 , subq_5.ds__extract_month
                 , subq_5.ds__extract_week
                 , subq_5.ds__extract_day
-                , subq_5.ds__extract_dayofweek
-                , subq_5.ds__extract_dayofyear
+                , subq_5.ds__extract_dow
+                , subq_5.ds__extract_doy
                 , subq_5.ds_partitioned__day
                 , subq_5.ds_partitioned__week
                 , subq_5.ds_partitioned__month
@@ -290,8 +290,8 @@ FROM (
                 , subq_5.ds_partitioned__extract_month
                 , subq_5.ds_partitioned__extract_week
                 , subq_5.ds_partitioned__extract_day
-                , subq_5.ds_partitioned__extract_dayofweek
-                , subq_5.ds_partitioned__extract_dayofyear
+                , subq_5.ds_partitioned__extract_dow
+                , subq_5.ds_partitioned__extract_doy
                 , subq_5.paid_at__day
                 , subq_5.paid_at__week
                 , subq_5.paid_at__month
@@ -302,8 +302,8 @@ FROM (
                 , subq_5.paid_at__extract_month
                 , subq_5.paid_at__extract_week
                 , subq_5.paid_at__extract_day
-                , subq_5.paid_at__extract_dayofweek
-                , subq_5.paid_at__extract_dayofyear
+                , subq_5.paid_at__extract_dow
+                , subq_5.paid_at__extract_doy
                 , subq_5.booking__ds__day
                 , subq_5.booking__ds__week
                 , subq_5.booking__ds__month
@@ -314,8 +314,8 @@ FROM (
                 , subq_5.booking__ds__extract_month
                 , subq_5.booking__ds__extract_week
                 , subq_5.booking__ds__extract_day
-                , subq_5.booking__ds__extract_dayofweek
-                , subq_5.booking__ds__extract_dayofyear
+                , subq_5.booking__ds__extract_dow
+                , subq_5.booking__ds__extract_doy
                 , subq_5.booking__ds_partitioned__day
                 , subq_5.booking__ds_partitioned__week
                 , subq_5.booking__ds_partitioned__month
@@ -326,8 +326,8 @@ FROM (
                 , subq_5.booking__ds_partitioned__extract_month
                 , subq_5.booking__ds_partitioned__extract_week
                 , subq_5.booking__ds_partitioned__extract_day
-                , subq_5.booking__ds_partitioned__extract_dayofweek
-                , subq_5.booking__ds_partitioned__extract_dayofyear
+                , subq_5.booking__ds_partitioned__extract_dow
+                , subq_5.booking__ds_partitioned__extract_doy
                 , subq_5.booking__paid_at__day
                 , subq_5.booking__paid_at__week
                 , subq_5.booking__paid_at__month
@@ -338,8 +338,8 @@ FROM (
                 , subq_5.booking__paid_at__extract_month
                 , subq_5.booking__paid_at__extract_week
                 , subq_5.booking__paid_at__extract_day
-                , subq_5.booking__paid_at__extract_dayofweek
-                , subq_5.booking__paid_at__extract_dayofyear
+                , subq_5.booking__paid_at__extract_dow
+                , subq_5.booking__paid_at__extract_doy
                 , subq_5.ds__day AS metric_time__day
                 , subq_5.ds__week AS metric_time__week
                 , subq_5.ds__month AS metric_time__month
@@ -350,8 +350,8 @@ FROM (
                 , subq_5.ds__extract_month AS metric_time__extract_month
                 , subq_5.ds__extract_week AS metric_time__extract_week
                 , subq_5.ds__extract_day AS metric_time__extract_day
-                , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_5.ds__extract_dow AS metric_time__extract_dow
+                , subq_5.ds__extract_doy AS metric_time__extract_doy
                 , subq_5.listing
                 , subq_5.guest
                 , subq_5.host
@@ -396,74 +396,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -519,8 +519,8 @@ FROM (
             , subq_12.ds__extract_month
             , subq_12.ds__extract_week
             , subq_12.ds__extract_day
-            , subq_12.ds__extract_dayofweek
-            , subq_12.ds__extract_dayofyear
+            , subq_12.ds__extract_dow
+            , subq_12.ds__extract_doy
             , subq_12.ds_partitioned__day
             , subq_12.ds_partitioned__week
             , subq_12.ds_partitioned__month
@@ -531,8 +531,8 @@ FROM (
             , subq_12.ds_partitioned__extract_month
             , subq_12.ds_partitioned__extract_week
             , subq_12.ds_partitioned__extract_day
-            , subq_12.ds_partitioned__extract_dayofweek
-            , subq_12.ds_partitioned__extract_dayofyear
+            , subq_12.ds_partitioned__extract_dow
+            , subq_12.ds_partitioned__extract_doy
             , subq_12.paid_at__day
             , subq_12.paid_at__week
             , subq_12.paid_at__month
@@ -543,8 +543,8 @@ FROM (
             , subq_12.paid_at__extract_month
             , subq_12.paid_at__extract_week
             , subq_12.paid_at__extract_day
-            , subq_12.paid_at__extract_dayofweek
-            , subq_12.paid_at__extract_dayofyear
+            , subq_12.paid_at__extract_dow
+            , subq_12.paid_at__extract_doy
             , subq_12.booking__ds__day
             , subq_12.booking__ds__week
             , subq_12.booking__ds__month
@@ -555,8 +555,8 @@ FROM (
             , subq_12.booking__ds__extract_month
             , subq_12.booking__ds__extract_week
             , subq_12.booking__ds__extract_day
-            , subq_12.booking__ds__extract_dayofweek
-            , subq_12.booking__ds__extract_dayofyear
+            , subq_12.booking__ds__extract_dow
+            , subq_12.booking__ds__extract_doy
             , subq_12.booking__ds_partitioned__day
             , subq_12.booking__ds_partitioned__week
             , subq_12.booking__ds_partitioned__month
@@ -567,8 +567,8 @@ FROM (
             , subq_12.booking__ds_partitioned__extract_month
             , subq_12.booking__ds_partitioned__extract_week
             , subq_12.booking__ds_partitioned__extract_day
-            , subq_12.booking__ds_partitioned__extract_dayofweek
-            , subq_12.booking__ds_partitioned__extract_dayofyear
+            , subq_12.booking__ds_partitioned__extract_dow
+            , subq_12.booking__ds_partitioned__extract_doy
             , subq_12.booking__paid_at__day
             , subq_12.booking__paid_at__week
             , subq_12.booking__paid_at__month
@@ -579,8 +579,8 @@ FROM (
             , subq_12.booking__paid_at__extract_month
             , subq_12.booking__paid_at__extract_week
             , subq_12.booking__paid_at__extract_day
-            , subq_12.booking__paid_at__extract_dayofweek
-            , subq_12.booking__paid_at__extract_dayofyear
+            , subq_12.booking__paid_at__extract_dow
+            , subq_12.booking__paid_at__extract_doy
             , subq_12.ds__day AS metric_time__day
             , subq_12.ds__week AS metric_time__week
             , subq_12.ds__month AS metric_time__month
@@ -591,8 +591,8 @@ FROM (
             , subq_12.ds__extract_month AS metric_time__extract_month
             , subq_12.ds__extract_week AS metric_time__extract_week
             , subq_12.ds__extract_day AS metric_time__extract_day
-            , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_12.ds__extract_dow AS metric_time__extract_dow
+            , subq_12.ds__extract_doy AS metric_time__extract_doy
             , subq_12.listing
             , subq_12.guest
             , subq_12.host
@@ -637,74 +637,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -758,8 +758,8 @@ FROM (
             , subq_17.ds__extract_month
             , subq_17.ds__extract_week
             , subq_17.ds__extract_day
-            , subq_17.ds__extract_dayofweek
-            , subq_17.ds__extract_dayofyear
+            , subq_17.ds__extract_dow
+            , subq_17.ds__extract_doy
             , subq_17.ds_partitioned__day
             , subq_17.ds_partitioned__week
             , subq_17.ds_partitioned__month
@@ -770,8 +770,8 @@ FROM (
             , subq_17.ds_partitioned__extract_month
             , subq_17.ds_partitioned__extract_week
             , subq_17.ds_partitioned__extract_day
-            , subq_17.ds_partitioned__extract_dayofweek
-            , subq_17.ds_partitioned__extract_dayofyear
+            , subq_17.ds_partitioned__extract_dow
+            , subq_17.ds_partitioned__extract_doy
             , subq_17.paid_at__day
             , subq_17.paid_at__week
             , subq_17.paid_at__month
@@ -782,8 +782,8 @@ FROM (
             , subq_17.paid_at__extract_month
             , subq_17.paid_at__extract_week
             , subq_17.paid_at__extract_day
-            , subq_17.paid_at__extract_dayofweek
-            , subq_17.paid_at__extract_dayofyear
+            , subq_17.paid_at__extract_dow
+            , subq_17.paid_at__extract_doy
             , subq_17.booking__ds__day
             , subq_17.booking__ds__week
             , subq_17.booking__ds__month
@@ -794,8 +794,8 @@ FROM (
             , subq_17.booking__ds__extract_month
             , subq_17.booking__ds__extract_week
             , subq_17.booking__ds__extract_day
-            , subq_17.booking__ds__extract_dayofweek
-            , subq_17.booking__ds__extract_dayofyear
+            , subq_17.booking__ds__extract_dow
+            , subq_17.booking__ds__extract_doy
             , subq_17.booking__ds_partitioned__day
             , subq_17.booking__ds_partitioned__week
             , subq_17.booking__ds_partitioned__month
@@ -806,8 +806,8 @@ FROM (
             , subq_17.booking__ds_partitioned__extract_month
             , subq_17.booking__ds_partitioned__extract_week
             , subq_17.booking__ds_partitioned__extract_day
-            , subq_17.booking__ds_partitioned__extract_dayofweek
-            , subq_17.booking__ds_partitioned__extract_dayofyear
+            , subq_17.booking__ds_partitioned__extract_dow
+            , subq_17.booking__ds_partitioned__extract_doy
             , subq_17.booking__paid_at__day
             , subq_17.booking__paid_at__week
             , subq_17.booking__paid_at__month
@@ -818,8 +818,8 @@ FROM (
             , subq_17.booking__paid_at__extract_month
             , subq_17.booking__paid_at__extract_week
             , subq_17.booking__paid_at__extract_day
-            , subq_17.booking__paid_at__extract_dayofweek
-            , subq_17.booking__paid_at__extract_dayofyear
+            , subq_17.booking__paid_at__extract_dow
+            , subq_17.booking__paid_at__extract_doy
             , subq_17.ds__day AS metric_time__day
             , subq_17.ds__week AS metric_time__week
             , subq_17.ds__month AS metric_time__month
@@ -830,8 +830,8 @@ FROM (
             , subq_17.ds__extract_month AS metric_time__extract_month
             , subq_17.ds__extract_week AS metric_time__extract_week
             , subq_17.ds__extract_day AS metric_time__extract_day
-            , subq_17.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_17.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_17.ds__extract_dow AS metric_time__extract_dow
+            , subq_17.ds__extract_doy AS metric_time__extract_doy
             , subq_17.listing
             , subq_17.guest
             , subq_17.host
@@ -876,74 +876,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql
index 63116a5458..d6632b499f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_order_by_node__plan0.sql
@@ -45,74 +45,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql
index e43e265eff..44cff4ab94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_partitioned_join__plan0.sql
@@ -41,8 +41,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -53,8 +53,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.verification__ds__day
             , subq_0.verification__ds__week
             , subq_0.verification__ds__month
@@ -65,8 +65,8 @@ FROM (
             , subq_0.verification__ds__extract_month
             , subq_0.verification__ds__extract_week
             , subq_0.verification__ds__extract_day
-            , subq_0.verification__ds__extract_dayofweek
-            , subq_0.verification__ds__extract_dayofyear
+            , subq_0.verification__ds__extract_dow
+            , subq_0.verification__ds__extract_doy
             , subq_0.verification__ds_partitioned__day
             , subq_0.verification__ds_partitioned__week
             , subq_0.verification__ds_partitioned__month
@@ -77,8 +77,8 @@ FROM (
             , subq_0.verification__ds_partitioned__extract_month
             , subq_0.verification__ds_partitioned__extract_week
             , subq_0.verification__ds_partitioned__extract_day
-            , subq_0.verification__ds_partitioned__extract_dayofweek
-            , subq_0.verification__ds_partitioned__extract_dayofyear
+            , subq_0.verification__ds_partitioned__extract_dow
+            , subq_0.verification__ds_partitioned__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -89,8 +89,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.verification
             , subq_0.user
             , subq_0.verification__user
@@ -106,50 +106,50 @@ FROM (
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds) AS ds__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds) AS ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -173,74 +173,74 @@ FROM (
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS ds__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds) AS ds__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds) AS ds__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds) AS ds__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds) AS ds__extract_doy
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS created_at__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.created_at) AS created_at__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.created_at) AS created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds) AS user__ds__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS user__ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS user__ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS user__ds__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds) AS user__ds__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds) AS user__ds__extract_doy
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS user__created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS user__created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS user__created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS user__created_at__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql
index d88d2d32f3..33fc914795 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -82,26 +82,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql
index 094486f462..d90abbd294 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql
index a8a26c9899..dc98b44d95 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -83,26 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index c400372dd4..d723157d2a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 30ab4c1851..95274f2863 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -83,26 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index ef337f422c..e0c877bdf1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql
index 16b897731d..9c6e0a2676 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_single_join_node__plan0.sql
@@ -31,74 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -125,25 +125,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -152,25 +152,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql
index 7dd5c3b39d..b9ae7f84a4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0.sql
@@ -20,74 +20,74 @@ SELECT
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql
index e240956212..d1560d9ab0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_source_node__plan0_optimized.sql
@@ -20,74 +20,74 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql
index d2a3c6afd9..b954d8927e 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_common_semantic_model__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -150,74 +150,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -261,8 +261,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month
           , subq_5.ds__extract_week
           , subq_5.ds__extract_day
-          , subq_5.ds__extract_dayofweek
-          , subq_5.ds__extract_dayofyear
+          , subq_5.ds__extract_dow
+          , subq_5.ds__extract_doy
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
@@ -273,8 +273,8 @@ FULL OUTER JOIN (
           , subq_5.ds_partitioned__extract_month
           , subq_5.ds_partitioned__extract_week
           , subq_5.ds_partitioned__extract_day
-          , subq_5.ds_partitioned__extract_dayofweek
-          , subq_5.ds_partitioned__extract_dayofyear
+          , subq_5.ds_partitioned__extract_dow
+          , subq_5.ds_partitioned__extract_doy
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
@@ -285,8 +285,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month
           , subq_5.paid_at__extract_week
           , subq_5.paid_at__extract_day
-          , subq_5.paid_at__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear
+          , subq_5.paid_at__extract_dow
+          , subq_5.paid_at__extract_doy
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
@@ -297,8 +297,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds__extract_month
           , subq_5.booking__ds__extract_week
           , subq_5.booking__ds__extract_day
-          , subq_5.booking__ds__extract_dayofweek
-          , subq_5.booking__ds__extract_dayofyear
+          , subq_5.booking__ds__extract_dow
+          , subq_5.booking__ds__extract_doy
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
@@ -309,8 +309,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds_partitioned__extract_month
           , subq_5.booking__ds_partitioned__extract_week
           , subq_5.booking__ds_partitioned__extract_day
-          , subq_5.booking__ds_partitioned__extract_dayofweek
-          , subq_5.booking__ds_partitioned__extract_dayofyear
+          , subq_5.booking__ds_partitioned__extract_dow
+          , subq_5.booking__ds_partitioned__extract_doy
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
@@ -321,8 +321,8 @@ FULL OUTER JOIN (
           , subq_5.booking__paid_at__extract_month
           , subq_5.booking__paid_at__extract_week
           , subq_5.booking__paid_at__extract_day
-          , subq_5.booking__paid_at__extract_dayofweek
-          , subq_5.booking__paid_at__extract_dayofyear
+          , subq_5.booking__paid_at__extract_dow
+          , subq_5.booking__paid_at__extract_doy
           , subq_5.ds__day AS metric_time__day
           , subq_5.ds__week AS metric_time__week
           , subq_5.ds__month AS metric_time__month
@@ -333,8 +333,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month AS metric_time__extract_month
           , subq_5.ds__extract_week AS metric_time__extract_week
           , subq_5.ds__extract_day AS metric_time__extract_day
-          , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_5.ds__extract_dow AS metric_time__extract_dow
+          , subq_5.ds__extract_doy AS metric_time__extract_doy
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
@@ -379,74 +379,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql
index c80b16baf0..b1bf877e84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node__plan0.sql
@@ -44,74 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -138,25 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -165,25 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index c45302afaf..5373f3b9a9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -56,8 +56,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -68,8 +68,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -80,8 +80,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -92,8 +92,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -104,8 +104,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -116,8 +116,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -128,8 +128,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -174,74 +174,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -271,8 +271,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -283,8 +283,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -295,8 +295,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -307,8 +307,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -319,8 +319,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -344,25 +344,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -371,25 +371,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -455,8 +455,8 @@ FROM (
                 , subq_10.ds__extract_month
                 , subq_10.ds__extract_week
                 , subq_10.ds__extract_day
-                , subq_10.ds__extract_dayofweek
-                , subq_10.ds__extract_dayofyear
+                , subq_10.ds__extract_dow
+                , subq_10.ds__extract_doy
                 , subq_10.ds_partitioned__day
                 , subq_10.ds_partitioned__week
                 , subq_10.ds_partitioned__month
@@ -467,8 +467,8 @@ FROM (
                 , subq_10.ds_partitioned__extract_month
                 , subq_10.ds_partitioned__extract_week
                 , subq_10.ds_partitioned__extract_day
-                , subq_10.ds_partitioned__extract_dayofweek
-                , subq_10.ds_partitioned__extract_dayofyear
+                , subq_10.ds_partitioned__extract_dow
+                , subq_10.ds_partitioned__extract_doy
                 , subq_10.view__ds__day
                 , subq_10.view__ds__week
                 , subq_10.view__ds__month
@@ -479,8 +479,8 @@ FROM (
                 , subq_10.view__ds__extract_month
                 , subq_10.view__ds__extract_week
                 , subq_10.view__ds__extract_day
-                , subq_10.view__ds__extract_dayofweek
-                , subq_10.view__ds__extract_dayofyear
+                , subq_10.view__ds__extract_dow
+                , subq_10.view__ds__extract_doy
                 , subq_10.view__ds_partitioned__day
                 , subq_10.view__ds_partitioned__week
                 , subq_10.view__ds_partitioned__month
@@ -491,8 +491,8 @@ FROM (
                 , subq_10.view__ds_partitioned__extract_month
                 , subq_10.view__ds_partitioned__extract_week
                 , subq_10.view__ds_partitioned__extract_day
-                , subq_10.view__ds_partitioned__extract_dayofweek
-                , subq_10.view__ds_partitioned__extract_dayofyear
+                , subq_10.view__ds_partitioned__extract_dow
+                , subq_10.view__ds_partitioned__extract_doy
                 , subq_10.ds__day AS metric_time__day
                 , subq_10.ds__week AS metric_time__week
                 , subq_10.ds__month AS metric_time__month
@@ -503,8 +503,8 @@ FROM (
                 , subq_10.ds__extract_month AS metric_time__extract_month
                 , subq_10.ds__extract_week AS metric_time__extract_week
                 , subq_10.ds__extract_day AS metric_time__extract_day
-                , subq_10.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_10.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_10.ds__extract_dow AS metric_time__extract_dow
+                , subq_10.ds__extract_doy AS metric_time__extract_doy
                 , subq_10.listing
                 , subq_10.user
                 , subq_10.view__listing
@@ -519,49 +519,49 @@ FROM (
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS ds__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds) AS ds__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds) AS ds__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds) AS ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_doy
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC('week', views_source_src_10009.ds) AS view__ds__week
                   , DATE_TRUNC('month', views_source_src_10009.ds) AS view__ds__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds) AS view__ds__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds) AS view__ds__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds) AS view__ds__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds) AS view__ds__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds) AS view__ds__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds) AS view__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds) AS view__ds__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds) AS view__ds__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds) AS view__ds__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds) AS view__ds__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds) AS view__ds__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds) AS view__ds__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds) AS view__ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC('week', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__week
                   , DATE_TRUNC('month', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__month
                   , DATE_TRUNC('quarter', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__quarter
                   , DATE_TRUNC('year', views_source_src_10009.ds_partitioned) AS view__ds_partitioned__year
-                  , EXTRACT(YEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
+                  , EXTRACT(week FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
+                  , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_doy
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -589,8 +589,8 @@ FROM (
                 , subq_13.ds__extract_month
                 , subq_13.ds__extract_week
                 , subq_13.ds__extract_day
-                , subq_13.ds__extract_dayofweek
-                , subq_13.ds__extract_dayofyear
+                , subq_13.ds__extract_dow
+                , subq_13.ds__extract_doy
                 , subq_13.created_at__day
                 , subq_13.created_at__week
                 , subq_13.created_at__month
@@ -601,8 +601,8 @@ FROM (
                 , subq_13.created_at__extract_month
                 , subq_13.created_at__extract_week
                 , subq_13.created_at__extract_day
-                , subq_13.created_at__extract_dayofweek
-                , subq_13.created_at__extract_dayofyear
+                , subq_13.created_at__extract_dow
+                , subq_13.created_at__extract_doy
                 , subq_13.listing__ds__day
                 , subq_13.listing__ds__week
                 , subq_13.listing__ds__month
@@ -613,8 +613,8 @@ FROM (
                 , subq_13.listing__ds__extract_month
                 , subq_13.listing__ds__extract_week
                 , subq_13.listing__ds__extract_day
-                , subq_13.listing__ds__extract_dayofweek
-                , subq_13.listing__ds__extract_dayofyear
+                , subq_13.listing__ds__extract_dow
+                , subq_13.listing__ds__extract_doy
                 , subq_13.listing__created_at__day
                 , subq_13.listing__created_at__week
                 , subq_13.listing__created_at__month
@@ -625,8 +625,8 @@ FROM (
                 , subq_13.listing__created_at__extract_month
                 , subq_13.listing__created_at__extract_week
                 , subq_13.listing__created_at__extract_day
-                , subq_13.listing__created_at__extract_dayofweek
-                , subq_13.listing__created_at__extract_dayofyear
+                , subq_13.listing__created_at__extract_dow
+                , subq_13.listing__created_at__extract_doy
                 , subq_13.ds__day AS metric_time__day
                 , subq_13.ds__week AS metric_time__week
                 , subq_13.ds__month AS metric_time__month
@@ -637,8 +637,8 @@ FROM (
                 , subq_13.ds__extract_month AS metric_time__extract_month
                 , subq_13.ds__extract_week AS metric_time__extract_week
                 , subq_13.ds__extract_day AS metric_time__extract_day
-                , subq_13.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_13.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_13.ds__extract_dow AS metric_time__extract_dow
+                , subq_13.ds__extract_doy AS metric_time__extract_doy
                 , subq_13.listing
                 , subq_13.user
                 , subq_13.listing__user
@@ -662,25 +662,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -689,25 +689,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index a56183e745..1bd176c115 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -47,74 +47,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -141,25 +141,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -168,25 +168,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql
index b6f01861d7..cd879426f7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_compute_metrics_node_simple_expr__plan0.sql
@@ -44,74 +44,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -138,25 +138,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -165,25 +165,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql
index d480357663..5b6dd99cc4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_constrain_time_range_node__plan0.sql
@@ -38,74 +38,74 @@ FROM (
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
         , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
         , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
         , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
         , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-        , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-        , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-        , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-        , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-        , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+        , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+        , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+        , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+        , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+        , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+        , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+        , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
index ad08f90e35..6920a36691 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
index 8c2ab1a915..4080ab9420 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_grain_to_date__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
index 8d5b07c69a..fcf74a5947 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_ds__plan0.sql
@@ -23,8 +23,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -35,8 +35,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -47,8 +47,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -61,25 +61,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
index d98f0f554a..0143335613 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.company__ds__day
         , subq_0.company__ds__week
         , subq_0.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.company__ds__extract_month
         , subq_0.company__ds__extract_week
         , subq_0.company__ds__extract_day
-        , subq_0.company__ds__extract_dayofweek
-        , subq_0.company__ds__extract_dayofyear
+        , subq_0.company__ds__extract_dow
+        , subq_0.company__ds__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.user
         , subq_0.company__user
         , subq_0.txn_revenue
@@ -64,25 +64,25 @@ FROM (
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
           , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
           , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
           , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-          , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-          , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-          , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-          , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+          , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+          , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+          , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+          , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+          , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 26ab44afcc..5cba3a3202 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_1.ds__extract_month
         , subq_1.ds__extract_week
         , subq_1.ds__extract_day
-        , subq_1.ds__extract_dayofweek
-        , subq_1.ds__extract_dayofyear
+        , subq_1.ds__extract_dow
+        , subq_1.ds__extract_doy
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_1.company__ds__extract_month
         , subq_1.company__ds__extract_week
         , subq_1.company__ds__extract_day
-        , subq_1.company__ds__extract_dayofweek
-        , subq_1.company__ds__extract_dayofyear
+        , subq_1.company__ds__extract_dow
+        , subq_1.company__ds__extract_doy
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_1.metric_time__extract_month
         , subq_1.metric_time__extract_week
         , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dayofweek
-        , subq_1.metric_time__extract_dayofyear
+        , subq_1.metric_time__extract_dow
+        , subq_1.metric_time__extract_doy
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -68,8 +68,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.company__ds__extract_month
           , subq_0.company__ds__extract_week
           , subq_0.company__ds__extract_day
-          , subq_0.company__ds__extract_dayofweek
-          , subq_0.company__ds__extract_dayofyear
+          , subq_0.company__ds__extract_dow
+          , subq_0.company__ds__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
@@ -106,25 +106,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
index a670ac2189..414159089b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_1.ds__extract_month
         , subq_1.ds__extract_week
         , subq_1.ds__extract_day
-        , subq_1.ds__extract_dayofweek
-        , subq_1.ds__extract_dayofyear
+        , subq_1.ds__extract_dow
+        , subq_1.ds__extract_doy
         , subq_1.company__ds__day
         , subq_1.company__ds__week
         , subq_1.company__ds__month
@@ -38,8 +38,8 @@ FROM (
         , subq_1.company__ds__extract_month
         , subq_1.company__ds__extract_week
         , subq_1.company__ds__extract_day
-        , subq_1.company__ds__extract_dayofweek
-        , subq_1.company__ds__extract_dayofyear
+        , subq_1.company__ds__extract_dow
+        , subq_1.company__ds__extract_doy
         , subq_1.metric_time__day
         , subq_1.metric_time__week
         , subq_1.metric_time__month
@@ -50,8 +50,8 @@ FROM (
         , subq_1.metric_time__extract_month
         , subq_1.metric_time__extract_week
         , subq_1.metric_time__extract_day
-        , subq_1.metric_time__extract_dayofweek
-        , subq_1.metric_time__extract_dayofyear
+        , subq_1.metric_time__extract_dow
+        , subq_1.metric_time__extract_doy
         , subq_1.user
         , subq_1.company__user
         , subq_1.txn_revenue
@@ -68,8 +68,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.company__ds__day
           , subq_0.company__ds__week
           , subq_0.company__ds__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.company__ds__extract_month
           , subq_0.company__ds__extract_week
           , subq_0.company__ds__extract_day
-          , subq_0.company__ds__extract_dayofweek
-          , subq_0.company__ds__extract_dayofyear
+          , subq_0.company__ds__extract_dow
+          , subq_0.company__ds__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.user
           , subq_0.company__user
           , subq_0.txn_revenue
@@ -106,25 +106,25 @@ FROM (
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC('week', revenue_src_10006.created_at) AS company__ds__week
             , DATE_TRUNC('month', revenue_src_10006.created_at) AS company__ds__month
             , DATE_TRUNC('quarter', revenue_src_10006.created_at) AS company__ds__quarter
             , DATE_TRUNC('year', revenue_src_10006.created_at) AS company__ds__year
-            , EXTRACT(YEAR FROM revenue_src_10006.created_at) AS company__ds__extract_year
-            , EXTRACT(QUARTER FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
-            , EXTRACT(MONTH FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(WEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
-            , EXTRACT(DAY FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_dayofyear
+            , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
+            , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
+            , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
+            , EXTRACT(week FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
+            , EXTRACT(dow FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(doy FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql
index 3d88c96009..5b4011175d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -266,8 +266,8 @@ FROM (
             , subq_5.ds__extract_month
             , subq_5.ds__extract_week
             , subq_5.ds__extract_day
-            , subq_5.ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear
+            , subq_5.ds__extract_dow
+            , subq_5.ds__extract_doy
             , subq_5.ds_partitioned__day
             , subq_5.ds_partitioned__week
             , subq_5.ds_partitioned__month
@@ -278,8 +278,8 @@ FROM (
             , subq_5.ds_partitioned__extract_month
             , subq_5.ds_partitioned__extract_week
             , subq_5.ds_partitioned__extract_day
-            , subq_5.ds_partitioned__extract_dayofweek
-            , subq_5.ds_partitioned__extract_dayofyear
+            , subq_5.ds_partitioned__extract_dow
+            , subq_5.ds_partitioned__extract_doy
             , subq_5.paid_at__day
             , subq_5.paid_at__week
             , subq_5.paid_at__month
@@ -290,8 +290,8 @@ FROM (
             , subq_5.paid_at__extract_month
             , subq_5.paid_at__extract_week
             , subq_5.paid_at__extract_day
-            , subq_5.paid_at__extract_dayofweek
-            , subq_5.paid_at__extract_dayofyear
+            , subq_5.paid_at__extract_dow
+            , subq_5.paid_at__extract_doy
             , subq_5.booking__ds__day
             , subq_5.booking__ds__week
             , subq_5.booking__ds__month
@@ -302,8 +302,8 @@ FROM (
             , subq_5.booking__ds__extract_month
             , subq_5.booking__ds__extract_week
             , subq_5.booking__ds__extract_day
-            , subq_5.booking__ds__extract_dayofweek
-            , subq_5.booking__ds__extract_dayofyear
+            , subq_5.booking__ds__extract_dow
+            , subq_5.booking__ds__extract_doy
             , subq_5.booking__ds_partitioned__day
             , subq_5.booking__ds_partitioned__week
             , subq_5.booking__ds_partitioned__month
@@ -314,8 +314,8 @@ FROM (
             , subq_5.booking__ds_partitioned__extract_month
             , subq_5.booking__ds_partitioned__extract_week
             , subq_5.booking__ds_partitioned__extract_day
-            , subq_5.booking__ds_partitioned__extract_dayofweek
-            , subq_5.booking__ds_partitioned__extract_dayofyear
+            , subq_5.booking__ds_partitioned__extract_dow
+            , subq_5.booking__ds_partitioned__extract_doy
             , subq_5.booking__paid_at__day
             , subq_5.booking__paid_at__week
             , subq_5.booking__paid_at__month
@@ -326,8 +326,8 @@ FROM (
             , subq_5.booking__paid_at__extract_month
             , subq_5.booking__paid_at__extract_week
             , subq_5.booking__paid_at__extract_day
-            , subq_5.booking__paid_at__extract_dayofweek
-            , subq_5.booking__paid_at__extract_dayofyear
+            , subq_5.booking__paid_at__extract_dow
+            , subq_5.booking__paid_at__extract_doy
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -338,8 +338,8 @@ FROM (
             , subq_5.ds__extract_month AS metric_time__extract_month
             , subq_5.ds__extract_week AS metric_time__extract_week
             , subq_5.ds__extract_day AS metric_time__extract_day
-            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_5.ds__extract_dow AS metric_time__extract_dow
+            , subq_5.ds__extract_doy AS metric_time__extract_doy
             , subq_5.listing
             , subq_5.guest
             , subq_5.host
@@ -384,74 +384,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
index e2ff275b47..d11a69936d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 13d462ce84..b98d6d0f3d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
index e3607ad97a..9139bc862d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 71e89d4432..0022a4f526 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -37,8 +37,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -49,8 +49,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -61,8 +61,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -73,8 +73,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -85,8 +85,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -97,8 +97,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -109,8 +109,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -155,74 +155,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -267,8 +267,8 @@ FROM (
             , subq_6.ds__extract_month AS ds__extract_month
             , subq_6.ds__extract_week AS ds__extract_week
             , subq_6.ds__extract_day AS ds__extract_day
-            , subq_6.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
             , subq_6.ds_partitioned__day AS ds_partitioned__day
             , subq_6.ds_partitioned__week AS ds_partitioned__week
             , subq_6.ds_partitioned__month AS ds_partitioned__month
@@ -279,8 +279,8 @@ FROM (
             , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_6.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_6.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_6.paid_at__day AS paid_at__day
             , subq_6.paid_at__week AS paid_at__week
             , subq_6.paid_at__month AS paid_at__month
@@ -291,8 +291,8 @@ FROM (
             , subq_6.paid_at__extract_month AS paid_at__extract_month
             , subq_6.paid_at__extract_week AS paid_at__extract_week
             , subq_6.paid_at__extract_day AS paid_at__extract_day
-            , subq_6.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_6.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
             , subq_6.booking__ds__day AS booking__ds__day
             , subq_6.booking__ds__week AS booking__ds__week
             , subq_6.booking__ds__month AS booking__ds__month
@@ -303,8 +303,8 @@ FROM (
             , subq_6.booking__ds__extract_month AS booking__ds__extract_month
             , subq_6.booking__ds__extract_week AS booking__ds__extract_week
             , subq_6.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_6.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_6.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -315,8 +315,8 @@ FROM (
             , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_6.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_6.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_6.booking__paid_at__day AS booking__paid_at__day
             , subq_6.booking__paid_at__week AS booking__paid_at__week
             , subq_6.booking__paid_at__month AS booking__paid_at__month
@@ -327,8 +327,8 @@ FROM (
             , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_6.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_6.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_6.listing AS listing
             , subq_6.guest AS guest
             , subq_6.host AS host
@@ -369,8 +369,8 @@ FROM (
               , subq_5.ds__extract_month
               , subq_5.ds__extract_week
               , subq_5.ds__extract_day
-              , subq_5.ds__extract_dayofweek
-              , subq_5.ds__extract_dayofyear
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
               , subq_5.ds_partitioned__day
               , subq_5.ds_partitioned__week
               , subq_5.ds_partitioned__month
@@ -381,8 +381,8 @@ FROM (
               , subq_5.ds_partitioned__extract_month
               , subq_5.ds_partitioned__extract_week
               , subq_5.ds_partitioned__extract_day
-              , subq_5.ds_partitioned__extract_dayofweek
-              , subq_5.ds_partitioned__extract_dayofyear
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
               , subq_5.paid_at__day
               , subq_5.paid_at__week
               , subq_5.paid_at__month
@@ -393,8 +393,8 @@ FROM (
               , subq_5.paid_at__extract_month
               , subq_5.paid_at__extract_week
               , subq_5.paid_at__extract_day
-              , subq_5.paid_at__extract_dayofweek
-              , subq_5.paid_at__extract_dayofyear
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
               , subq_5.booking__ds__day
               , subq_5.booking__ds__week
               , subq_5.booking__ds__month
@@ -405,8 +405,8 @@ FROM (
               , subq_5.booking__ds__extract_month
               , subq_5.booking__ds__extract_week
               , subq_5.booking__ds__extract_day
-              , subq_5.booking__ds__extract_dayofweek
-              , subq_5.booking__ds__extract_dayofyear
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
               , subq_5.booking__ds_partitioned__day
               , subq_5.booking__ds_partitioned__week
               , subq_5.booking__ds_partitioned__month
@@ -417,8 +417,8 @@ FROM (
               , subq_5.booking__ds_partitioned__extract_month
               , subq_5.booking__ds_partitioned__extract_week
               , subq_5.booking__ds_partitioned__extract_day
-              , subq_5.booking__ds_partitioned__extract_dayofweek
-              , subq_5.booking__ds_partitioned__extract_dayofyear
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
               , subq_5.booking__paid_at__day
               , subq_5.booking__paid_at__week
               , subq_5.booking__paid_at__month
@@ -429,8 +429,8 @@ FROM (
               , subq_5.booking__paid_at__extract_month
               , subq_5.booking__paid_at__extract_week
               , subq_5.booking__paid_at__extract_day
-              , subq_5.booking__paid_at__extract_dayofweek
-              , subq_5.booking__paid_at__extract_dayofyear
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
               , subq_5.ds__day AS metric_time__day
               , subq_5.ds__week AS metric_time__week
               , subq_5.ds__month AS metric_time__month
@@ -441,8 +441,8 @@ FROM (
               , subq_5.ds__extract_month AS metric_time__extract_month
               , subq_5.ds__extract_week AS metric_time__extract_week
               , subq_5.ds__extract_day AS metric_time__extract_day
-              , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
               , subq_5.listing
               , subq_5.guest
               , subq_5.host
@@ -487,74 +487,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 9967c13e88..10bb6c0450 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -38,8 +38,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -50,8 +50,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -62,8 +62,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -74,8 +74,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -86,8 +86,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -98,8 +98,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -140,8 +140,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -152,8 +152,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -164,8 +164,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -176,8 +176,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -188,8 +188,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -200,8 +200,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -212,8 +212,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -258,74 +258,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -373,8 +373,8 @@ FROM (
             , subq_9.ds__extract_month AS ds__extract_month
             , subq_9.ds__extract_week AS ds__extract_week
             , subq_9.ds__extract_day AS ds__extract_day
-            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_9.ds__extract_dow AS ds__extract_dow
+            , subq_9.ds__extract_doy AS ds__extract_doy
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
@@ -385,8 +385,8 @@ FROM (
             , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_9.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_9.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
@@ -397,8 +397,8 @@ FROM (
             , subq_9.paid_at__extract_month AS paid_at__extract_month
             , subq_9.paid_at__extract_week AS paid_at__extract_week
             , subq_9.paid_at__extract_day AS paid_at__extract_day
-            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_9.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_9.paid_at__extract_doy AS paid_at__extract_doy
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
@@ -409,8 +409,8 @@ FROM (
             , subq_9.booking__ds__extract_month AS booking__ds__extract_month
             , subq_9.booking__ds__extract_week AS booking__ds__extract_week
             , subq_9.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_9.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_9.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -421,8 +421,8 @@ FROM (
             , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_9.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_9.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
@@ -433,8 +433,8 @@ FROM (
             , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_9.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_9.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -475,8 +475,8 @@ FROM (
               , subq_8.ds__extract_month
               , subq_8.ds__extract_week
               , subq_8.ds__extract_day
-              , subq_8.ds__extract_dayofweek
-              , subq_8.ds__extract_dayofyear
+              , subq_8.ds__extract_dow
+              , subq_8.ds__extract_doy
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
@@ -487,8 +487,8 @@ FROM (
               , subq_8.ds_partitioned__extract_month
               , subq_8.ds_partitioned__extract_week
               , subq_8.ds_partitioned__extract_day
-              , subq_8.ds_partitioned__extract_dayofweek
-              , subq_8.ds_partitioned__extract_dayofyear
+              , subq_8.ds_partitioned__extract_dow
+              , subq_8.ds_partitioned__extract_doy
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
@@ -499,8 +499,8 @@ FROM (
               , subq_8.paid_at__extract_month
               , subq_8.paid_at__extract_week
               , subq_8.paid_at__extract_day
-              , subq_8.paid_at__extract_dayofweek
-              , subq_8.paid_at__extract_dayofyear
+              , subq_8.paid_at__extract_dow
+              , subq_8.paid_at__extract_doy
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
@@ -511,8 +511,8 @@ FROM (
               , subq_8.booking__ds__extract_month
               , subq_8.booking__ds__extract_week
               , subq_8.booking__ds__extract_day
-              , subq_8.booking__ds__extract_dayofweek
-              , subq_8.booking__ds__extract_dayofyear
+              , subq_8.booking__ds__extract_dow
+              , subq_8.booking__ds__extract_doy
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
@@ -523,8 +523,8 @@ FROM (
               , subq_8.booking__ds_partitioned__extract_month
               , subq_8.booking__ds_partitioned__extract_week
               , subq_8.booking__ds_partitioned__extract_day
-              , subq_8.booking__ds_partitioned__extract_dayofweek
-              , subq_8.booking__ds_partitioned__extract_dayofyear
+              , subq_8.booking__ds_partitioned__extract_dow
+              , subq_8.booking__ds_partitioned__extract_doy
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
@@ -535,8 +535,8 @@ FROM (
               , subq_8.booking__paid_at__extract_month
               , subq_8.booking__paid_at__extract_week
               , subq_8.booking__paid_at__extract_day
-              , subq_8.booking__paid_at__extract_dayofweek
-              , subq_8.booking__paid_at__extract_dayofyear
+              , subq_8.booking__paid_at__extract_dow
+              , subq_8.booking__paid_at__extract_doy
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -547,8 +547,8 @@ FROM (
               , subq_8.ds__extract_month AS metric_time__extract_month
               , subq_8.ds__extract_week AS metric_time__extract_week
               , subq_8.ds__extract_day AS metric_time__extract_day
-              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_8.ds__extract_dow AS metric_time__extract_dow
+              , subq_8.ds__extract_doy AS metric_time__extract_doy
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
@@ -593,74 +593,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index b76e01d113..1aaa96b40a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -38,8 +38,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -50,8 +50,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -62,8 +62,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -74,8 +74,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -86,8 +86,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -98,8 +98,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -140,8 +140,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -152,8 +152,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -164,8 +164,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -176,8 +176,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -188,8 +188,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -200,8 +200,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -212,8 +212,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -258,74 +258,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -374,8 +374,8 @@ FROM (
             , subq_9.ds__extract_month AS ds__extract_month
             , subq_9.ds__extract_week AS ds__extract_week
             , subq_9.ds__extract_day AS ds__extract_day
-            , subq_9.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_9.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_9.ds__extract_dow AS ds__extract_dow
+            , subq_9.ds__extract_doy AS ds__extract_doy
             , subq_9.ds_partitioned__day AS ds_partitioned__day
             , subq_9.ds_partitioned__week AS ds_partitioned__week
             , subq_9.ds_partitioned__month AS ds_partitioned__month
@@ -386,8 +386,8 @@ FROM (
             , subq_9.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_9.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_9.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_9.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_9.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_9.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_9.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_9.paid_at__day AS paid_at__day
             , subq_9.paid_at__week AS paid_at__week
             , subq_9.paid_at__month AS paid_at__month
@@ -398,8 +398,8 @@ FROM (
             , subq_9.paid_at__extract_month AS paid_at__extract_month
             , subq_9.paid_at__extract_week AS paid_at__extract_week
             , subq_9.paid_at__extract_day AS paid_at__extract_day
-            , subq_9.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_9.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_9.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_9.paid_at__extract_doy AS paid_at__extract_doy
             , subq_9.booking__ds__day AS booking__ds__day
             , subq_9.booking__ds__week AS booking__ds__week
             , subq_9.booking__ds__month AS booking__ds__month
@@ -410,8 +410,8 @@ FROM (
             , subq_9.booking__ds__extract_month AS booking__ds__extract_month
             , subq_9.booking__ds__extract_week AS booking__ds__extract_week
             , subq_9.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_9.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_9.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_9.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_9.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_9.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_9.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_9.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -422,8 +422,8 @@ FROM (
             , subq_9.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_9.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_9.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_9.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_9.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_9.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_9.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_9.booking__paid_at__day AS booking__paid_at__day
             , subq_9.booking__paid_at__week AS booking__paid_at__week
             , subq_9.booking__paid_at__month AS booking__paid_at__month
@@ -434,8 +434,8 @@ FROM (
             , subq_9.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_9.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_9.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_9.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_9.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_9.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_9.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_9.listing AS listing
             , subq_9.guest AS guest
             , subq_9.host AS host
@@ -476,8 +476,8 @@ FROM (
               , subq_8.ds__extract_month
               , subq_8.ds__extract_week
               , subq_8.ds__extract_day
-              , subq_8.ds__extract_dayofweek
-              , subq_8.ds__extract_dayofyear
+              , subq_8.ds__extract_dow
+              , subq_8.ds__extract_doy
               , subq_8.ds_partitioned__day
               , subq_8.ds_partitioned__week
               , subq_8.ds_partitioned__month
@@ -488,8 +488,8 @@ FROM (
               , subq_8.ds_partitioned__extract_month
               , subq_8.ds_partitioned__extract_week
               , subq_8.ds_partitioned__extract_day
-              , subq_8.ds_partitioned__extract_dayofweek
-              , subq_8.ds_partitioned__extract_dayofyear
+              , subq_8.ds_partitioned__extract_dow
+              , subq_8.ds_partitioned__extract_doy
               , subq_8.paid_at__day
               , subq_8.paid_at__week
               , subq_8.paid_at__month
@@ -500,8 +500,8 @@ FROM (
               , subq_8.paid_at__extract_month
               , subq_8.paid_at__extract_week
               , subq_8.paid_at__extract_day
-              , subq_8.paid_at__extract_dayofweek
-              , subq_8.paid_at__extract_dayofyear
+              , subq_8.paid_at__extract_dow
+              , subq_8.paid_at__extract_doy
               , subq_8.booking__ds__day
               , subq_8.booking__ds__week
               , subq_8.booking__ds__month
@@ -512,8 +512,8 @@ FROM (
               , subq_8.booking__ds__extract_month
               , subq_8.booking__ds__extract_week
               , subq_8.booking__ds__extract_day
-              , subq_8.booking__ds__extract_dayofweek
-              , subq_8.booking__ds__extract_dayofyear
+              , subq_8.booking__ds__extract_dow
+              , subq_8.booking__ds__extract_doy
               , subq_8.booking__ds_partitioned__day
               , subq_8.booking__ds_partitioned__week
               , subq_8.booking__ds_partitioned__month
@@ -524,8 +524,8 @@ FROM (
               , subq_8.booking__ds_partitioned__extract_month
               , subq_8.booking__ds_partitioned__extract_week
               , subq_8.booking__ds_partitioned__extract_day
-              , subq_8.booking__ds_partitioned__extract_dayofweek
-              , subq_8.booking__ds_partitioned__extract_dayofyear
+              , subq_8.booking__ds_partitioned__extract_dow
+              , subq_8.booking__ds_partitioned__extract_doy
               , subq_8.booking__paid_at__day
               , subq_8.booking__paid_at__week
               , subq_8.booking__paid_at__month
@@ -536,8 +536,8 @@ FROM (
               , subq_8.booking__paid_at__extract_month
               , subq_8.booking__paid_at__extract_week
               , subq_8.booking__paid_at__extract_day
-              , subq_8.booking__paid_at__extract_dayofweek
-              , subq_8.booking__paid_at__extract_dayofyear
+              , subq_8.booking__paid_at__extract_dow
+              , subq_8.booking__paid_at__extract_doy
               , subq_8.ds__day AS metric_time__day
               , subq_8.ds__week AS metric_time__week
               , subq_8.ds__month AS metric_time__month
@@ -548,8 +548,8 @@ FROM (
               , subq_8.ds__extract_month AS metric_time__extract_month
               , subq_8.ds__extract_week AS metric_time__extract_week
               , subq_8.ds__extract_day AS metric_time__extract_day
-              , subq_8.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_8.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_8.ds__extract_dow AS metric_time__extract_dow
+              , subq_8.ds__extract_doy AS metric_time__extract_doy
               , subq_8.listing
               , subq_8.guest
               , subq_8.host
@@ -594,74 +594,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
index 615aae3ac7..3107752f3d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_4.ds__extract_month AS ds__extract_month
           , subq_4.ds__extract_week AS ds__extract_week
           , subq_4.ds__extract_day AS ds__extract_day
-          , subq_4.ds__extract_dayofweek AS ds__extract_dayofweek
-          , subq_4.ds__extract_dayofyear AS ds__extract_dayofyear
+          , subq_4.ds__extract_dow AS ds__extract_dow
+          , subq_4.ds__extract_doy AS ds__extract_doy
           , subq_4.ds_partitioned__day AS ds_partitioned__day
           , subq_4.ds_partitioned__week AS ds_partitioned__week
           , subq_4.ds_partitioned__month AS ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_4.ds_partitioned__extract_month AS ds_partitioned__extract_month
           , subq_4.ds_partitioned__extract_week AS ds_partitioned__extract_week
           , subq_4.ds_partitioned__extract_day AS ds_partitioned__extract_day
-          , subq_4.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-          , subq_4.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+          , subq_4.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+          , subq_4.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
           , subq_4.paid_at__day AS paid_at__day
           , subq_4.paid_at__week AS paid_at__week
           , subq_4.paid_at__month AS paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_4.paid_at__extract_month AS paid_at__extract_month
           , subq_4.paid_at__extract_week AS paid_at__extract_week
           , subq_4.paid_at__extract_day AS paid_at__extract_day
-          , subq_4.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-          , subq_4.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+          , subq_4.paid_at__extract_dow AS paid_at__extract_dow
+          , subq_4.paid_at__extract_doy AS paid_at__extract_doy
           , subq_4.booking__ds__day AS booking__ds__day
           , subq_4.booking__ds__week AS booking__ds__week
           , subq_4.booking__ds__month AS booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_4.booking__ds__extract_month AS booking__ds__extract_month
           , subq_4.booking__ds__extract_week AS booking__ds__extract_week
           , subq_4.booking__ds__extract_day AS booking__ds__extract_day
-          , subq_4.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-          , subq_4.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+          , subq_4.booking__ds__extract_dow AS booking__ds__extract_dow
+          , subq_4.booking__ds__extract_doy AS booking__ds__extract_doy
           , subq_4.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_4.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_4.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_4.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
           , subq_4.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
           , subq_4.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-          , subq_4.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-          , subq_4.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+          , subq_4.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+          , subq_4.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
           , subq_4.booking__paid_at__day AS booking__paid_at__day
           , subq_4.booking__paid_at__week AS booking__paid_at__week
           , subq_4.booking__paid_at__month AS booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_4.booking__paid_at__extract_month AS booking__paid_at__extract_month
           , subq_4.booking__paid_at__extract_week AS booking__paid_at__extract_week
           , subq_4.booking__paid_at__extract_day AS booking__paid_at__extract_day
-          , subq_4.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-          , subq_4.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+          , subq_4.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+          , subq_4.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
           , subq_4.listing AS listing
           , subq_4.guest AS guest
           , subq_4.host AS host
@@ -135,8 +135,8 @@ FROM (
             , subq_1.ds__extract_month AS ds__extract_month
             , subq_1.ds__extract_week AS ds__extract_week
             , subq_1.ds__extract_day AS ds__extract_day
-            , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-            , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+            , subq_1.ds__extract_dow AS ds__extract_dow
+            , subq_1.ds__extract_doy AS ds__extract_doy
             , subq_1.ds_partitioned__day AS ds_partitioned__day
             , subq_1.ds_partitioned__week AS ds_partitioned__week
             , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -147,8 +147,8 @@ FROM (
             , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_1.paid_at__day AS paid_at__day
             , subq_1.paid_at__week AS paid_at__week
             , subq_1.paid_at__month AS paid_at__month
@@ -159,8 +159,8 @@ FROM (
             , subq_1.paid_at__extract_month AS paid_at__extract_month
             , subq_1.paid_at__extract_week AS paid_at__extract_week
             , subq_1.paid_at__extract_day AS paid_at__extract_day
-            , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-            , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+            , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_1.paid_at__extract_doy AS paid_at__extract_doy
             , subq_1.booking__ds__day AS booking__ds__day
             , subq_1.booking__ds__week AS booking__ds__week
             , subq_1.booking__ds__month AS booking__ds__month
@@ -171,8 +171,8 @@ FROM (
             , subq_1.booking__ds__extract_month AS booking__ds__extract_month
             , subq_1.booking__ds__extract_week AS booking__ds__extract_week
             , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-            , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-            , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+            , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
             , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
             , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
             , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -183,8 +183,8 @@ FROM (
             , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
             , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
             , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-            , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-            , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+            , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
             , subq_1.booking__paid_at__day AS booking__paid_at__day
             , subq_1.booking__paid_at__week AS booking__paid_at__week
             , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -195,8 +195,8 @@ FROM (
             , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
             , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
             , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-            , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-            , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+            , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
             , subq_1.metric_time__week AS metric_time__week
             , subq_1.metric_time__month AS metric_time__month
             , subq_1.metric_time__quarter AS metric_time__quarter
@@ -206,8 +206,8 @@ FROM (
             , subq_1.metric_time__extract_month AS metric_time__extract_month
             , subq_1.metric_time__extract_week AS metric_time__extract_week
             , subq_1.metric_time__extract_day AS metric_time__extract_day
-            , subq_1.metric_time__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_1.metric_time__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_1.metric_time__extract_dow AS metric_time__extract_dow
+            , subq_1.metric_time__extract_doy AS metric_time__extract_doy
             , subq_1.listing AS listing
             , subq_1.guest AS guest
             , subq_1.host AS host
@@ -248,8 +248,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -260,8 +260,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -272,8 +272,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -284,8 +284,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -296,8 +296,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -308,8 +308,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -320,8 +320,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -366,74 +366,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 6f115474ac..666e2d3376 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_1.ds__extract_month AS ds__extract_month
           , subq_1.ds__extract_week AS ds__extract_week
           , subq_1.ds__extract_day AS ds__extract_day
-          , subq_1.ds__extract_dayofweek AS ds__extract_dayofweek
-          , subq_1.ds__extract_dayofyear AS ds__extract_dayofyear
+          , subq_1.ds__extract_dow AS ds__extract_dow
+          , subq_1.ds__extract_doy AS ds__extract_doy
           , subq_1.ds_partitioned__day AS ds_partitioned__day
           , subq_1.ds_partitioned__week AS ds_partitioned__week
           , subq_1.ds_partitioned__month AS ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_1.ds_partitioned__extract_month AS ds_partitioned__extract_month
           , subq_1.ds_partitioned__extract_week AS ds_partitioned__extract_week
           , subq_1.ds_partitioned__extract_day AS ds_partitioned__extract_day
-          , subq_1.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-          , subq_1.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+          , subq_1.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+          , subq_1.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
           , subq_1.paid_at__day AS paid_at__day
           , subq_1.paid_at__week AS paid_at__week
           , subq_1.paid_at__month AS paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_1.paid_at__extract_month AS paid_at__extract_month
           , subq_1.paid_at__extract_week AS paid_at__extract_week
           , subq_1.paid_at__extract_day AS paid_at__extract_day
-          , subq_1.paid_at__extract_dayofweek AS paid_at__extract_dayofweek
-          , subq_1.paid_at__extract_dayofyear AS paid_at__extract_dayofyear
+          , subq_1.paid_at__extract_dow AS paid_at__extract_dow
+          , subq_1.paid_at__extract_doy AS paid_at__extract_doy
           , subq_1.booking__ds__day AS booking__ds__day
           , subq_1.booking__ds__week AS booking__ds__week
           , subq_1.booking__ds__month AS booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_1.booking__ds__extract_month AS booking__ds__extract_month
           , subq_1.booking__ds__extract_week AS booking__ds__extract_week
           , subq_1.booking__ds__extract_day AS booking__ds__extract_day
-          , subq_1.booking__ds__extract_dayofweek AS booking__ds__extract_dayofweek
-          , subq_1.booking__ds__extract_dayofyear AS booking__ds__extract_dayofyear
+          , subq_1.booking__ds__extract_dow AS booking__ds__extract_dow
+          , subq_1.booking__ds__extract_doy AS booking__ds__extract_doy
           , subq_1.booking__ds_partitioned__day AS booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week AS booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month AS booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_1.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
           , subq_1.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
           , subq_1.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
-          , subq_1.booking__ds_partitioned__extract_dayofweek AS booking__ds_partitioned__extract_dayofweek
-          , subq_1.booking__ds_partitioned__extract_dayofyear AS booking__ds_partitioned__extract_dayofyear
+          , subq_1.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+          , subq_1.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
           , subq_1.booking__paid_at__day AS booking__paid_at__day
           , subq_1.booking__paid_at__week AS booking__paid_at__week
           , subq_1.booking__paid_at__month AS booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_1.booking__paid_at__extract_month AS booking__paid_at__extract_month
           , subq_1.booking__paid_at__extract_week AS booking__paid_at__extract_week
           , subq_1.booking__paid_at__extract_day AS booking__paid_at__extract_day
-          , subq_1.booking__paid_at__extract_dayofweek AS booking__paid_at__extract_dayofweek
-          , subq_1.booking__paid_at__extract_dayofyear AS booking__paid_at__extract_dayofyear
+          , subq_1.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+          , subq_1.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
           , subq_1.listing AS listing
           , subq_1.guest AS guest
           , subq_1.host AS host
@@ -134,8 +134,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -146,8 +146,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -158,8 +158,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -170,8 +170,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -182,8 +182,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -194,8 +194,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -206,8 +206,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -252,74 +252,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql
index 693e200db3..40f6785af3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_distinct_values__plan0.sql
@@ -47,8 +47,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -59,8 +59,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -71,8 +71,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -83,8 +83,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -95,8 +95,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -107,8 +107,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -119,8 +119,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -165,74 +165,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -262,8 +262,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -274,8 +274,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -286,8 +286,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -298,8 +298,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -310,8 +310,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -335,25 +335,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -362,25 +362,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql
index 00efad0383..a43457fcbd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_node__plan0.sql
@@ -25,74 +25,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql
index 7e0fdff19e..a3ce23fb89 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_node__plan0.sql
@@ -31,74 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 1a6844636c..70919d8caa 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -53,8 +53,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -65,8 +65,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -77,8 +77,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -89,8 +89,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -101,8 +101,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -113,8 +113,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -125,8 +125,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -171,74 +171,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -268,8 +268,8 @@ FROM (
                 , subq_3.ds__extract_month
                 , subq_3.ds__extract_week
                 , subq_3.ds__extract_day
-                , subq_3.ds__extract_dayofweek
-                , subq_3.ds__extract_dayofyear
+                , subq_3.ds__extract_dow
+                , subq_3.ds__extract_doy
                 , subq_3.created_at__day
                 , subq_3.created_at__week
                 , subq_3.created_at__month
@@ -280,8 +280,8 @@ FROM (
                 , subq_3.created_at__extract_month
                 , subq_3.created_at__extract_week
                 , subq_3.created_at__extract_day
-                , subq_3.created_at__extract_dayofweek
-                , subq_3.created_at__extract_dayofyear
+                , subq_3.created_at__extract_dow
+                , subq_3.created_at__extract_doy
                 , subq_3.listing__ds__day
                 , subq_3.listing__ds__week
                 , subq_3.listing__ds__month
@@ -292,8 +292,8 @@ FROM (
                 , subq_3.listing__ds__extract_month
                 , subq_3.listing__ds__extract_week
                 , subq_3.listing__ds__extract_day
-                , subq_3.listing__ds__extract_dayofweek
-                , subq_3.listing__ds__extract_dayofyear
+                , subq_3.listing__ds__extract_dow
+                , subq_3.listing__ds__extract_doy
                 , subq_3.listing__created_at__day
                 , subq_3.listing__created_at__week
                 , subq_3.listing__created_at__month
@@ -304,8 +304,8 @@ FROM (
                 , subq_3.listing__created_at__extract_month
                 , subq_3.listing__created_at__extract_week
                 , subq_3.listing__created_at__extract_day
-                , subq_3.listing__created_at__extract_dayofweek
-                , subq_3.listing__created_at__extract_dayofyear
+                , subq_3.listing__created_at__extract_dow
+                , subq_3.listing__created_at__extract_doy
                 , subq_3.ds__day AS metric_time__day
                 , subq_3.ds__week AS metric_time__week
                 , subq_3.ds__month AS metric_time__month
@@ -316,8 +316,8 @@ FROM (
                 , subq_3.ds__extract_month AS metric_time__extract_month
                 , subq_3.ds__extract_week AS metric_time__extract_week
                 , subq_3.ds__extract_day AS metric_time__extract_day
-                , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_3.ds__extract_dow AS metric_time__extract_dow
+                , subq_3.ds__extract_doy AS metric_time__extract_doy
                 , subq_3.listing
                 , subq_3.user
                 , subq_3.listing__user
@@ -341,25 +341,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -368,25 +368,25 @@ FROM (
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                   , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                   , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                   , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                  , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                  , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                  , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                  , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                  , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                  , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                  , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                  , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                  , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
index 5712e1d25c..6e4488a729 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_scd_dimension__plan0.sql
@@ -55,8 +55,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -67,8 +67,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -79,8 +79,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -91,8 +91,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -103,8 +103,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -115,8 +115,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -127,8 +127,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -159,74 +159,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -255,25 +255,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_from) AS window_start__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_from) AS window_start__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_from) AS window_start__extract_doy
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_to) AS window_end__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_to) AS window_end__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_to) AS window_end__extract_doy
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -282,25 +282,25 @@ FROM (
                 , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
                 , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
                 , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
                 , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
-                , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
-                , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
-                , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-                , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
-                , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
+                , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+                , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+                , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+                , EXTRACT(week FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+                , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+                , EXTRACT(dow FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+                , EXTRACT(doy FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index 141c4fba09..9f23719b49 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
index a2adc126d3..1c6b0467ff 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
index 7c85ab1cdb..2093e49b0b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -42,8 +42,8 @@ INNER JOIN (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -54,8 +54,8 @@ INNER JOIN (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -66,8 +66,8 @@ INNER JOIN (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -78,8 +78,8 @@ INNER JOIN (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -90,8 +90,8 @@ INNER JOIN (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -102,8 +102,8 @@ INNER JOIN (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -114,8 +114,8 @@ INNER JOIN (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -160,74 +160,74 @@ INNER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql
index e89a957806..eb506ddf59 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_limit_rows__plan0.sql
@@ -31,8 +31,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -43,8 +43,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -55,8 +55,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -67,8 +67,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -79,8 +79,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -91,8 +91,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -103,8 +103,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -149,74 +149,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
index 436f0e7545..d5688f0e2d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_local_dimension_using_local_entity__plan0.sql
@@ -26,8 +26,8 @@ FROM (
         , subq_0.ds__extract_month
         , subq_0.ds__extract_week
         , subq_0.ds__extract_day
-        , subq_0.ds__extract_dayofweek
-        , subq_0.ds__extract_dayofyear
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
         , subq_0.created_at__day
         , subq_0.created_at__week
         , subq_0.created_at__month
@@ -38,8 +38,8 @@ FROM (
         , subq_0.created_at__extract_month
         , subq_0.created_at__extract_week
         , subq_0.created_at__extract_day
-        , subq_0.created_at__extract_dayofweek
-        , subq_0.created_at__extract_dayofyear
+        , subq_0.created_at__extract_dow
+        , subq_0.created_at__extract_doy
         , subq_0.listing__ds__day
         , subq_0.listing__ds__week
         , subq_0.listing__ds__month
@@ -50,8 +50,8 @@ FROM (
         , subq_0.listing__ds__extract_month
         , subq_0.listing__ds__extract_week
         , subq_0.listing__ds__extract_day
-        , subq_0.listing__ds__extract_dayofweek
-        , subq_0.listing__ds__extract_dayofyear
+        , subq_0.listing__ds__extract_dow
+        , subq_0.listing__ds__extract_doy
         , subq_0.listing__created_at__day
         , subq_0.listing__created_at__week
         , subq_0.listing__created_at__month
@@ -62,8 +62,8 @@ FROM (
         , subq_0.listing__created_at__extract_month
         , subq_0.listing__created_at__extract_week
         , subq_0.listing__created_at__extract_day
-        , subq_0.listing__created_at__extract_dayofweek
-        , subq_0.listing__created_at__extract_dayofyear
+        , subq_0.listing__created_at__extract_dow
+        , subq_0.listing__created_at__extract_doy
         , subq_0.ds__day AS metric_time__day
         , subq_0.ds__week AS metric_time__week
         , subq_0.ds__month AS metric_time__month
@@ -74,8 +74,8 @@ FROM (
         , subq_0.ds__extract_month AS metric_time__extract_month
         , subq_0.ds__extract_week AS metric_time__extract_week
         , subq_0.ds__extract_day AS metric_time__extract_day
-        , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-        , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
         , subq_0.listing
         , subq_0.user
         , subq_0.listing__user
@@ -99,25 +99,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -126,25 +126,25 @@ FROM (
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
           , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
           , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
           , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-          , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-          , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-          , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-          , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+          , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+          , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+          , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+          , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+          , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql
index b05da97264..dbfcb34b94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_aggregation_node__plan0.sql
@@ -35,74 +35,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql
index 9223eebd6e..e5349b0d17 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint__plan0.sql
@@ -65,8 +65,8 @@ FROM (
                     , subq_0.ds__extract_month
                     , subq_0.ds__extract_week
                     , subq_0.ds__extract_day
-                    , subq_0.ds__extract_dayofweek
-                    , subq_0.ds__extract_dayofyear
+                    , subq_0.ds__extract_dow
+                    , subq_0.ds__extract_doy
                     , subq_0.ds_partitioned__day
                     , subq_0.ds_partitioned__week
                     , subq_0.ds_partitioned__month
@@ -77,8 +77,8 @@ FROM (
                     , subq_0.ds_partitioned__extract_month
                     , subq_0.ds_partitioned__extract_week
                     , subq_0.ds_partitioned__extract_day
-                    , subq_0.ds_partitioned__extract_dayofweek
-                    , subq_0.ds_partitioned__extract_dayofyear
+                    , subq_0.ds_partitioned__extract_dow
+                    , subq_0.ds_partitioned__extract_doy
                     , subq_0.paid_at__day
                     , subq_0.paid_at__week
                     , subq_0.paid_at__month
@@ -89,8 +89,8 @@ FROM (
                     , subq_0.paid_at__extract_month
                     , subq_0.paid_at__extract_week
                     , subq_0.paid_at__extract_day
-                    , subq_0.paid_at__extract_dayofweek
-                    , subq_0.paid_at__extract_dayofyear
+                    , subq_0.paid_at__extract_dow
+                    , subq_0.paid_at__extract_doy
                     , subq_0.booking__ds__day
                     , subq_0.booking__ds__week
                     , subq_0.booking__ds__month
@@ -101,8 +101,8 @@ FROM (
                     , subq_0.booking__ds__extract_month
                     , subq_0.booking__ds__extract_week
                     , subq_0.booking__ds__extract_day
-                    , subq_0.booking__ds__extract_dayofweek
-                    , subq_0.booking__ds__extract_dayofyear
+                    , subq_0.booking__ds__extract_dow
+                    , subq_0.booking__ds__extract_doy
                     , subq_0.booking__ds_partitioned__day
                     , subq_0.booking__ds_partitioned__week
                     , subq_0.booking__ds_partitioned__month
@@ -113,8 +113,8 @@ FROM (
                     , subq_0.booking__ds_partitioned__extract_month
                     , subq_0.booking__ds_partitioned__extract_week
                     , subq_0.booking__ds_partitioned__extract_day
-                    , subq_0.booking__ds_partitioned__extract_dayofweek
-                    , subq_0.booking__ds_partitioned__extract_dayofyear
+                    , subq_0.booking__ds_partitioned__extract_dow
+                    , subq_0.booking__ds_partitioned__extract_doy
                     , subq_0.booking__paid_at__day
                     , subq_0.booking__paid_at__week
                     , subq_0.booking__paid_at__month
@@ -125,8 +125,8 @@ FROM (
                     , subq_0.booking__paid_at__extract_month
                     , subq_0.booking__paid_at__extract_week
                     , subq_0.booking__paid_at__extract_day
-                    , subq_0.booking__paid_at__extract_dayofweek
-                    , subq_0.booking__paid_at__extract_dayofyear
+                    , subq_0.booking__paid_at__extract_dow
+                    , subq_0.booking__paid_at__extract_doy
                     , subq_0.ds__day AS metric_time__day
                     , subq_0.ds__week AS metric_time__week
                     , subq_0.ds__month AS metric_time__month
@@ -137,8 +137,8 @@ FROM (
                     , subq_0.ds__extract_month AS metric_time__extract_month
                     , subq_0.ds__extract_week AS metric_time__extract_week
                     , subq_0.ds__extract_day AS metric_time__extract_day
-                    , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_0.ds__extract_dow AS metric_time__extract_dow
+                    , subq_0.ds__extract_doy AS metric_time__extract_doy
                     , subq_0.listing
                     , subq_0.guest
                     , subq_0.host
@@ -183,74 +183,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -280,8 +280,8 @@ FROM (
                     , subq_3.ds__extract_month
                     , subq_3.ds__extract_week
                     , subq_3.ds__extract_day
-                    , subq_3.ds__extract_dayofweek
-                    , subq_3.ds__extract_dayofyear
+                    , subq_3.ds__extract_dow
+                    , subq_3.ds__extract_doy
                     , subq_3.created_at__day
                     , subq_3.created_at__week
                     , subq_3.created_at__month
@@ -292,8 +292,8 @@ FROM (
                     , subq_3.created_at__extract_month
                     , subq_3.created_at__extract_week
                     , subq_3.created_at__extract_day
-                    , subq_3.created_at__extract_dayofweek
-                    , subq_3.created_at__extract_dayofyear
+                    , subq_3.created_at__extract_dow
+                    , subq_3.created_at__extract_doy
                     , subq_3.listing__ds__day
                     , subq_3.listing__ds__week
                     , subq_3.listing__ds__month
@@ -304,8 +304,8 @@ FROM (
                     , subq_3.listing__ds__extract_month
                     , subq_3.listing__ds__extract_week
                     , subq_3.listing__ds__extract_day
-                    , subq_3.listing__ds__extract_dayofweek
-                    , subq_3.listing__ds__extract_dayofyear
+                    , subq_3.listing__ds__extract_dow
+                    , subq_3.listing__ds__extract_doy
                     , subq_3.listing__created_at__day
                     , subq_3.listing__created_at__week
                     , subq_3.listing__created_at__month
@@ -316,8 +316,8 @@ FROM (
                     , subq_3.listing__created_at__extract_month
                     , subq_3.listing__created_at__extract_week
                     , subq_3.listing__created_at__extract_day
-                    , subq_3.listing__created_at__extract_dayofweek
-                    , subq_3.listing__created_at__extract_dayofyear
+                    , subq_3.listing__created_at__extract_dow
+                    , subq_3.listing__created_at__extract_doy
                     , subq_3.ds__day AS metric_time__day
                     , subq_3.ds__week AS metric_time__week
                     , subq_3.ds__month AS metric_time__month
@@ -328,8 +328,8 @@ FROM (
                     , subq_3.ds__extract_month AS metric_time__extract_month
                     , subq_3.ds__extract_week AS metric_time__extract_week
                     , subq_3.ds__extract_day AS metric_time__extract_day
-                    , subq_3.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_3.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_3.ds__extract_dow AS metric_time__extract_dow
+                    , subq_3.ds__extract_doy AS metric_time__extract_doy
                     , subq_3.listing
                     , subq_3.user
                     , subq_3.listing__user
@@ -353,25 +353,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -380,25 +380,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -476,8 +476,8 @@ FROM (
                     , subq_12.ds__extract_month
                     , subq_12.ds__extract_week
                     , subq_12.ds__extract_day
-                    , subq_12.ds__extract_dayofweek
-                    , subq_12.ds__extract_dayofyear
+                    , subq_12.ds__extract_dow
+                    , subq_12.ds__extract_doy
                     , subq_12.ds_partitioned__day
                     , subq_12.ds_partitioned__week
                     , subq_12.ds_partitioned__month
@@ -488,8 +488,8 @@ FROM (
                     , subq_12.ds_partitioned__extract_month
                     , subq_12.ds_partitioned__extract_week
                     , subq_12.ds_partitioned__extract_day
-                    , subq_12.ds_partitioned__extract_dayofweek
-                    , subq_12.ds_partitioned__extract_dayofyear
+                    , subq_12.ds_partitioned__extract_dow
+                    , subq_12.ds_partitioned__extract_doy
                     , subq_12.paid_at__day
                     , subq_12.paid_at__week
                     , subq_12.paid_at__month
@@ -500,8 +500,8 @@ FROM (
                     , subq_12.paid_at__extract_month
                     , subq_12.paid_at__extract_week
                     , subq_12.paid_at__extract_day
-                    , subq_12.paid_at__extract_dayofweek
-                    , subq_12.paid_at__extract_dayofyear
+                    , subq_12.paid_at__extract_dow
+                    , subq_12.paid_at__extract_doy
                     , subq_12.booking__ds__day
                     , subq_12.booking__ds__week
                     , subq_12.booking__ds__month
@@ -512,8 +512,8 @@ FROM (
                     , subq_12.booking__ds__extract_month
                     , subq_12.booking__ds__extract_week
                     , subq_12.booking__ds__extract_day
-                    , subq_12.booking__ds__extract_dayofweek
-                    , subq_12.booking__ds__extract_dayofyear
+                    , subq_12.booking__ds__extract_dow
+                    , subq_12.booking__ds__extract_doy
                     , subq_12.booking__ds_partitioned__day
                     , subq_12.booking__ds_partitioned__week
                     , subq_12.booking__ds_partitioned__month
@@ -524,8 +524,8 @@ FROM (
                     , subq_12.booking__ds_partitioned__extract_month
                     , subq_12.booking__ds_partitioned__extract_week
                     , subq_12.booking__ds_partitioned__extract_day
-                    , subq_12.booking__ds_partitioned__extract_dayofweek
-                    , subq_12.booking__ds_partitioned__extract_dayofyear
+                    , subq_12.booking__ds_partitioned__extract_dow
+                    , subq_12.booking__ds_partitioned__extract_doy
                     , subq_12.booking__paid_at__day
                     , subq_12.booking__paid_at__week
                     , subq_12.booking__paid_at__month
@@ -536,8 +536,8 @@ FROM (
                     , subq_12.booking__paid_at__extract_month
                     , subq_12.booking__paid_at__extract_week
                     , subq_12.booking__paid_at__extract_day
-                    , subq_12.booking__paid_at__extract_dayofweek
-                    , subq_12.booking__paid_at__extract_dayofyear
+                    , subq_12.booking__paid_at__extract_dow
+                    , subq_12.booking__paid_at__extract_doy
                     , subq_12.ds__day AS metric_time__day
                     , subq_12.ds__week AS metric_time__week
                     , subq_12.ds__month AS metric_time__month
@@ -548,8 +548,8 @@ FROM (
                     , subq_12.ds__extract_month AS metric_time__extract_month
                     , subq_12.ds__extract_week AS metric_time__extract_week
                     , subq_12.ds__extract_day AS metric_time__extract_day
-                    , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_12.ds__extract_dow AS metric_time__extract_dow
+                    , subq_12.ds__extract_doy AS metric_time__extract_doy
                     , subq_12.listing
                     , subq_12.guest
                     , subq_12.host
@@ -594,74 +594,74 @@ FROM (
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -691,8 +691,8 @@ FROM (
                     , subq_15.ds__extract_month
                     , subq_15.ds__extract_week
                     , subq_15.ds__extract_day
-                    , subq_15.ds__extract_dayofweek
-                    , subq_15.ds__extract_dayofyear
+                    , subq_15.ds__extract_dow
+                    , subq_15.ds__extract_doy
                     , subq_15.created_at__day
                     , subq_15.created_at__week
                     , subq_15.created_at__month
@@ -703,8 +703,8 @@ FROM (
                     , subq_15.created_at__extract_month
                     , subq_15.created_at__extract_week
                     , subq_15.created_at__extract_day
-                    , subq_15.created_at__extract_dayofweek
-                    , subq_15.created_at__extract_dayofyear
+                    , subq_15.created_at__extract_dow
+                    , subq_15.created_at__extract_doy
                     , subq_15.listing__ds__day
                     , subq_15.listing__ds__week
                     , subq_15.listing__ds__month
@@ -715,8 +715,8 @@ FROM (
                     , subq_15.listing__ds__extract_month
                     , subq_15.listing__ds__extract_week
                     , subq_15.listing__ds__extract_day
-                    , subq_15.listing__ds__extract_dayofweek
-                    , subq_15.listing__ds__extract_dayofyear
+                    , subq_15.listing__ds__extract_dow
+                    , subq_15.listing__ds__extract_doy
                     , subq_15.listing__created_at__day
                     , subq_15.listing__created_at__week
                     , subq_15.listing__created_at__month
@@ -727,8 +727,8 @@ FROM (
                     , subq_15.listing__created_at__extract_month
                     , subq_15.listing__created_at__extract_week
                     , subq_15.listing__created_at__extract_day
-                    , subq_15.listing__created_at__extract_dayofweek
-                    , subq_15.listing__created_at__extract_dayofyear
+                    , subq_15.listing__created_at__extract_dow
+                    , subq_15.listing__created_at__extract_doy
                     , subq_15.ds__day AS metric_time__day
                     , subq_15.ds__week AS metric_time__week
                     , subq_15.ds__month AS metric_time__month
@@ -739,8 +739,8 @@ FROM (
                     , subq_15.ds__extract_month AS metric_time__extract_month
                     , subq_15.ds__extract_week AS metric_time__extract_week
                     , subq_15.ds__extract_day AS metric_time__extract_day
-                    , subq_15.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                    , subq_15.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                    , subq_15.ds__extract_dow AS metric_time__extract_dow
+                    , subq_15.ds__extract_doy AS metric_time__extract_doy
                     , subq_15.listing
                     , subq_15.user
                     , subq_15.listing__user
@@ -764,25 +764,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -791,25 +791,25 @@ FROM (
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
                       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
                       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
                       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-                      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-                      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-                      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-                      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+                      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+                      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+                      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+                      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+                      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -870,8 +870,8 @@ FROM (
             , subq_24.ds__extract_month
             , subq_24.ds__extract_week
             , subq_24.ds__extract_day
-            , subq_24.ds__extract_dayofweek
-            , subq_24.ds__extract_dayofyear
+            , subq_24.ds__extract_dow
+            , subq_24.ds__extract_doy
             , subq_24.ds_partitioned__day
             , subq_24.ds_partitioned__week
             , subq_24.ds_partitioned__month
@@ -882,8 +882,8 @@ FROM (
             , subq_24.ds_partitioned__extract_month
             , subq_24.ds_partitioned__extract_week
             , subq_24.ds_partitioned__extract_day
-            , subq_24.ds_partitioned__extract_dayofweek
-            , subq_24.ds_partitioned__extract_dayofyear
+            , subq_24.ds_partitioned__extract_dow
+            , subq_24.ds_partitioned__extract_doy
             , subq_24.paid_at__day
             , subq_24.paid_at__week
             , subq_24.paid_at__month
@@ -894,8 +894,8 @@ FROM (
             , subq_24.paid_at__extract_month
             , subq_24.paid_at__extract_week
             , subq_24.paid_at__extract_day
-            , subq_24.paid_at__extract_dayofweek
-            , subq_24.paid_at__extract_dayofyear
+            , subq_24.paid_at__extract_dow
+            , subq_24.paid_at__extract_doy
             , subq_24.booking__ds__day
             , subq_24.booking__ds__week
             , subq_24.booking__ds__month
@@ -906,8 +906,8 @@ FROM (
             , subq_24.booking__ds__extract_month
             , subq_24.booking__ds__extract_week
             , subq_24.booking__ds__extract_day
-            , subq_24.booking__ds__extract_dayofweek
-            , subq_24.booking__ds__extract_dayofyear
+            , subq_24.booking__ds__extract_dow
+            , subq_24.booking__ds__extract_doy
             , subq_24.booking__ds_partitioned__day
             , subq_24.booking__ds_partitioned__week
             , subq_24.booking__ds_partitioned__month
@@ -918,8 +918,8 @@ FROM (
             , subq_24.booking__ds_partitioned__extract_month
             , subq_24.booking__ds_partitioned__extract_week
             , subq_24.booking__ds_partitioned__extract_day
-            , subq_24.booking__ds_partitioned__extract_dayofweek
-            , subq_24.booking__ds_partitioned__extract_dayofyear
+            , subq_24.booking__ds_partitioned__extract_dow
+            , subq_24.booking__ds_partitioned__extract_doy
             , subq_24.booking__paid_at__day
             , subq_24.booking__paid_at__week
             , subq_24.booking__paid_at__month
@@ -930,8 +930,8 @@ FROM (
             , subq_24.booking__paid_at__extract_month
             , subq_24.booking__paid_at__extract_week
             , subq_24.booking__paid_at__extract_day
-            , subq_24.booking__paid_at__extract_dayofweek
-            , subq_24.booking__paid_at__extract_dayofyear
+            , subq_24.booking__paid_at__extract_dow
+            , subq_24.booking__paid_at__extract_doy
             , subq_24.ds__day AS metric_time__day
             , subq_24.ds__week AS metric_time__week
             , subq_24.ds__month AS metric_time__month
@@ -942,8 +942,8 @@ FROM (
             , subq_24.ds__extract_month AS metric_time__extract_month
             , subq_24.ds__extract_week AS metric_time__extract_week
             , subq_24.ds__extract_day AS metric_time__extract_day
-            , subq_24.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_24.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_24.ds__extract_dow AS metric_time__extract_dow
+            , subq_24.ds__extract_doy AS metric_time__extract_doy
             , subq_24.listing
             , subq_24.guest
             , subq_24.host
@@ -988,74 +988,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
index 1f9e7a4524..c11754db0d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_reused_measure__plan0.sql
@@ -50,8 +50,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -62,8 +62,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -74,8 +74,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -86,8 +86,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -98,8 +98,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -110,8 +110,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -122,8 +122,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -168,74 +168,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -282,8 +282,8 @@ FROM (
             , subq_7.ds__extract_month
             , subq_7.ds__extract_week
             , subq_7.ds__extract_day
-            , subq_7.ds__extract_dayofweek
-            , subq_7.ds__extract_dayofyear
+            , subq_7.ds__extract_dow
+            , subq_7.ds__extract_doy
             , subq_7.ds_partitioned__day
             , subq_7.ds_partitioned__week
             , subq_7.ds_partitioned__month
@@ -294,8 +294,8 @@ FROM (
             , subq_7.ds_partitioned__extract_month
             , subq_7.ds_partitioned__extract_week
             , subq_7.ds_partitioned__extract_day
-            , subq_7.ds_partitioned__extract_dayofweek
-            , subq_7.ds_partitioned__extract_dayofyear
+            , subq_7.ds_partitioned__extract_dow
+            , subq_7.ds_partitioned__extract_doy
             , subq_7.paid_at__day
             , subq_7.paid_at__week
             , subq_7.paid_at__month
@@ -306,8 +306,8 @@ FROM (
             , subq_7.paid_at__extract_month
             , subq_7.paid_at__extract_week
             , subq_7.paid_at__extract_day
-            , subq_7.paid_at__extract_dayofweek
-            , subq_7.paid_at__extract_dayofyear
+            , subq_7.paid_at__extract_dow
+            , subq_7.paid_at__extract_doy
             , subq_7.booking__ds__day
             , subq_7.booking__ds__week
             , subq_7.booking__ds__month
@@ -318,8 +318,8 @@ FROM (
             , subq_7.booking__ds__extract_month
             , subq_7.booking__ds__extract_week
             , subq_7.booking__ds__extract_day
-            , subq_7.booking__ds__extract_dayofweek
-            , subq_7.booking__ds__extract_dayofyear
+            , subq_7.booking__ds__extract_dow
+            , subq_7.booking__ds__extract_doy
             , subq_7.booking__ds_partitioned__day
             , subq_7.booking__ds_partitioned__week
             , subq_7.booking__ds_partitioned__month
@@ -330,8 +330,8 @@ FROM (
             , subq_7.booking__ds_partitioned__extract_month
             , subq_7.booking__ds_partitioned__extract_week
             , subq_7.booking__ds_partitioned__extract_day
-            , subq_7.booking__ds_partitioned__extract_dayofweek
-            , subq_7.booking__ds_partitioned__extract_dayofyear
+            , subq_7.booking__ds_partitioned__extract_dow
+            , subq_7.booking__ds_partitioned__extract_doy
             , subq_7.booking__paid_at__day
             , subq_7.booking__paid_at__week
             , subq_7.booking__paid_at__month
@@ -342,8 +342,8 @@ FROM (
             , subq_7.booking__paid_at__extract_month
             , subq_7.booking__paid_at__extract_week
             , subq_7.booking__paid_at__extract_day
-            , subq_7.booking__paid_at__extract_dayofweek
-            , subq_7.booking__paid_at__extract_dayofyear
+            , subq_7.booking__paid_at__extract_dow
+            , subq_7.booking__paid_at__extract_doy
             , subq_7.ds__day AS metric_time__day
             , subq_7.ds__week AS metric_time__week
             , subq_7.ds__month AS metric_time__month
@@ -354,8 +354,8 @@ FROM (
             , subq_7.ds__extract_month AS metric_time__extract_month
             , subq_7.ds__extract_week AS metric_time__extract_week
             , subq_7.ds__extract_day AS metric_time__extract_day
-            , subq_7.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_7.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_7.ds__extract_dow AS metric_time__extract_dow
+            , subq_7.ds__extract_doy AS metric_time__extract_doy
             , subq_7.listing
             , subq_7.guest
             , subq_7.host
@@ -400,74 +400,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 2d8a10e755..bd41d48bd9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -44,8 +44,8 @@ FROM (
               , subq_0.ds__extract_month
               , subq_0.ds__extract_week
               , subq_0.ds__extract_day
-              , subq_0.ds__extract_dayofweek
-              , subq_0.ds__extract_dayofyear
+              , subq_0.ds__extract_dow
+              , subq_0.ds__extract_doy
               , subq_0.ds_partitioned__day
               , subq_0.ds_partitioned__week
               , subq_0.ds_partitioned__month
@@ -56,8 +56,8 @@ FROM (
               , subq_0.ds_partitioned__extract_month
               , subq_0.ds_partitioned__extract_week
               , subq_0.ds_partitioned__extract_day
-              , subq_0.ds_partitioned__extract_dayofweek
-              , subq_0.ds_partitioned__extract_dayofyear
+              , subq_0.ds_partitioned__extract_dow
+              , subq_0.ds_partitioned__extract_doy
               , subq_0.paid_at__day
               , subq_0.paid_at__week
               , subq_0.paid_at__month
@@ -68,8 +68,8 @@ FROM (
               , subq_0.paid_at__extract_month
               , subq_0.paid_at__extract_week
               , subq_0.paid_at__extract_day
-              , subq_0.paid_at__extract_dayofweek
-              , subq_0.paid_at__extract_dayofyear
+              , subq_0.paid_at__extract_dow
+              , subq_0.paid_at__extract_doy
               , subq_0.booking__ds__day
               , subq_0.booking__ds__week
               , subq_0.booking__ds__month
@@ -80,8 +80,8 @@ FROM (
               , subq_0.booking__ds__extract_month
               , subq_0.booking__ds__extract_week
               , subq_0.booking__ds__extract_day
-              , subq_0.booking__ds__extract_dayofweek
-              , subq_0.booking__ds__extract_dayofyear
+              , subq_0.booking__ds__extract_dow
+              , subq_0.booking__ds__extract_doy
               , subq_0.booking__ds_partitioned__day
               , subq_0.booking__ds_partitioned__week
               , subq_0.booking__ds_partitioned__month
@@ -92,8 +92,8 @@ FROM (
               , subq_0.booking__ds_partitioned__extract_month
               , subq_0.booking__ds_partitioned__extract_week
               , subq_0.booking__ds_partitioned__extract_day
-              , subq_0.booking__ds_partitioned__extract_dayofweek
-              , subq_0.booking__ds_partitioned__extract_dayofyear
+              , subq_0.booking__ds_partitioned__extract_dow
+              , subq_0.booking__ds_partitioned__extract_doy
               , subq_0.booking__paid_at__day
               , subq_0.booking__paid_at__week
               , subq_0.booking__paid_at__month
@@ -104,8 +104,8 @@ FROM (
               , subq_0.booking__paid_at__extract_month
               , subq_0.booking__paid_at__extract_week
               , subq_0.booking__paid_at__extract_day
-              , subq_0.booking__paid_at__extract_dayofweek
-              , subq_0.booking__paid_at__extract_dayofyear
+              , subq_0.booking__paid_at__extract_dow
+              , subq_0.booking__paid_at__extract_doy
               , subq_0.ds__day AS metric_time__day
               , subq_0.ds__week AS metric_time__week
               , subq_0.ds__month AS metric_time__month
@@ -116,8 +116,8 @@ FROM (
               , subq_0.ds__extract_month AS metric_time__extract_month
               , subq_0.ds__extract_week AS metric_time__extract_week
               , subq_0.ds__extract_day AS metric_time__extract_day
-              , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-              , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+              , subq_0.ds__extract_dow AS metric_time__extract_dow
+              , subq_0.ds__extract_doy AS metric_time__extract_doy
               , subq_0.listing
               , subq_0.guest
               , subq_0.host
@@ -162,74 +162,74 @@ FROM (
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                 , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                 , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                 , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                 , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index 4ef0714be2..ecc15101fe 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -32,8 +32,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -150,74 +150,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -256,8 +256,8 @@ FROM (
             , subq_5.ds__extract_month
             , subq_5.ds__extract_week
             , subq_5.ds__extract_day
-            , subq_5.ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear
+            , subq_5.ds__extract_dow
+            , subq_5.ds__extract_doy
             , subq_5.created_at__day
             , subq_5.created_at__week
             , subq_5.created_at__month
@@ -268,8 +268,8 @@ FROM (
             , subq_5.created_at__extract_month
             , subq_5.created_at__extract_week
             , subq_5.created_at__extract_day
-            , subq_5.created_at__extract_dayofweek
-            , subq_5.created_at__extract_dayofyear
+            , subq_5.created_at__extract_dow
+            , subq_5.created_at__extract_doy
             , subq_5.listing__ds__day
             , subq_5.listing__ds__week
             , subq_5.listing__ds__month
@@ -280,8 +280,8 @@ FROM (
             , subq_5.listing__ds__extract_month
             , subq_5.listing__ds__extract_week
             , subq_5.listing__ds__extract_day
-            , subq_5.listing__ds__extract_dayofweek
-            , subq_5.listing__ds__extract_dayofyear
+            , subq_5.listing__ds__extract_dow
+            , subq_5.listing__ds__extract_doy
             , subq_5.listing__created_at__day
             , subq_5.listing__created_at__week
             , subq_5.listing__created_at__month
@@ -292,8 +292,8 @@ FROM (
             , subq_5.listing__created_at__extract_month
             , subq_5.listing__created_at__extract_week
             , subq_5.listing__created_at__extract_day
-            , subq_5.listing__created_at__extract_dayofweek
-            , subq_5.listing__created_at__extract_dayofyear
+            , subq_5.listing__created_at__extract_dow
+            , subq_5.listing__created_at__extract_doy
             , subq_5.ds__day AS metric_time__day
             , subq_5.ds__week AS metric_time__week
             , subq_5.ds__month AS metric_time__month
@@ -304,8 +304,8 @@ FROM (
             , subq_5.ds__extract_month AS metric_time__extract_month
             , subq_5.ds__extract_week AS metric_time__extract_week
             , subq_5.ds__extract_day AS metric_time__extract_day
-            , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_5.ds__extract_dow AS metric_time__extract_dow
+            , subq_5.ds__extract_doy AS metric_time__extract_doy
             , subq_5.listing
             , subq_5.user
             , subq_5.listing__user
@@ -329,25 +329,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -356,25 +356,25 @@ FROM (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
index db50a9f2c8..d1740a6a39 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
@@ -45,8 +45,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -57,8 +57,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -69,8 +69,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -81,8 +81,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -93,8 +93,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -105,8 +105,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -117,8 +117,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -149,74 +149,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -250,8 +250,8 @@ FROM (
             , subq_3.window_start__extract_month AS window_start__extract_month
             , subq_3.window_start__extract_week AS window_start__extract_week
             , subq_3.window_start__extract_day AS window_start__extract_day
-            , subq_3.window_start__extract_dayofweek AS window_start__extract_dayofweek
-            , subq_3.window_start__extract_dayofyear AS window_start__extract_dayofyear
+            , subq_3.window_start__extract_dow AS window_start__extract_dow
+            , subq_3.window_start__extract_doy AS window_start__extract_doy
             , subq_3.window_end__day AS window_end__day
             , subq_3.window_end__week AS window_end__week
             , subq_3.window_end__month AS window_end__month
@@ -262,8 +262,8 @@ FROM (
             , subq_3.window_end__extract_month AS window_end__extract_month
             , subq_3.window_end__extract_week AS window_end__extract_week
             , subq_3.window_end__extract_day AS window_end__extract_day
-            , subq_3.window_end__extract_dayofweek AS window_end__extract_dayofweek
-            , subq_3.window_end__extract_dayofyear AS window_end__extract_dayofyear
+            , subq_3.window_end__extract_dow AS window_end__extract_dow
+            , subq_3.window_end__extract_doy AS window_end__extract_doy
             , subq_3.listing__window_start__day AS listing__window_start__day
             , subq_3.listing__window_start__week AS listing__window_start__week
             , subq_3.listing__window_start__month AS listing__window_start__month
@@ -274,8 +274,8 @@ FROM (
             , subq_3.listing__window_start__extract_month AS listing__window_start__extract_month
             , subq_3.listing__window_start__extract_week AS listing__window_start__extract_week
             , subq_3.listing__window_start__extract_day AS listing__window_start__extract_day
-            , subq_3.listing__window_start__extract_dayofweek AS listing__window_start__extract_dayofweek
-            , subq_3.listing__window_start__extract_dayofyear AS listing__window_start__extract_dayofyear
+            , subq_3.listing__window_start__extract_dow AS listing__window_start__extract_dow
+            , subq_3.listing__window_start__extract_doy AS listing__window_start__extract_doy
             , subq_3.listing__window_end__day AS listing__window_end__day
             , subq_3.listing__window_end__week AS listing__window_end__week
             , subq_3.listing__window_end__month AS listing__window_end__month
@@ -286,8 +286,8 @@ FROM (
             , subq_3.listing__window_end__extract_month AS listing__window_end__extract_month
             , subq_3.listing__window_end__extract_week AS listing__window_end__extract_week
             , subq_3.listing__window_end__extract_day AS listing__window_end__extract_day
-            , subq_3.listing__window_end__extract_dayofweek AS listing__window_end__extract_dayofweek
-            , subq_3.listing__window_end__extract_dayofyear AS listing__window_end__extract_dayofyear
+            , subq_3.listing__window_end__extract_dow AS listing__window_end__extract_dow
+            , subq_3.listing__window_end__extract_doy AS listing__window_end__extract_doy
             , subq_5.ds__day AS user__ds__day
             , subq_5.ds__week AS user__ds__week
             , subq_5.ds__month AS user__ds__month
@@ -298,8 +298,8 @@ FROM (
             , subq_5.ds__extract_month AS user__ds__extract_month
             , subq_5.ds__extract_week AS user__ds__extract_week
             , subq_5.ds__extract_day AS user__ds__extract_day
-            , subq_5.ds__extract_dayofweek AS user__ds__extract_dayofweek
-            , subq_5.ds__extract_dayofyear AS user__ds__extract_dayofyear
+            , subq_5.ds__extract_dow AS user__ds__extract_dow
+            , subq_5.ds__extract_doy AS user__ds__extract_doy
             , subq_3.listing AS listing
             , subq_3.user AS user
             , subq_3.listing__user AS listing__user
@@ -318,25 +318,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS window_start__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS window_start__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS window_start__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS window_start__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS window_start__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_from) AS window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_from) AS window_start__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_from) AS window_start__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_from) AS window_start__extract_doy
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS window_end__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS window_end__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS window_end__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS window_end__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS window_end__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_to) AS window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_to) AS window_end__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_to) AS window_end__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_to) AS window_end__extract_doy
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -345,25 +345,25 @@ FROM (
               , DATE_TRUNC('month', listings_src_10017.active_from) AS listing__window_start__month
               , DATE_TRUNC('quarter', listings_src_10017.active_from) AS listing__window_start__quarter
               , DATE_TRUNC('year', listings_src_10017.active_from) AS listing__window_start__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC('week', listings_src_10017.active_to) AS listing__window_end__week
               , DATE_TRUNC('month', listings_src_10017.active_to) AS listing__window_end__month
               , DATE_TRUNC('quarter', listings_src_10017.active_to) AS listing__window_end__quarter
               , DATE_TRUNC('year', listings_src_10017.active_to) AS listing__window_end__year
-              , EXTRACT(YEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_year
-              , EXTRACT(QUARTER FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
-              , EXTRACT(MONTH FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-              , EXTRACT(WEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
-              , EXTRACT(DAY FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_dayofyear
+              , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
+              , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
+              , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
+              , EXTRACT(week FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+              , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
+              , EXTRACT(dow FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+              , EXTRACT(doy FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -412,8 +412,8 @@ FROM (
               , subq_4.ds__extract_month
               , subq_4.ds__extract_week
               , subq_4.ds__extract_day
-              , subq_4.ds__extract_dayofweek
-              , subq_4.ds__extract_dayofyear
+              , subq_4.ds__extract_dow
+              , subq_4.ds__extract_doy
               , subq_4.user__ds__day
               , subq_4.user__ds__week
               , subq_4.user__ds__month
@@ -424,8 +424,8 @@ FROM (
               , subq_4.user__ds__extract_month
               , subq_4.user__ds__extract_week
               , subq_4.user__ds__extract_day
-              , subq_4.user__ds__extract_dayofweek
-              , subq_4.user__ds__extract_dayofyear
+              , subq_4.user__ds__extract_dow
+              , subq_4.user__ds__extract_doy
               , subq_4.user
               , subq_4.home_state_latest
               , subq_4.user__home_state_latest
@@ -437,26 +437,26 @@ FROM (
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS ds__year
-                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS ds__extract_year
-                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS ds__extract_quarter
-                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS ds__extract_month
-                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS ds__extract_week
-                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_dayofyear
+                , EXTRACT(year FROM users_latest_src_10021.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM users_latest_src_10021.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM users_latest_src_10021.ds) AS ds__extract_month
+                , EXTRACT(week FROM users_latest_src_10021.ds) AS ds__extract_week
+                , EXTRACT(day FROM users_latest_src_10021.ds) AS ds__extract_day
+                , EXTRACT(dow FROM users_latest_src_10021.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM users_latest_src_10021.ds) AS ds__extract_doy
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC('week', users_latest_src_10021.ds) AS user__ds__week
                 , DATE_TRUNC('month', users_latest_src_10021.ds) AS user__ds__month
                 , DATE_TRUNC('quarter', users_latest_src_10021.ds) AS user__ds__quarter
                 , DATE_TRUNC('year', users_latest_src_10021.ds) AS user__ds__year
-                , EXTRACT(YEAR FROM users_latest_src_10021.ds) AS user__ds__extract_year
-                , EXTRACT(QUARTER FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
-                , EXTRACT(MONTH FROM users_latest_src_10021.ds) AS user__ds__extract_month
-                , EXTRACT(WEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
-                , EXTRACT(DAY FROM users_latest_src_10021.ds) AS user__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_dayofyear
+                , EXTRACT(year FROM users_latest_src_10021.ds) AS user__ds__extract_year
+                , EXTRACT(quarter FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
+                , EXTRACT(month FROM users_latest_src_10021.ds) AS user__ds__extract_month
+                , EXTRACT(week FROM users_latest_src_10021.ds) AS user__ds__extract_week
+                , EXTRACT(day FROM users_latest_src_10021.ds) AS user__ds__extract_day
+                , EXTRACT(dow FROM users_latest_src_10021.ds) AS user__ds__extract_dow
+                , EXTRACT(doy FROM users_latest_src_10021.ds) AS user__ds__extract_doy
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
index adaf16cf58..8abc633b9a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
@@ -45,8 +45,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -57,8 +57,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -69,8 +69,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -81,8 +81,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -93,8 +93,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -105,8 +105,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -117,8 +117,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -149,74 +149,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10015.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10015.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10015.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10015.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -253,8 +253,8 @@ FROM (
             , subq_5.window_start__extract_month AS lux_listing__window_start__extract_month
             , subq_5.window_start__extract_week AS lux_listing__window_start__extract_week
             , subq_5.window_start__extract_day AS lux_listing__window_start__extract_day
-            , subq_5.window_start__extract_dayofweek AS lux_listing__window_start__extract_dayofweek
-            , subq_5.window_start__extract_dayofyear AS lux_listing__window_start__extract_dayofyear
+            , subq_5.window_start__extract_dow AS lux_listing__window_start__extract_dow
+            , subq_5.window_start__extract_doy AS lux_listing__window_start__extract_doy
             , subq_5.window_end__day AS lux_listing__window_end__day
             , subq_5.window_end__week AS lux_listing__window_end__week
             , subq_5.window_end__month AS lux_listing__window_end__month
@@ -265,8 +265,8 @@ FROM (
             , subq_5.window_end__extract_month AS lux_listing__window_end__extract_month
             , subq_5.window_end__extract_week AS lux_listing__window_end__extract_week
             , subq_5.window_end__extract_day AS lux_listing__window_end__extract_day
-            , subq_5.window_end__extract_dayofweek AS lux_listing__window_end__extract_dayofweek
-            , subq_5.window_end__extract_dayofyear AS lux_listing__window_end__extract_dayofyear
+            , subq_5.window_end__extract_dow AS lux_listing__window_end__extract_dow
+            , subq_5.window_end__extract_doy AS lux_listing__window_end__extract_doy
             , subq_3.listing AS listing
             , subq_3.lux_listing AS lux_listing
             , subq_3.listing__lux_listing AS listing__lux_listing
@@ -343,8 +343,8 @@ FROM (
               , subq_4.window_start__extract_month
               , subq_4.window_start__extract_week
               , subq_4.window_start__extract_day
-              , subq_4.window_start__extract_dayofweek
-              , subq_4.window_start__extract_dayofyear
+              , subq_4.window_start__extract_dow
+              , subq_4.window_start__extract_doy
               , subq_4.window_end__day
               , subq_4.window_end__week
               , subq_4.window_end__month
@@ -355,8 +355,8 @@ FROM (
               , subq_4.window_end__extract_month
               , subq_4.window_end__extract_week
               , subq_4.window_end__extract_day
-              , subq_4.window_end__extract_dayofweek
-              , subq_4.window_end__extract_dayofyear
+              , subq_4.window_end__extract_dow
+              , subq_4.window_end__extract_doy
               , subq_4.lux_listing__window_start__day
               , subq_4.lux_listing__window_start__week
               , subq_4.lux_listing__window_start__month
@@ -367,8 +367,8 @@ FROM (
               , subq_4.lux_listing__window_start__extract_month
               , subq_4.lux_listing__window_start__extract_week
               , subq_4.lux_listing__window_start__extract_day
-              , subq_4.lux_listing__window_start__extract_dayofweek
-              , subq_4.lux_listing__window_start__extract_dayofyear
+              , subq_4.lux_listing__window_start__extract_dow
+              , subq_4.lux_listing__window_start__extract_doy
               , subq_4.lux_listing__window_end__day
               , subq_4.lux_listing__window_end__week
               , subq_4.lux_listing__window_end__month
@@ -379,8 +379,8 @@ FROM (
               , subq_4.lux_listing__window_end__extract_month
               , subq_4.lux_listing__window_end__extract_week
               , subq_4.lux_listing__window_end__extract_day
-              , subq_4.lux_listing__window_end__extract_dayofweek
-              , subq_4.lux_listing__window_end__extract_dayofyear
+              , subq_4.lux_listing__window_end__extract_dow
+              , subq_4.lux_listing__window_end__extract_doy
               , subq_4.lux_listing
               , subq_4.is_confirmed_lux
               , subq_4.lux_listing__is_confirmed_lux
@@ -392,50 +392,50 @@ FROM (
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS window_start__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_from) AS window_start__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_from) AS window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS window_end__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_to) AS window_end__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_to) AS window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_from) AS lux_listing__window_start__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_from) AS lux_listing__window_start__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_from) AS lux_listing__window_start__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_from) AS lux_listing__window_start__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC('week', lux_listings_src_10019.valid_to) AS lux_listing__window_end__week
                 , DATE_TRUNC('month', lux_listings_src_10019.valid_to) AS lux_listing__window_end__month
                 , DATE_TRUNC('quarter', lux_listings_src_10019.valid_to) AS lux_listing__window_end__quarter
                 , DATE_TRUNC('year', lux_listings_src_10019.valid_to) AS lux_listing__window_end__year
-                , EXTRACT(YEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
-                , EXTRACT(QUARTER FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
-                , EXTRACT(MONTH FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
-                , EXTRACT(WEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
-                , EXTRACT(DAY FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dayofyear
+                , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
+                , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
+                , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
+                , EXTRACT(week FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+                , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
+                , EXTRACT(dow FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dow
+                , EXTRACT(doy FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql
index cb9670f074..7e38380b20 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_join_node__plan0.sql
@@ -33,74 +33,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -127,25 +127,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -154,25 +154,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -201,25 +201,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -228,25 +228,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
index 7638105966..99d4dba7cb 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
@@ -41,8 +41,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.ds__day
             , subq_0.ds__week
             , subq_0.ds__month
@@ -53,8 +53,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.account_id__ds_partitioned__day
             , subq_0.account_id__ds_partitioned__week
             , subq_0.account_id__ds_partitioned__month
@@ -65,8 +65,8 @@ FROM (
             , subq_0.account_id__ds_partitioned__extract_month
             , subq_0.account_id__ds_partitioned__extract_week
             , subq_0.account_id__ds_partitioned__extract_day
-            , subq_0.account_id__ds_partitioned__extract_dayofweek
-            , subq_0.account_id__ds_partitioned__extract_dayofyear
+            , subq_0.account_id__ds_partitioned__extract_dow
+            , subq_0.account_id__ds_partitioned__extract_doy
             , subq_0.account_id__ds__day
             , subq_0.account_id__ds__week
             , subq_0.account_id__ds__month
@@ -77,8 +77,8 @@ FROM (
             , subq_0.account_id__ds__extract_month
             , subq_0.account_id__ds__extract_week
             , subq_0.account_id__ds__extract_day
-            , subq_0.account_id__ds__extract_dayofweek
-            , subq_0.account_id__ds__extract_dayofyear
+            , subq_0.account_id__ds__extract_dow
+            , subq_0.account_id__ds__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -89,8 +89,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.account_id
             , subq_0.account_month
             , subq_0.account_id__account_month
@@ -104,50 +104,50 @@ FROM (
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS ds__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds) AS ds__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds) AS ds__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds) AS ds__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds) AS ds__extract_doy
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC('week', account_month_txns_src_10010.ds) AS account_id__ds__week
               , DATE_TRUNC('month', account_month_txns_src_10010.ds) AS account_id__ds__month
               , DATE_TRUNC('quarter', account_month_txns_src_10010.ds) AS account_id__ds__quarter
               , DATE_TRUNC('year', account_month_txns_src_10010.ds) AS account_id__ds__year
-              , EXTRACT(YEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
-              , EXTRACT(QUARTER FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
-              , EXTRACT(MONTH FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
-              , EXTRACT(WEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
-              , EXTRACT(DAY FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dayofyear
+              , EXTRACT(year FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
+              , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
+              , EXTRACT(month FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
+              , EXTRACT(week FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
+              , EXTRACT(day FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
+              , EXTRACT(dow FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dow
+              , EXTRACT(doy FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_doy
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -174,8 +174,8 @@ FROM (
             , subq_3.ds_partitioned__extract_month AS ds_partitioned__extract_month
             , subq_3.ds_partitioned__extract_week AS ds_partitioned__extract_week
             , subq_3.ds_partitioned__extract_day AS ds_partitioned__extract_day
-            , subq_3.ds_partitioned__extract_dayofweek AS ds_partitioned__extract_dayofweek
-            , subq_3.ds_partitioned__extract_dayofyear AS ds_partitioned__extract_dayofyear
+            , subq_3.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_3.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
             , subq_3.account_id__ds_partitioned__day AS account_id__ds_partitioned__day
             , subq_3.account_id__ds_partitioned__week AS account_id__ds_partitioned__week
             , subq_3.account_id__ds_partitioned__month AS account_id__ds_partitioned__month
@@ -186,8 +186,8 @@ FROM (
             , subq_3.account_id__ds_partitioned__extract_month AS account_id__ds_partitioned__extract_month
             , subq_3.account_id__ds_partitioned__extract_week AS account_id__ds_partitioned__extract_week
             , subq_3.account_id__ds_partitioned__extract_day AS account_id__ds_partitioned__extract_day
-            , subq_3.account_id__ds_partitioned__extract_dayofweek AS account_id__ds_partitioned__extract_dayofweek
-            , subq_3.account_id__ds_partitioned__extract_dayofyear AS account_id__ds_partitioned__extract_dayofyear
+            , subq_3.account_id__ds_partitioned__extract_dow AS account_id__ds_partitioned__extract_dow
+            , subq_3.account_id__ds_partitioned__extract_doy AS account_id__ds_partitioned__extract_doy
             , subq_5.ds_partitioned__day AS customer_id__ds_partitioned__day
             , subq_5.ds_partitioned__week AS customer_id__ds_partitioned__week
             , subq_5.ds_partitioned__month AS customer_id__ds_partitioned__month
@@ -198,8 +198,8 @@ FROM (
             , subq_5.ds_partitioned__extract_month AS customer_id__ds_partitioned__extract_month
             , subq_5.ds_partitioned__extract_week AS customer_id__ds_partitioned__extract_week
             , subq_5.ds_partitioned__extract_day AS customer_id__ds_partitioned__extract_day
-            , subq_5.ds_partitioned__extract_dayofweek AS customer_id__ds_partitioned__extract_dayofweek
-            , subq_5.ds_partitioned__extract_dayofyear AS customer_id__ds_partitioned__extract_dayofyear
+            , subq_5.ds_partitioned__extract_dow AS customer_id__ds_partitioned__extract_dow
+            , subq_5.ds_partitioned__extract_doy AS customer_id__ds_partitioned__extract_doy
             , subq_3.account_id AS account_id
             , subq_3.customer_id AS customer_id
             , subq_3.account_id__customer_id AS account_id__customer_id
@@ -216,26 +216,26 @@ FROM (
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_doy
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC('week', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__week
               , DATE_TRUNC('month', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__month
               , DATE_TRUNC('quarter', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__quarter
               , DATE_TRUNC('year', bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__year
-              , EXTRACT(YEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
+              , EXTRACT(week FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -283,8 +283,8 @@ FROM (
               , subq_4.ds_partitioned__extract_month
               , subq_4.ds_partitioned__extract_week
               , subq_4.ds_partitioned__extract_day
-              , subq_4.ds_partitioned__extract_dayofweek
-              , subq_4.ds_partitioned__extract_dayofyear
+              , subq_4.ds_partitioned__extract_dow
+              , subq_4.ds_partitioned__extract_doy
               , subq_4.customer_id__ds_partitioned__day
               , subq_4.customer_id__ds_partitioned__week
               , subq_4.customer_id__ds_partitioned__month
@@ -295,8 +295,8 @@ FROM (
               , subq_4.customer_id__ds_partitioned__extract_month
               , subq_4.customer_id__ds_partitioned__extract_week
               , subq_4.customer_id__ds_partitioned__extract_day
-              , subq_4.customer_id__ds_partitioned__extract_dayofweek
-              , subq_4.customer_id__ds_partitioned__extract_dayofyear
+              , subq_4.customer_id__ds_partitioned__extract_dow
+              , subq_4.customer_id__ds_partitioned__extract_doy
               , subq_4.customer_id
               , subq_4.customer_name
               , subq_4.customer_atomic_weight
@@ -312,13 +312,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS ds_partitioned__year
-                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
-                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -326,13 +326,13 @@ FROM (
                 , DATE_TRUNC('month', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__month
                 , DATE_TRUNC('quarter', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__quarter
                 , DATE_TRUNC('year', customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__year
-                , EXTRACT(YEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
-                , EXTRACT(QUARTER FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
-                , EXTRACT(MONTH FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
-                , EXTRACT(WEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
-                , EXTRACT(DAY FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofweek
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dayofyear
+                , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
+                , EXTRACT(week FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
+                , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
+                , EXTRACT(dow FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
index 3d8fba9b22..54b108dd33 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multiple_metrics_no_dimensions__plan0.sql
@@ -28,8 +28,8 @@ FROM (
           , subq_1.ds__extract_month
           , subq_1.ds__extract_week
           , subq_1.ds__extract_day
-          , subq_1.ds__extract_dayofweek
-          , subq_1.ds__extract_dayofyear
+          , subq_1.ds__extract_dow
+          , subq_1.ds__extract_doy
           , subq_1.ds_partitioned__day
           , subq_1.ds_partitioned__week
           , subq_1.ds_partitioned__month
@@ -40,8 +40,8 @@ FROM (
           , subq_1.ds_partitioned__extract_month
           , subq_1.ds_partitioned__extract_week
           , subq_1.ds_partitioned__extract_day
-          , subq_1.ds_partitioned__extract_dayofweek
-          , subq_1.ds_partitioned__extract_dayofyear
+          , subq_1.ds_partitioned__extract_dow
+          , subq_1.ds_partitioned__extract_doy
           , subq_1.paid_at__day
           , subq_1.paid_at__week
           , subq_1.paid_at__month
@@ -52,8 +52,8 @@ FROM (
           , subq_1.paid_at__extract_month
           , subq_1.paid_at__extract_week
           , subq_1.paid_at__extract_day
-          , subq_1.paid_at__extract_dayofweek
-          , subq_1.paid_at__extract_dayofyear
+          , subq_1.paid_at__extract_dow
+          , subq_1.paid_at__extract_doy
           , subq_1.booking__ds__day
           , subq_1.booking__ds__week
           , subq_1.booking__ds__month
@@ -64,8 +64,8 @@ FROM (
           , subq_1.booking__ds__extract_month
           , subq_1.booking__ds__extract_week
           , subq_1.booking__ds__extract_day
-          , subq_1.booking__ds__extract_dayofweek
-          , subq_1.booking__ds__extract_dayofyear
+          , subq_1.booking__ds__extract_dow
+          , subq_1.booking__ds__extract_doy
           , subq_1.booking__ds_partitioned__day
           , subq_1.booking__ds_partitioned__week
           , subq_1.booking__ds_partitioned__month
@@ -76,8 +76,8 @@ FROM (
           , subq_1.booking__ds_partitioned__extract_month
           , subq_1.booking__ds_partitioned__extract_week
           , subq_1.booking__ds_partitioned__extract_day
-          , subq_1.booking__ds_partitioned__extract_dayofweek
-          , subq_1.booking__ds_partitioned__extract_dayofyear
+          , subq_1.booking__ds_partitioned__extract_dow
+          , subq_1.booking__ds_partitioned__extract_doy
           , subq_1.booking__paid_at__day
           , subq_1.booking__paid_at__week
           , subq_1.booking__paid_at__month
@@ -88,8 +88,8 @@ FROM (
           , subq_1.booking__paid_at__extract_month
           , subq_1.booking__paid_at__extract_week
           , subq_1.booking__paid_at__extract_day
-          , subq_1.booking__paid_at__extract_dayofweek
-          , subq_1.booking__paid_at__extract_dayofyear
+          , subq_1.booking__paid_at__extract_dow
+          , subq_1.booking__paid_at__extract_doy
           , subq_1.metric_time__day
           , subq_1.metric_time__week
           , subq_1.metric_time__month
@@ -100,8 +100,8 @@ FROM (
           , subq_1.metric_time__extract_month
           , subq_1.metric_time__extract_week
           , subq_1.metric_time__extract_day
-          , subq_1.metric_time__extract_dayofweek
-          , subq_1.metric_time__extract_dayofyear
+          , subq_1.metric_time__extract_dow
+          , subq_1.metric_time__extract_doy
           , subq_1.listing
           , subq_1.guest
           , subq_1.host
@@ -136,8 +136,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -148,8 +148,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.paid_at__day
             , subq_0.paid_at__week
             , subq_0.paid_at__month
@@ -160,8 +160,8 @@ FROM (
             , subq_0.paid_at__extract_month
             , subq_0.paid_at__extract_week
             , subq_0.paid_at__extract_day
-            , subq_0.paid_at__extract_dayofweek
-            , subq_0.paid_at__extract_dayofyear
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
             , subq_0.booking__ds__day
             , subq_0.booking__ds__week
             , subq_0.booking__ds__month
@@ -172,8 +172,8 @@ FROM (
             , subq_0.booking__ds__extract_month
             , subq_0.booking__ds__extract_week
             , subq_0.booking__ds__extract_day
-            , subq_0.booking__ds__extract_dayofweek
-            , subq_0.booking__ds__extract_dayofyear
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
             , subq_0.booking__ds_partitioned__day
             , subq_0.booking__ds_partitioned__week
             , subq_0.booking__ds_partitioned__month
@@ -184,8 +184,8 @@ FROM (
             , subq_0.booking__ds_partitioned__extract_month
             , subq_0.booking__ds_partitioned__extract_week
             , subq_0.booking__ds_partitioned__extract_day
-            , subq_0.booking__ds_partitioned__extract_dayofweek
-            , subq_0.booking__ds_partitioned__extract_dayofyear
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
             , subq_0.booking__paid_at__day
             , subq_0.booking__paid_at__week
             , subq_0.booking__paid_at__month
@@ -196,8 +196,8 @@ FROM (
             , subq_0.booking__paid_at__extract_month
             , subq_0.booking__paid_at__extract_week
             , subq_0.booking__paid_at__extract_day
-            , subq_0.booking__paid_at__extract_dayofweek
-            , subq_0.booking__paid_at__extract_dayofyear
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -208,8 +208,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.listing
             , subq_0.guest
             , subq_0.host
@@ -254,74 +254,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -362,8 +362,8 @@ CROSS JOIN (
           , subq_7.ds__extract_month
           , subq_7.ds__extract_week
           , subq_7.ds__extract_day
-          , subq_7.ds__extract_dayofweek
-          , subq_7.ds__extract_dayofyear
+          , subq_7.ds__extract_dow
+          , subq_7.ds__extract_doy
           , subq_7.created_at__day
           , subq_7.created_at__week
           , subq_7.created_at__month
@@ -374,8 +374,8 @@ CROSS JOIN (
           , subq_7.created_at__extract_month
           , subq_7.created_at__extract_week
           , subq_7.created_at__extract_day
-          , subq_7.created_at__extract_dayofweek
-          , subq_7.created_at__extract_dayofyear
+          , subq_7.created_at__extract_dow
+          , subq_7.created_at__extract_doy
           , subq_7.listing__ds__day
           , subq_7.listing__ds__week
           , subq_7.listing__ds__month
@@ -386,8 +386,8 @@ CROSS JOIN (
           , subq_7.listing__ds__extract_month
           , subq_7.listing__ds__extract_week
           , subq_7.listing__ds__extract_day
-          , subq_7.listing__ds__extract_dayofweek
-          , subq_7.listing__ds__extract_dayofyear
+          , subq_7.listing__ds__extract_dow
+          , subq_7.listing__ds__extract_doy
           , subq_7.listing__created_at__day
           , subq_7.listing__created_at__week
           , subq_7.listing__created_at__month
@@ -398,8 +398,8 @@ CROSS JOIN (
           , subq_7.listing__created_at__extract_month
           , subq_7.listing__created_at__extract_week
           , subq_7.listing__created_at__extract_day
-          , subq_7.listing__created_at__extract_dayofweek
-          , subq_7.listing__created_at__extract_dayofyear
+          , subq_7.listing__created_at__extract_dow
+          , subq_7.listing__created_at__extract_doy
           , subq_7.metric_time__day
           , subq_7.metric_time__week
           , subq_7.metric_time__month
@@ -410,8 +410,8 @@ CROSS JOIN (
           , subq_7.metric_time__extract_month
           , subq_7.metric_time__extract_week
           , subq_7.metric_time__extract_day
-          , subq_7.metric_time__extract_dayofweek
-          , subq_7.metric_time__extract_dayofyear
+          , subq_7.metric_time__extract_dow
+          , subq_7.metric_time__extract_doy
           , subq_7.listing
           , subq_7.user
           , subq_7.listing__user
@@ -437,8 +437,8 @@ CROSS JOIN (
             , subq_6.ds__extract_month
             , subq_6.ds__extract_week
             , subq_6.ds__extract_day
-            , subq_6.ds__extract_dayofweek
-            , subq_6.ds__extract_dayofyear
+            , subq_6.ds__extract_dow
+            , subq_6.ds__extract_doy
             , subq_6.created_at__day
             , subq_6.created_at__week
             , subq_6.created_at__month
@@ -449,8 +449,8 @@ CROSS JOIN (
             , subq_6.created_at__extract_month
             , subq_6.created_at__extract_week
             , subq_6.created_at__extract_day
-            , subq_6.created_at__extract_dayofweek
-            , subq_6.created_at__extract_dayofyear
+            , subq_6.created_at__extract_dow
+            , subq_6.created_at__extract_doy
             , subq_6.listing__ds__day
             , subq_6.listing__ds__week
             , subq_6.listing__ds__month
@@ -461,8 +461,8 @@ CROSS JOIN (
             , subq_6.listing__ds__extract_month
             , subq_6.listing__ds__extract_week
             , subq_6.listing__ds__extract_day
-            , subq_6.listing__ds__extract_dayofweek
-            , subq_6.listing__ds__extract_dayofyear
+            , subq_6.listing__ds__extract_dow
+            , subq_6.listing__ds__extract_doy
             , subq_6.listing__created_at__day
             , subq_6.listing__created_at__week
             , subq_6.listing__created_at__month
@@ -473,8 +473,8 @@ CROSS JOIN (
             , subq_6.listing__created_at__extract_month
             , subq_6.listing__created_at__extract_week
             , subq_6.listing__created_at__extract_day
-            , subq_6.listing__created_at__extract_dayofweek
-            , subq_6.listing__created_at__extract_dayofyear
+            , subq_6.listing__created_at__extract_dow
+            , subq_6.listing__created_at__extract_doy
             , subq_6.ds__day AS metric_time__day
             , subq_6.ds__week AS metric_time__week
             , subq_6.ds__month AS metric_time__month
@@ -485,8 +485,8 @@ CROSS JOIN (
             , subq_6.ds__extract_month AS metric_time__extract_month
             , subq_6.ds__extract_week AS metric_time__extract_week
             , subq_6.ds__extract_day AS metric_time__extract_day
-            , subq_6.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_6.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_6.ds__extract_dow AS metric_time__extract_dow
+            , subq_6.ds__extract_doy AS metric_time__extract_doy
             , subq_6.listing
             , subq_6.user
             , subq_6.listing__user
@@ -510,25 +510,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -537,25 +537,25 @@ CROSS JOIN (
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
               , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
               , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
               , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-              , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-              , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-              , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-              , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+              , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+              , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+              , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+              , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+              , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql
index 138d3b47ca..a716977aaf 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_nested_derived_metric__plan0.sql
@@ -49,8 +49,8 @@ FROM (
                 , subq_0.ds__extract_month
                 , subq_0.ds__extract_week
                 , subq_0.ds__extract_day
-                , subq_0.ds__extract_dayofweek
-                , subq_0.ds__extract_dayofyear
+                , subq_0.ds__extract_dow
+                , subq_0.ds__extract_doy
                 , subq_0.ds_partitioned__day
                 , subq_0.ds_partitioned__week
                 , subq_0.ds_partitioned__month
@@ -61,8 +61,8 @@ FROM (
                 , subq_0.ds_partitioned__extract_month
                 , subq_0.ds_partitioned__extract_week
                 , subq_0.ds_partitioned__extract_day
-                , subq_0.ds_partitioned__extract_dayofweek
-                , subq_0.ds_partitioned__extract_dayofyear
+                , subq_0.ds_partitioned__extract_dow
+                , subq_0.ds_partitioned__extract_doy
                 , subq_0.paid_at__day
                 , subq_0.paid_at__week
                 , subq_0.paid_at__month
@@ -73,8 +73,8 @@ FROM (
                 , subq_0.paid_at__extract_month
                 , subq_0.paid_at__extract_week
                 , subq_0.paid_at__extract_day
-                , subq_0.paid_at__extract_dayofweek
-                , subq_0.paid_at__extract_dayofyear
+                , subq_0.paid_at__extract_dow
+                , subq_0.paid_at__extract_doy
                 , subq_0.booking__ds__day
                 , subq_0.booking__ds__week
                 , subq_0.booking__ds__month
@@ -85,8 +85,8 @@ FROM (
                 , subq_0.booking__ds__extract_month
                 , subq_0.booking__ds__extract_week
                 , subq_0.booking__ds__extract_day
-                , subq_0.booking__ds__extract_dayofweek
-                , subq_0.booking__ds__extract_dayofyear
+                , subq_0.booking__ds__extract_dow
+                , subq_0.booking__ds__extract_doy
                 , subq_0.booking__ds_partitioned__day
                 , subq_0.booking__ds_partitioned__week
                 , subq_0.booking__ds_partitioned__month
@@ -97,8 +97,8 @@ FROM (
                 , subq_0.booking__ds_partitioned__extract_month
                 , subq_0.booking__ds_partitioned__extract_week
                 , subq_0.booking__ds_partitioned__extract_day
-                , subq_0.booking__ds_partitioned__extract_dayofweek
-                , subq_0.booking__ds_partitioned__extract_dayofyear
+                , subq_0.booking__ds_partitioned__extract_dow
+                , subq_0.booking__ds_partitioned__extract_doy
                 , subq_0.booking__paid_at__day
                 , subq_0.booking__paid_at__week
                 , subq_0.booking__paid_at__month
@@ -109,8 +109,8 @@ FROM (
                 , subq_0.booking__paid_at__extract_month
                 , subq_0.booking__paid_at__extract_week
                 , subq_0.booking__paid_at__extract_day
-                , subq_0.booking__paid_at__extract_dayofweek
-                , subq_0.booking__paid_at__extract_dayofyear
+                , subq_0.booking__paid_at__extract_dow
+                , subq_0.booking__paid_at__extract_doy
                 , subq_0.ds__day AS metric_time__day
                 , subq_0.ds__week AS metric_time__week
                 , subq_0.ds__month AS metric_time__month
@@ -121,8 +121,8 @@ FROM (
                 , subq_0.ds__extract_month AS metric_time__extract_month
                 , subq_0.ds__extract_week AS metric_time__extract_week
                 , subq_0.ds__extract_day AS metric_time__extract_day
-                , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_0.ds__extract_dow AS metric_time__extract_dow
+                , subq_0.ds__extract_doy AS metric_time__extract_doy
                 , subq_0.listing
                 , subq_0.guest
                 , subq_0.host
@@ -167,74 +167,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -278,8 +278,8 @@ FROM (
                 , subq_5.ds__extract_month
                 , subq_5.ds__extract_week
                 , subq_5.ds__extract_day
-                , subq_5.ds__extract_dayofweek
-                , subq_5.ds__extract_dayofyear
+                , subq_5.ds__extract_dow
+                , subq_5.ds__extract_doy
                 , subq_5.ds_partitioned__day
                 , subq_5.ds_partitioned__week
                 , subq_5.ds_partitioned__month
@@ -290,8 +290,8 @@ FROM (
                 , subq_5.ds_partitioned__extract_month
                 , subq_5.ds_partitioned__extract_week
                 , subq_5.ds_partitioned__extract_day
-                , subq_5.ds_partitioned__extract_dayofweek
-                , subq_5.ds_partitioned__extract_dayofyear
+                , subq_5.ds_partitioned__extract_dow
+                , subq_5.ds_partitioned__extract_doy
                 , subq_5.paid_at__day
                 , subq_5.paid_at__week
                 , subq_5.paid_at__month
@@ -302,8 +302,8 @@ FROM (
                 , subq_5.paid_at__extract_month
                 , subq_5.paid_at__extract_week
                 , subq_5.paid_at__extract_day
-                , subq_5.paid_at__extract_dayofweek
-                , subq_5.paid_at__extract_dayofyear
+                , subq_5.paid_at__extract_dow
+                , subq_5.paid_at__extract_doy
                 , subq_5.booking__ds__day
                 , subq_5.booking__ds__week
                 , subq_5.booking__ds__month
@@ -314,8 +314,8 @@ FROM (
                 , subq_5.booking__ds__extract_month
                 , subq_5.booking__ds__extract_week
                 , subq_5.booking__ds__extract_day
-                , subq_5.booking__ds__extract_dayofweek
-                , subq_5.booking__ds__extract_dayofyear
+                , subq_5.booking__ds__extract_dow
+                , subq_5.booking__ds__extract_doy
                 , subq_5.booking__ds_partitioned__day
                 , subq_5.booking__ds_partitioned__week
                 , subq_5.booking__ds_partitioned__month
@@ -326,8 +326,8 @@ FROM (
                 , subq_5.booking__ds_partitioned__extract_month
                 , subq_5.booking__ds_partitioned__extract_week
                 , subq_5.booking__ds_partitioned__extract_day
-                , subq_5.booking__ds_partitioned__extract_dayofweek
-                , subq_5.booking__ds_partitioned__extract_dayofyear
+                , subq_5.booking__ds_partitioned__extract_dow
+                , subq_5.booking__ds_partitioned__extract_doy
                 , subq_5.booking__paid_at__day
                 , subq_5.booking__paid_at__week
                 , subq_5.booking__paid_at__month
@@ -338,8 +338,8 @@ FROM (
                 , subq_5.booking__paid_at__extract_month
                 , subq_5.booking__paid_at__extract_week
                 , subq_5.booking__paid_at__extract_day
-                , subq_5.booking__paid_at__extract_dayofweek
-                , subq_5.booking__paid_at__extract_dayofyear
+                , subq_5.booking__paid_at__extract_dow
+                , subq_5.booking__paid_at__extract_doy
                 , subq_5.ds__day AS metric_time__day
                 , subq_5.ds__week AS metric_time__week
                 , subq_5.ds__month AS metric_time__month
@@ -350,8 +350,8 @@ FROM (
                 , subq_5.ds__extract_month AS metric_time__extract_month
                 , subq_5.ds__extract_week AS metric_time__extract_week
                 , subq_5.ds__extract_day AS metric_time__extract_day
-                , subq_5.ds__extract_dayofweek AS metric_time__extract_dayofweek
-                , subq_5.ds__extract_dayofyear AS metric_time__extract_dayofyear
+                , subq_5.ds__extract_dow AS metric_time__extract_dow
+                , subq_5.ds__extract_doy AS metric_time__extract_doy
                 , subq_5.listing
                 , subq_5.guest
                 , subq_5.host
@@ -396,74 +396,74 @@ FROM (
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
                   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
                   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
                   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
                   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-                  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-                  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-                  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-                  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+                  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -519,8 +519,8 @@ FROM (
             , subq_12.ds__extract_month
             , subq_12.ds__extract_week
             , subq_12.ds__extract_day
-            , subq_12.ds__extract_dayofweek
-            , subq_12.ds__extract_dayofyear
+            , subq_12.ds__extract_dow
+            , subq_12.ds__extract_doy
             , subq_12.ds_partitioned__day
             , subq_12.ds_partitioned__week
             , subq_12.ds_partitioned__month
@@ -531,8 +531,8 @@ FROM (
             , subq_12.ds_partitioned__extract_month
             , subq_12.ds_partitioned__extract_week
             , subq_12.ds_partitioned__extract_day
-            , subq_12.ds_partitioned__extract_dayofweek
-            , subq_12.ds_partitioned__extract_dayofyear
+            , subq_12.ds_partitioned__extract_dow
+            , subq_12.ds_partitioned__extract_doy
             , subq_12.paid_at__day
             , subq_12.paid_at__week
             , subq_12.paid_at__month
@@ -543,8 +543,8 @@ FROM (
             , subq_12.paid_at__extract_month
             , subq_12.paid_at__extract_week
             , subq_12.paid_at__extract_day
-            , subq_12.paid_at__extract_dayofweek
-            , subq_12.paid_at__extract_dayofyear
+            , subq_12.paid_at__extract_dow
+            , subq_12.paid_at__extract_doy
             , subq_12.booking__ds__day
             , subq_12.booking__ds__week
             , subq_12.booking__ds__month
@@ -555,8 +555,8 @@ FROM (
             , subq_12.booking__ds__extract_month
             , subq_12.booking__ds__extract_week
             , subq_12.booking__ds__extract_day
-            , subq_12.booking__ds__extract_dayofweek
-            , subq_12.booking__ds__extract_dayofyear
+            , subq_12.booking__ds__extract_dow
+            , subq_12.booking__ds__extract_doy
             , subq_12.booking__ds_partitioned__day
             , subq_12.booking__ds_partitioned__week
             , subq_12.booking__ds_partitioned__month
@@ -567,8 +567,8 @@ FROM (
             , subq_12.booking__ds_partitioned__extract_month
             , subq_12.booking__ds_partitioned__extract_week
             , subq_12.booking__ds_partitioned__extract_day
-            , subq_12.booking__ds_partitioned__extract_dayofweek
-            , subq_12.booking__ds_partitioned__extract_dayofyear
+            , subq_12.booking__ds_partitioned__extract_dow
+            , subq_12.booking__ds_partitioned__extract_doy
             , subq_12.booking__paid_at__day
             , subq_12.booking__paid_at__week
             , subq_12.booking__paid_at__month
@@ -579,8 +579,8 @@ FROM (
             , subq_12.booking__paid_at__extract_month
             , subq_12.booking__paid_at__extract_week
             , subq_12.booking__paid_at__extract_day
-            , subq_12.booking__paid_at__extract_dayofweek
-            , subq_12.booking__paid_at__extract_dayofyear
+            , subq_12.booking__paid_at__extract_dow
+            , subq_12.booking__paid_at__extract_doy
             , subq_12.ds__day AS metric_time__day
             , subq_12.ds__week AS metric_time__week
             , subq_12.ds__month AS metric_time__month
@@ -591,8 +591,8 @@ FROM (
             , subq_12.ds__extract_month AS metric_time__extract_month
             , subq_12.ds__extract_week AS metric_time__extract_week
             , subq_12.ds__extract_day AS metric_time__extract_day
-            , subq_12.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_12.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_12.ds__extract_dow AS metric_time__extract_dow
+            , subq_12.ds__extract_doy AS metric_time__extract_doy
             , subq_12.listing
             , subq_12.guest
             , subq_12.host
@@ -637,74 +637,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -758,8 +758,8 @@ FROM (
             , subq_17.ds__extract_month
             , subq_17.ds__extract_week
             , subq_17.ds__extract_day
-            , subq_17.ds__extract_dayofweek
-            , subq_17.ds__extract_dayofyear
+            , subq_17.ds__extract_dow
+            , subq_17.ds__extract_doy
             , subq_17.ds_partitioned__day
             , subq_17.ds_partitioned__week
             , subq_17.ds_partitioned__month
@@ -770,8 +770,8 @@ FROM (
             , subq_17.ds_partitioned__extract_month
             , subq_17.ds_partitioned__extract_week
             , subq_17.ds_partitioned__extract_day
-            , subq_17.ds_partitioned__extract_dayofweek
-            , subq_17.ds_partitioned__extract_dayofyear
+            , subq_17.ds_partitioned__extract_dow
+            , subq_17.ds_partitioned__extract_doy
             , subq_17.paid_at__day
             , subq_17.paid_at__week
             , subq_17.paid_at__month
@@ -782,8 +782,8 @@ FROM (
             , subq_17.paid_at__extract_month
             , subq_17.paid_at__extract_week
             , subq_17.paid_at__extract_day
-            , subq_17.paid_at__extract_dayofweek
-            , subq_17.paid_at__extract_dayofyear
+            , subq_17.paid_at__extract_dow
+            , subq_17.paid_at__extract_doy
             , subq_17.booking__ds__day
             , subq_17.booking__ds__week
             , subq_17.booking__ds__month
@@ -794,8 +794,8 @@ FROM (
             , subq_17.booking__ds__extract_month
             , subq_17.booking__ds__extract_week
             , subq_17.booking__ds__extract_day
-            , subq_17.booking__ds__extract_dayofweek
-            , subq_17.booking__ds__extract_dayofyear
+            , subq_17.booking__ds__extract_dow
+            , subq_17.booking__ds__extract_doy
             , subq_17.booking__ds_partitioned__day
             , subq_17.booking__ds_partitioned__week
             , subq_17.booking__ds_partitioned__month
@@ -806,8 +806,8 @@ FROM (
             , subq_17.booking__ds_partitioned__extract_month
             , subq_17.booking__ds_partitioned__extract_week
             , subq_17.booking__ds_partitioned__extract_day
-            , subq_17.booking__ds_partitioned__extract_dayofweek
-            , subq_17.booking__ds_partitioned__extract_dayofyear
+            , subq_17.booking__ds_partitioned__extract_dow
+            , subq_17.booking__ds_partitioned__extract_doy
             , subq_17.booking__paid_at__day
             , subq_17.booking__paid_at__week
             , subq_17.booking__paid_at__month
@@ -818,8 +818,8 @@ FROM (
             , subq_17.booking__paid_at__extract_month
             , subq_17.booking__paid_at__extract_week
             , subq_17.booking__paid_at__extract_day
-            , subq_17.booking__paid_at__extract_dayofweek
-            , subq_17.booking__paid_at__extract_dayofyear
+            , subq_17.booking__paid_at__extract_dow
+            , subq_17.booking__paid_at__extract_doy
             , subq_17.ds__day AS metric_time__day
             , subq_17.ds__week AS metric_time__week
             , subq_17.ds__month AS metric_time__month
@@ -830,8 +830,8 @@ FROM (
             , subq_17.ds__extract_month AS metric_time__extract_month
             , subq_17.ds__extract_week AS metric_time__extract_week
             , subq_17.ds__extract_day AS metric_time__extract_day
-            , subq_17.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_17.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_17.ds__extract_dow AS metric_time__extract_dow
+            , subq_17.ds__extract_doy AS metric_time__extract_doy
             , subq_17.listing
             , subq_17.guest
             , subq_17.host
@@ -876,74 +876,74 @@ FROM (
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
               , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
               , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
               , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
               , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-              , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-              , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-              , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-              , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql
index 63116a5458..d6632b499f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_order_by_node__plan0.sql
@@ -45,74 +45,74 @@ FROM (
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
           , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
           , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
           , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
           , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-          , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-          , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-          , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-          , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql
index e43e265eff..44cff4ab94 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_partitioned_join__plan0.sql
@@ -41,8 +41,8 @@ FROM (
             , subq_0.ds__extract_month
             , subq_0.ds__extract_week
             , subq_0.ds__extract_day
-            , subq_0.ds__extract_dayofweek
-            , subq_0.ds__extract_dayofyear
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
             , subq_0.ds_partitioned__day
             , subq_0.ds_partitioned__week
             , subq_0.ds_partitioned__month
@@ -53,8 +53,8 @@ FROM (
             , subq_0.ds_partitioned__extract_month
             , subq_0.ds_partitioned__extract_week
             , subq_0.ds_partitioned__extract_day
-            , subq_0.ds_partitioned__extract_dayofweek
-            , subq_0.ds_partitioned__extract_dayofyear
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
             , subq_0.verification__ds__day
             , subq_0.verification__ds__week
             , subq_0.verification__ds__month
@@ -65,8 +65,8 @@ FROM (
             , subq_0.verification__ds__extract_month
             , subq_0.verification__ds__extract_week
             , subq_0.verification__ds__extract_day
-            , subq_0.verification__ds__extract_dayofweek
-            , subq_0.verification__ds__extract_dayofyear
+            , subq_0.verification__ds__extract_dow
+            , subq_0.verification__ds__extract_doy
             , subq_0.verification__ds_partitioned__day
             , subq_0.verification__ds_partitioned__week
             , subq_0.verification__ds_partitioned__month
@@ -77,8 +77,8 @@ FROM (
             , subq_0.verification__ds_partitioned__extract_month
             , subq_0.verification__ds_partitioned__extract_week
             , subq_0.verification__ds_partitioned__extract_day
-            , subq_0.verification__ds_partitioned__extract_dayofweek
-            , subq_0.verification__ds_partitioned__extract_dayofyear
+            , subq_0.verification__ds_partitioned__extract_dow
+            , subq_0.verification__ds_partitioned__extract_doy
             , subq_0.ds__day AS metric_time__day
             , subq_0.ds__week AS metric_time__week
             , subq_0.ds__month AS metric_time__month
@@ -89,8 +89,8 @@ FROM (
             , subq_0.ds__extract_month AS metric_time__extract_month
             , subq_0.ds__extract_week AS metric_time__extract_week
             , subq_0.ds__extract_day AS metric_time__extract_day
-            , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-            , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
             , subq_0.verification
             , subq_0.user
             , subq_0.verification__user
@@ -106,50 +106,50 @@ FROM (
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS ds__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS ds__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS ds__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS ds__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds) AS ds__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds) AS ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS ds_partitioned__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds) AS verification__ds__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds) AS verification__ds__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds) AS verification__ds__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds) AS verification__ds__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC('week', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__week
               , DATE_TRUNC('month', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__month
               , DATE_TRUNC('quarter', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__quarter
               , DATE_TRUNC('year', id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__year
-              , EXTRACT(YEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
-              , EXTRACT(QUARTER FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
-              , EXTRACT(MONTH FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-              , EXTRACT(WEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
-              , EXTRACT(DAY FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofweek
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dayofyear
+              , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
+              , EXTRACT(week FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+              , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
+              , EXTRACT(dow FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -173,74 +173,74 @@ FROM (
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS ds__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds) AS ds__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds) AS ds__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds) AS ds__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds) AS ds__extract_doy
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS created_at__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.created_at) AS created_at__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.created_at) AS created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds) AS user__ds__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds) AS user__ds__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds) AS user__ds__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds) AS user__ds__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds) AS user__ds__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds) AS user__ds__extract_doy
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC('week', users_ds_source_src_10007.created_at) AS user__created_at__week
             , DATE_TRUNC('month', users_ds_source_src_10007.created_at) AS user__created_at__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.created_at) AS user__created_at__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.created_at) AS user__created_at__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC('week', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__week
             , DATE_TRUNC('month', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__month
             , DATE_TRUNC('quarter', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__quarter
             , DATE_TRUNC('year', users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__year
-            , EXTRACT(YEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
+            , EXTRACT(week FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
+            , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
+            , EXTRACT(dow FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql
index d88d2d32f3..33fc914795 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -82,26 +82,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql
index 094486f462..d90abbd294 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql
index a8a26c9899..dc98b44d95 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -83,26 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index c400372dd4..d723157d2a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index 30ab4c1851..95274f2863 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month AS ds__extract_month
   , subq_0.ds__extract_week AS ds__extract_week
   , subq_0.ds__extract_day AS ds__extract_day
-  , subq_0.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_0.ds__extract_dow AS ds__extract_dow
+  , subq_0.ds__extract_doy AS ds__extract_doy
   , subq_0.account__ds__day AS account__ds__day
   , subq_0.account__ds__week AS account__ds__week
   , subq_0.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.account__ds__extract_month AS account__ds__extract_month
   , subq_0.account__ds__extract_week AS account__ds__extract_week
   , subq_0.account__ds__extract_day AS account__ds__extract_day
-  , subq_0.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_0.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_0.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_0.account__ds__extract_doy AS account__ds__extract_doy
   , subq_0.user AS user
   , subq_0.account__user AS account__user
   , subq_0.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
     , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
     , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
     , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-    , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+    , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -83,26 +83,26 @@ INNER JOIN (
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC('week', accounts_source_src_10000.ds) AS account__ds__week
       , DATE_TRUNC('month', accounts_source_src_10000.ds) AS account__ds__month
       , DATE_TRUNC('quarter', accounts_source_src_10000.ds) AS account__ds__quarter
       , DATE_TRUNC('year', accounts_source_src_10000.ds) AS account__ds__year
-      , EXTRACT(YEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_year
-      , EXTRACT(QUARTER FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
-      , EXTRACT(MONTH FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(WEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
-      , EXTRACT(DAY FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_dayofyear
+      , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
+      , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
+      , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
+      , EXTRACT(week FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
+      , EXTRACT(dow FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(doy FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index ef337f422c..e0c877bdf1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_3.ds__extract_month AS ds__extract_month
   , subq_3.ds__extract_week AS ds__extract_week
   , subq_3.ds__extract_day AS ds__extract_day
-  , subq_3.ds__extract_dayofweek AS ds__extract_dayofweek
-  , subq_3.ds__extract_dayofyear AS ds__extract_dayofyear
+  , subq_3.ds__extract_dow AS ds__extract_dow
+  , subq_3.ds__extract_doy AS ds__extract_doy
   , subq_3.account__ds__day AS account__ds__day
   , subq_3.account__ds__week AS account__ds__week
   , subq_3.account__ds__month AS account__ds__month
@@ -22,8 +22,8 @@ SELECT
   , subq_3.account__ds__extract_month AS account__ds__extract_month
   , subq_3.account__ds__extract_week AS account__ds__extract_week
   , subq_3.account__ds__extract_day AS account__ds__extract_day
-  , subq_3.account__ds__extract_dayofweek AS account__ds__extract_dayofweek
-  , subq_3.account__ds__extract_dayofyear AS account__ds__extract_dayofyear
+  , subq_3.account__ds__extract_dow AS account__ds__extract_dow
+  , subq_3.account__ds__extract_doy AS account__ds__extract_doy
   , subq_3.user AS user
   , subq_3.account__user AS account__user
   , subq_3.account_type AS account_type
@@ -42,26 +42,26 @@ FROM (
     , DATE_TRUNC('month', ds) AS ds__month
     , DATE_TRUNC('quarter', ds) AS ds__quarter
     , DATE_TRUNC('year', ds) AS ds__year
-    , EXTRACT(YEAR FROM ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS ds__extract_week
-    , EXTRACT(DAY FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS ds__extract_year
+    , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+    , EXTRACT(month FROM ds) AS ds__extract_month
+    , EXTRACT(week FROM ds) AS ds__extract_week
+    , EXTRACT(day FROM ds) AS ds__extract_day
+    , EXTRACT(dow FROM ds) AS ds__extract_dow
+    , EXTRACT(doy FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC('week', ds) AS account__ds__week
     , DATE_TRUNC('month', ds) AS account__ds__month
     , DATE_TRUNC('quarter', ds) AS account__ds__quarter
     , DATE_TRUNC('year', ds) AS account__ds__year
-    , EXTRACT(YEAR FROM ds) AS account__ds__extract_year
-    , EXTRACT(QUARTER FROM ds) AS account__ds__extract_quarter
-    , EXTRACT(MONTH FROM ds) AS account__ds__extract_month
-    , EXTRACT(WEEK FROM ds) AS account__ds__extract_week
-    , EXTRACT(DAY FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_dayofyear
+    , EXTRACT(year FROM ds) AS account__ds__extract_year
+    , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
+    , EXTRACT(month FROM ds) AS account__ds__extract_month
+    , EXTRACT(week FROM ds) AS account__ds__extract_week
+    , EXTRACT(day FROM ds) AS account__ds__extract_day
+    , EXTRACT(dow FROM ds) AS account__ds__extract_dow
+    , EXTRACT(doy FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql
index 16b897731d..9c6e0a2676 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_single_join_node__plan0.sql
@@ -31,74 +31,74 @@ FROM (
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
       , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
       , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
       , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
       , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-      , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-      , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-      , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-      , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+      , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+      , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+      , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+      , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+      , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -125,25 +125,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -152,25 +152,25 @@ LEFT OUTER JOIN (
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__ds__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__ds__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__ds__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC('week', listings_latest_src_10004.created_at) AS listing__created_at__week
       , DATE_TRUNC('month', listings_latest_src_10004.created_at) AS listing__created_at__month
       , DATE_TRUNC('quarter', listings_latest_src_10004.created_at) AS listing__created_at__quarter
       , DATE_TRUNC('year', listings_latest_src_10004.created_at) AS listing__created_at__year
-      , EXTRACT(YEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
-      , EXTRACT(QUARTER FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
-      , EXTRACT(MONTH FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(WEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
-      , EXTRACT(DAY FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofweek
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dayofyear
+      , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
+      , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
+      , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
+      , EXTRACT(week FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
+      , EXTRACT(dow FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(doy FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql
index 7dd5c3b39d..b9ae7f84a4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0.sql
@@ -20,74 +20,74 @@ SELECT
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql
index e240956212..d1560d9ab0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_source_node__plan0_optimized.sql
@@ -20,74 +20,74 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 6eb1db1ad8..66b9a92b39 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month
   , subq_0.ds__extract_week
   , subq_0.ds__extract_day
-  , subq_0.ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear
+  , subq_0.ds__extract_dow
+  , subq_0.ds__extract_doy
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.ds_partitioned__extract_month
   , subq_0.ds_partitioned__extract_week
   , subq_0.ds_partitioned__extract_day
-  , subq_0.ds_partitioned__extract_dayofweek
-  , subq_0.ds_partitioned__extract_dayofyear
+  , subq_0.ds_partitioned__extract_dow
+  , subq_0.ds_partitioned__extract_doy
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
@@ -34,8 +34,8 @@ SELECT
   , subq_0.paid_at__extract_month
   , subq_0.paid_at__extract_week
   , subq_0.paid_at__extract_day
-  , subq_0.paid_at__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear
+  , subq_0.paid_at__extract_dow
+  , subq_0.paid_at__extract_doy
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
@@ -46,8 +46,8 @@ SELECT
   , subq_0.booking__ds__extract_month
   , subq_0.booking__ds__extract_week
   , subq_0.booking__ds__extract_day
-  , subq_0.booking__ds__extract_dayofweek
-  , subq_0.booking__ds__extract_dayofyear
+  , subq_0.booking__ds__extract_dow
+  , subq_0.booking__ds__extract_doy
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
@@ -58,8 +58,8 @@ SELECT
   , subq_0.booking__ds_partitioned__extract_month
   , subq_0.booking__ds_partitioned__extract_week
   , subq_0.booking__ds_partitioned__extract_day
-  , subq_0.booking__ds_partitioned__extract_dayofweek
-  , subq_0.booking__ds_partitioned__extract_dayofyear
+  , subq_0.booking__ds_partitioned__extract_dow
+  , subq_0.booking__ds_partitioned__extract_doy
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
@@ -70,8 +70,8 @@ SELECT
   , subq_0.booking__paid_at__extract_month
   , subq_0.booking__paid_at__extract_week
   , subq_0.booking__paid_at__extract_day
-  , subq_0.booking__paid_at__extract_dayofweek
-  , subq_0.booking__paid_at__extract_dayofyear
+  , subq_0.booking__paid_at__extract_dow
+  , subq_0.booking__paid_at__extract_doy
   , subq_0.paid_at__day AS metric_time__day
   , subq_0.paid_at__week AS metric_time__week
   , subq_0.paid_at__month AS metric_time__month
@@ -82,8 +82,8 @@ SELECT
   , subq_0.paid_at__extract_month AS metric_time__extract_month
   , subq_0.paid_at__extract_week AS metric_time__extract_week
   , subq_0.paid_at__extract_day AS metric_time__extract_day
-  , subq_0.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
+  , subq_0.paid_at__extract_dow AS metric_time__extract_dow
+  , subq_0.paid_at__extract_doy AS metric_time__extract_doy
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
@@ -116,74 +116,74 @@ FROM (
     , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
     , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
     , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
     , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
     , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
     , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
     , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
     , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 25222a0a63..cfaecd587b 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -6,85 +6,85 @@ SELECT
   , DATE_TRUNC(ds, month) AS ds__month
   , DATE_TRUNC(ds, quarter) AS ds__quarter
   , DATE_TRUNC(ds, year) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(ISOWEEK FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS ds_partitioned__month
   , DATE_TRUNC(ds_partitioned, quarter) AS ds_partitioned__quarter
   , DATE_TRUNC(ds_partitioned, year) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(ISOWEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS paid_at__week
   , DATE_TRUNC(paid_at, month) AS paid_at__month
   , DATE_TRUNC(paid_at, quarter) AS paid_at__quarter
   , DATE_TRUNC(paid_at, year) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(ISOWEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC(ds, isoweek) AS booking__ds__week
   , DATE_TRUNC(ds, month) AS booking__ds__month
   , DATE_TRUNC(ds, quarter) AS booking__ds__quarter
   , DATE_TRUNC(ds, year) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(ISOWEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS booking__ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS booking__ds_partitioned__month
   , DATE_TRUNC(ds_partitioned, quarter) AS booking__ds_partitioned__quarter
   , DATE_TRUNC(ds_partitioned, year) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(ISOWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS booking__paid_at__week
   , DATE_TRUNC(paid_at, month) AS booking__paid_at__month
   , DATE_TRUNC(paid_at, quarter) AS booking__paid_at__quarter
   , DATE_TRUNC(paid_at, year) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(ISOWEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_doy
   , paid_at AS metric_time__day
   , DATE_TRUNC(paid_at, isoweek) AS metric_time__week
   , DATE_TRUNC(paid_at, month) AS metric_time__month
   , DATE_TRUNC(paid_at, quarter) AS metric_time__quarter
   , DATE_TRUNC(paid_at, year) AS metric_time__year
-  , EXTRACT(YEAR FROM paid_at) AS metric_time__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS metric_time__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS metric_time__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS metric_time__extract_week
-  , EXTRACT(DAY FROM paid_at) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS metric_time__extract_year
+  , EXTRACT(quarter FROM paid_at) AS metric_time__extract_quarter
+  , EXTRACT(month FROM paid_at) AS metric_time__extract_month
+  , EXTRACT(ISOWEEK FROM paid_at) AS metric_time__extract_week
+  , EXTRACT(day FROM paid_at) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 07a5a8e779..9895b04f88 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month
   , subq_0.ds__extract_week
   , subq_0.ds__extract_day
-  , subq_0.ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear
+  , subq_0.ds__extract_dow
+  , subq_0.ds__extract_doy
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.ds_partitioned__extract_month
   , subq_0.ds_partitioned__extract_week
   , subq_0.ds_partitioned__extract_day
-  , subq_0.ds_partitioned__extract_dayofweek
-  , subq_0.ds_partitioned__extract_dayofyear
+  , subq_0.ds_partitioned__extract_dow
+  , subq_0.ds_partitioned__extract_doy
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
@@ -34,8 +34,8 @@ SELECT
   , subq_0.paid_at__extract_month
   , subq_0.paid_at__extract_week
   , subq_0.paid_at__extract_day
-  , subq_0.paid_at__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear
+  , subq_0.paid_at__extract_dow
+  , subq_0.paid_at__extract_doy
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
@@ -46,8 +46,8 @@ SELECT
   , subq_0.booking__ds__extract_month
   , subq_0.booking__ds__extract_week
   , subq_0.booking__ds__extract_day
-  , subq_0.booking__ds__extract_dayofweek
-  , subq_0.booking__ds__extract_dayofyear
+  , subq_0.booking__ds__extract_dow
+  , subq_0.booking__ds__extract_doy
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
@@ -58,8 +58,8 @@ SELECT
   , subq_0.booking__ds_partitioned__extract_month
   , subq_0.booking__ds_partitioned__extract_week
   , subq_0.booking__ds_partitioned__extract_day
-  , subq_0.booking__ds_partitioned__extract_dayofweek
-  , subq_0.booking__ds_partitioned__extract_dayofyear
+  , subq_0.booking__ds_partitioned__extract_dow
+  , subq_0.booking__ds_partitioned__extract_doy
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
@@ -70,8 +70,8 @@ SELECT
   , subq_0.booking__paid_at__extract_month
   , subq_0.booking__paid_at__extract_week
   , subq_0.booking__paid_at__extract_day
-  , subq_0.booking__paid_at__extract_dayofweek
-  , subq_0.booking__paid_at__extract_dayofyear
+  , subq_0.booking__paid_at__extract_dow
+  , subq_0.booking__paid_at__extract_doy
   , subq_0.ds__day AS metric_time__day
   , subq_0.ds__week AS metric_time__week
   , subq_0.ds__month AS metric_time__month
@@ -82,8 +82,8 @@ SELECT
   , subq_0.ds__extract_month AS metric_time__extract_month
   , subq_0.ds__extract_week AS metric_time__extract_week
   , subq_0.ds__extract_day AS metric_time__extract_day
-  , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+  , subq_0.ds__extract_dow AS metric_time__extract_dow
+  , subq_0.ds__extract_doy AS metric_time__extract_doy
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
@@ -128,74 +128,74 @@ FROM (
     , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
     , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
     , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
     , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
     , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
     , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
     , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
     , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 49d41bb5d7..9e14d2f83b 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -6,85 +6,85 @@ SELECT
   , DATE_TRUNC(ds, month) AS ds__month
   , DATE_TRUNC(ds, quarter) AS ds__quarter
   , DATE_TRUNC(ds, year) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(ISOWEEK FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS ds_partitioned__month
   , DATE_TRUNC(ds_partitioned, quarter) AS ds_partitioned__quarter
   , DATE_TRUNC(ds_partitioned, year) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(ISOWEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS paid_at__week
   , DATE_TRUNC(paid_at, month) AS paid_at__month
   , DATE_TRUNC(paid_at, quarter) AS paid_at__quarter
   , DATE_TRUNC(paid_at, year) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(ISOWEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC(ds, isoweek) AS booking__ds__week
   , DATE_TRUNC(ds, month) AS booking__ds__month
   , DATE_TRUNC(ds, quarter) AS booking__ds__quarter
   , DATE_TRUNC(ds, year) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(ISOWEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS booking__ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS booking__ds_partitioned__month
   , DATE_TRUNC(ds_partitioned, quarter) AS booking__ds_partitioned__quarter
   , DATE_TRUNC(ds_partitioned, year) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(ISOWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS booking__paid_at__week
   , DATE_TRUNC(paid_at, month) AS booking__paid_at__month
   , DATE_TRUNC(paid_at, quarter) AS booking__paid_at__quarter
   , DATE_TRUNC(paid_at, year) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(ISOWEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_doy
   , ds AS metric_time__day
   , DATE_TRUNC(ds, isoweek) AS metric_time__week
   , DATE_TRUNC(ds, month) AS metric_time__month
   , DATE_TRUNC(ds, quarter) AS metric_time__quarter
   , DATE_TRUNC(ds, year) AS metric_time__year
-  , EXTRACT(YEAR FROM ds) AS metric_time__extract_year
-  , EXTRACT(QUARTER FROM ds) AS metric_time__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS metric_time__extract_month
-  , EXTRACT(WEEK FROM ds) AS metric_time__extract_week
-  , EXTRACT(DAY FROM ds) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_dayofyear
+  , EXTRACT(year FROM ds) AS metric_time__extract_year
+  , EXTRACT(quarter FROM ds) AS metric_time__extract_quarter
+  , EXTRACT(month FROM ds) AS metric_time__extract_month
+  , EXTRACT(ISOWEEK FROM ds) AS metric_time__extract_week
+  , EXTRACT(day FROM ds) AS metric_time__extract_day
+  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dow
+  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
index 7b4716534b..599746d204 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -150,74 +150,74 @@ FROM (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -261,8 +261,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month
           , subq_5.ds__extract_week
           , subq_5.ds__extract_day
-          , subq_5.ds__extract_dayofweek
-          , subq_5.ds__extract_dayofyear
+          , subq_5.ds__extract_dow
+          , subq_5.ds__extract_doy
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
@@ -273,8 +273,8 @@ FULL OUTER JOIN (
           , subq_5.ds_partitioned__extract_month
           , subq_5.ds_partitioned__extract_week
           , subq_5.ds_partitioned__extract_day
-          , subq_5.ds_partitioned__extract_dayofweek
-          , subq_5.ds_partitioned__extract_dayofyear
+          , subq_5.ds_partitioned__extract_dow
+          , subq_5.ds_partitioned__extract_doy
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
@@ -285,8 +285,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month
           , subq_5.paid_at__extract_week
           , subq_5.paid_at__extract_day
-          , subq_5.paid_at__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear
+          , subq_5.paid_at__extract_dow
+          , subq_5.paid_at__extract_doy
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
@@ -297,8 +297,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds__extract_month
           , subq_5.booking__ds__extract_week
           , subq_5.booking__ds__extract_day
-          , subq_5.booking__ds__extract_dayofweek
-          , subq_5.booking__ds__extract_dayofyear
+          , subq_5.booking__ds__extract_dow
+          , subq_5.booking__ds__extract_doy
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
@@ -309,8 +309,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds_partitioned__extract_month
           , subq_5.booking__ds_partitioned__extract_week
           , subq_5.booking__ds_partitioned__extract_day
-          , subq_5.booking__ds_partitioned__extract_dayofweek
-          , subq_5.booking__ds_partitioned__extract_dayofyear
+          , subq_5.booking__ds_partitioned__extract_dow
+          , subq_5.booking__ds_partitioned__extract_doy
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
@@ -321,8 +321,8 @@ FULL OUTER JOIN (
           , subq_5.booking__paid_at__extract_month
           , subq_5.booking__paid_at__extract_week
           , subq_5.booking__paid_at__extract_day
-          , subq_5.booking__paid_at__extract_dayofweek
-          , subq_5.booking__paid_at__extract_dayofyear
+          , subq_5.booking__paid_at__extract_dow
+          , subq_5.booking__paid_at__extract_doy
           , subq_5.paid_at__day AS metric_time__day
           , subq_5.paid_at__week AS metric_time__week
           , subq_5.paid_at__month AS metric_time__month
@@ -333,8 +333,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month AS metric_time__extract_month
           , subq_5.paid_at__extract_week AS metric_time__extract_week
           , subq_5.paid_at__extract_day AS metric_time__extract_day
-          , subq_5.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_5.paid_at__extract_dow AS metric_time__extract_dow
+          , subq_5.paid_at__extract_doy AS metric_time__extract_doy
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
@@ -367,74 +367,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
             , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
             , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
             , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
             , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 5bbf8cbab3..e9ab8e5153 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month
   , subq_0.ds__extract_week
   , subq_0.ds__extract_day
-  , subq_0.ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear
+  , subq_0.ds__extract_dow
+  , subq_0.ds__extract_doy
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.ds_partitioned__extract_month
   , subq_0.ds_partitioned__extract_week
   , subq_0.ds_partitioned__extract_day
-  , subq_0.ds_partitioned__extract_dayofweek
-  , subq_0.ds_partitioned__extract_dayofyear
+  , subq_0.ds_partitioned__extract_dow
+  , subq_0.ds_partitioned__extract_doy
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
@@ -34,8 +34,8 @@ SELECT
   , subq_0.paid_at__extract_month
   , subq_0.paid_at__extract_week
   , subq_0.paid_at__extract_day
-  , subq_0.paid_at__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear
+  , subq_0.paid_at__extract_dow
+  , subq_0.paid_at__extract_doy
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
@@ -46,8 +46,8 @@ SELECT
   , subq_0.booking__ds__extract_month
   , subq_0.booking__ds__extract_week
   , subq_0.booking__ds__extract_day
-  , subq_0.booking__ds__extract_dayofweek
-  , subq_0.booking__ds__extract_dayofyear
+  , subq_0.booking__ds__extract_dow
+  , subq_0.booking__ds__extract_doy
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
@@ -58,8 +58,8 @@ SELECT
   , subq_0.booking__ds_partitioned__extract_month
   , subq_0.booking__ds_partitioned__extract_week
   , subq_0.booking__ds_partitioned__extract_day
-  , subq_0.booking__ds_partitioned__extract_dayofweek
-  , subq_0.booking__ds_partitioned__extract_dayofyear
+  , subq_0.booking__ds_partitioned__extract_dow
+  , subq_0.booking__ds_partitioned__extract_doy
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
@@ -70,8 +70,8 @@ SELECT
   , subq_0.booking__paid_at__extract_month
   , subq_0.booking__paid_at__extract_week
   , subq_0.booking__paid_at__extract_day
-  , subq_0.booking__paid_at__extract_dayofweek
-  , subq_0.booking__paid_at__extract_dayofyear
+  , subq_0.booking__paid_at__extract_dow
+  , subq_0.booking__paid_at__extract_doy
   , subq_0.paid_at__day AS metric_time__day
   , subq_0.paid_at__week AS metric_time__week
   , subq_0.paid_at__month AS metric_time__month
@@ -82,8 +82,8 @@ SELECT
   , subq_0.paid_at__extract_month AS metric_time__extract_month
   , subq_0.paid_at__extract_week AS metric_time__extract_week
   , subq_0.paid_at__extract_day AS metric_time__extract_day
-  , subq_0.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
+  , subq_0.paid_at__extract_dow AS metric_time__extract_dow
+  , subq_0.paid_at__extract_doy AS metric_time__extract_doy
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
@@ -116,74 +116,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 746c7caf59..00e036ec03 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -6,85 +6,85 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DOY FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DOY FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DOY FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DOY FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DOY FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DOY FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , paid_at AS metric_time__day
   , DATE_TRUNC('week', paid_at) AS metric_time__week
   , DATE_TRUNC('month', paid_at) AS metric_time__month
   , DATE_TRUNC('quarter', paid_at) AS metric_time__quarter
   , DATE_TRUNC('year', paid_at) AS metric_time__year
-  , EXTRACT(YEAR FROM paid_at) AS metric_time__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS metric_time__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS metric_time__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS metric_time__extract_week
-  , EXTRACT(DAY FROM paid_at) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dayofweek
-  , EXTRACT(DOY FROM paid_at) AS metric_time__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS metric_time__extract_year
+  , EXTRACT(quarter FROM paid_at) AS metric_time__extract_quarter
+  , EXTRACT(month FROM paid_at) AS metric_time__extract_month
+  , EXTRACT(week FROM paid_at) AS metric_time__extract_week
+  , EXTRACT(day FROM paid_at) AS metric_time__extract_day
+  , EXTRACT(dow FROM paid_at) AS metric_time__extract_dow
+  , EXTRACT(doy FROM paid_at) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index bb677b5714..e2cc747ae2 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month
   , subq_0.ds__extract_week
   , subq_0.ds__extract_day
-  , subq_0.ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear
+  , subq_0.ds__extract_dow
+  , subq_0.ds__extract_doy
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.ds_partitioned__extract_month
   , subq_0.ds_partitioned__extract_week
   , subq_0.ds_partitioned__extract_day
-  , subq_0.ds_partitioned__extract_dayofweek
-  , subq_0.ds_partitioned__extract_dayofyear
+  , subq_0.ds_partitioned__extract_dow
+  , subq_0.ds_partitioned__extract_doy
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
@@ -34,8 +34,8 @@ SELECT
   , subq_0.paid_at__extract_month
   , subq_0.paid_at__extract_week
   , subq_0.paid_at__extract_day
-  , subq_0.paid_at__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear
+  , subq_0.paid_at__extract_dow
+  , subq_0.paid_at__extract_doy
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
@@ -46,8 +46,8 @@ SELECT
   , subq_0.booking__ds__extract_month
   , subq_0.booking__ds__extract_week
   , subq_0.booking__ds__extract_day
-  , subq_0.booking__ds__extract_dayofweek
-  , subq_0.booking__ds__extract_dayofyear
+  , subq_0.booking__ds__extract_dow
+  , subq_0.booking__ds__extract_doy
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
@@ -58,8 +58,8 @@ SELECT
   , subq_0.booking__ds_partitioned__extract_month
   , subq_0.booking__ds_partitioned__extract_week
   , subq_0.booking__ds_partitioned__extract_day
-  , subq_0.booking__ds_partitioned__extract_dayofweek
-  , subq_0.booking__ds_partitioned__extract_dayofyear
+  , subq_0.booking__ds_partitioned__extract_dow
+  , subq_0.booking__ds_partitioned__extract_doy
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
@@ -70,8 +70,8 @@ SELECT
   , subq_0.booking__paid_at__extract_month
   , subq_0.booking__paid_at__extract_week
   , subq_0.booking__paid_at__extract_day
-  , subq_0.booking__paid_at__extract_dayofweek
-  , subq_0.booking__paid_at__extract_dayofyear
+  , subq_0.booking__paid_at__extract_dow
+  , subq_0.booking__paid_at__extract_doy
   , subq_0.ds__day AS metric_time__day
   , subq_0.ds__week AS metric_time__week
   , subq_0.ds__month AS metric_time__month
@@ -82,8 +82,8 @@ SELECT
   , subq_0.ds__extract_month AS metric_time__extract_month
   , subq_0.ds__extract_week AS metric_time__extract_week
   , subq_0.ds__extract_day AS metric_time__extract_day
-  , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+  , subq_0.ds__extract_dow AS metric_time__extract_dow
+  , subq_0.ds__extract_doy AS metric_time__extract_doy
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
@@ -128,74 +128,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index d67732107d..c6d742fae0 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -6,85 +6,85 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DOY FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DOY FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DOY FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DOY FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DOY FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DOY FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , ds AS metric_time__day
   , DATE_TRUNC('week', ds) AS metric_time__week
   , DATE_TRUNC('month', ds) AS metric_time__month
   , DATE_TRUNC('quarter', ds) AS metric_time__quarter
   , DATE_TRUNC('year', ds) AS metric_time__year
-  , EXTRACT(YEAR FROM ds) AS metric_time__extract_year
-  , EXTRACT(QUARTER FROM ds) AS metric_time__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS metric_time__extract_month
-  , EXTRACT(WEEK FROM ds) AS metric_time__extract_week
-  , EXTRACT(DAY FROM ds) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
-  , EXTRACT(DOY FROM ds) AS metric_time__extract_dayofyear
+  , EXTRACT(year FROM ds) AS metric_time__extract_year
+  , EXTRACT(quarter FROM ds) AS metric_time__extract_quarter
+  , EXTRACT(month FROM ds) AS metric_time__extract_month
+  , EXTRACT(week FROM ds) AS metric_time__extract_week
+  , EXTRACT(day FROM ds) AS metric_time__extract_day
+  , EXTRACT(dow FROM ds) AS metric_time__extract_dow
+  , EXTRACT(doy FROM ds) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
index a7e28bf336..c88105f92d 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Databricks/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -150,74 +150,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -261,8 +261,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month
           , subq_5.ds__extract_week
           , subq_5.ds__extract_day
-          , subq_5.ds__extract_dayofweek
-          , subq_5.ds__extract_dayofyear
+          , subq_5.ds__extract_dow
+          , subq_5.ds__extract_doy
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
@@ -273,8 +273,8 @@ FULL OUTER JOIN (
           , subq_5.ds_partitioned__extract_month
           , subq_5.ds_partitioned__extract_week
           , subq_5.ds_partitioned__extract_day
-          , subq_5.ds_partitioned__extract_dayofweek
-          , subq_5.ds_partitioned__extract_dayofyear
+          , subq_5.ds_partitioned__extract_dow
+          , subq_5.ds_partitioned__extract_doy
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
@@ -285,8 +285,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month
           , subq_5.paid_at__extract_week
           , subq_5.paid_at__extract_day
-          , subq_5.paid_at__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear
+          , subq_5.paid_at__extract_dow
+          , subq_5.paid_at__extract_doy
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
@@ -297,8 +297,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds__extract_month
           , subq_5.booking__ds__extract_week
           , subq_5.booking__ds__extract_day
-          , subq_5.booking__ds__extract_dayofweek
-          , subq_5.booking__ds__extract_dayofyear
+          , subq_5.booking__ds__extract_dow
+          , subq_5.booking__ds__extract_doy
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
@@ -309,8 +309,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds_partitioned__extract_month
           , subq_5.booking__ds_partitioned__extract_week
           , subq_5.booking__ds_partitioned__extract_day
-          , subq_5.booking__ds_partitioned__extract_dayofweek
-          , subq_5.booking__ds_partitioned__extract_dayofyear
+          , subq_5.booking__ds_partitioned__extract_dow
+          , subq_5.booking__ds_partitioned__extract_doy
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
@@ -321,8 +321,8 @@ FULL OUTER JOIN (
           , subq_5.booking__paid_at__extract_month
           , subq_5.booking__paid_at__extract_week
           , subq_5.booking__paid_at__extract_day
-          , subq_5.booking__paid_at__extract_dayofweek
-          , subq_5.booking__paid_at__extract_dayofyear
+          , subq_5.booking__paid_at__extract_dow
+          , subq_5.booking__paid_at__extract_doy
           , subq_5.paid_at__day AS metric_time__day
           , subq_5.paid_at__week AS metric_time__week
           , subq_5.paid_at__month AS metric_time__month
@@ -333,8 +333,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month AS metric_time__extract_month
           , subq_5.paid_at__extract_week AS metric_time__extract_week
           , subq_5.paid_at__extract_day AS metric_time__extract_day
-          , subq_5.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_5.paid_at__extract_dow AS metric_time__extract_dow
+          , subq_5.paid_at__extract_doy AS metric_time__extract_doy
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
@@ -367,74 +367,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DOY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index c1a2ea132e..e9ab8e5153 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -116,74 +116,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 5b9d645f22..00e036ec03 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -6,85 +6,85 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_doy
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_doy
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_doy
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_doy
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , paid_at AS metric_time__day
   , DATE_TRUNC('week', paid_at) AS metric_time__week
   , DATE_TRUNC('month', paid_at) AS metric_time__month
   , DATE_TRUNC('quarter', paid_at) AS metric_time__quarter
   , DATE_TRUNC('year', paid_at) AS metric_time__year
-  , EXTRACT(YEAR FROM paid_at) AS metric_time__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS metric_time__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS metric_time__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS metric_time__extract_week
-  , EXTRACT(DAY FROM paid_at) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_doy
+  , EXTRACT(year FROM paid_at) AS metric_time__extract_year
+  , EXTRACT(quarter FROM paid_at) AS metric_time__extract_quarter
+  , EXTRACT(month FROM paid_at) AS metric_time__extract_month
+  , EXTRACT(week FROM paid_at) AS metric_time__extract_week
+  , EXTRACT(day FROM paid_at) AS metric_time__extract_day
+  , EXTRACT(dow FROM paid_at) AS metric_time__extract_dow
+  , EXTRACT(doy FROM paid_at) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index e5d56619ca..e2cc747ae2 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -128,74 +128,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 72985c569e..c6d742fae0 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -6,85 +6,85 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_doy
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_doy
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_doy
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_doy
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , ds AS metric_time__day
   , DATE_TRUNC('week', ds) AS metric_time__week
   , DATE_TRUNC('month', ds) AS metric_time__month
   , DATE_TRUNC('quarter', ds) AS metric_time__quarter
   , DATE_TRUNC('year', ds) AS metric_time__year
-  , EXTRACT(YEAR FROM ds) AS metric_time__extract_year
-  , EXTRACT(QUARTER FROM ds) AS metric_time__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS metric_time__extract_month
-  , EXTRACT(WEEK FROM ds) AS metric_time__extract_week
-  , EXTRACT(DAY FROM ds) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_doy
+  , EXTRACT(year FROM ds) AS metric_time__extract_year
+  , EXTRACT(quarter FROM ds) AS metric_time__extract_quarter
+  , EXTRACT(month FROM ds) AS metric_time__extract_month
+  , EXTRACT(week FROM ds) AS metric_time__extract_week
+  , EXTRACT(day FROM ds) AS metric_time__extract_day
+  , EXTRACT(dow FROM ds) AS metric_time__extract_dow
+  , EXTRACT(doy FROM ds) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
index 08c1707601..c88105f92d 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/DuckDB/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -150,74 +150,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -367,74 +367,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index b9c1d34bad..e9ab8e5153 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month
   , subq_0.ds__extract_week
   , subq_0.ds__extract_day
-  , subq_0.ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear
+  , subq_0.ds__extract_dow
+  , subq_0.ds__extract_doy
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.ds_partitioned__extract_month
   , subq_0.ds_partitioned__extract_week
   , subq_0.ds_partitioned__extract_day
-  , subq_0.ds_partitioned__extract_dayofweek
-  , subq_0.ds_partitioned__extract_dayofyear
+  , subq_0.ds_partitioned__extract_dow
+  , subq_0.ds_partitioned__extract_doy
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
@@ -34,8 +34,8 @@ SELECT
   , subq_0.paid_at__extract_month
   , subq_0.paid_at__extract_week
   , subq_0.paid_at__extract_day
-  , subq_0.paid_at__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear
+  , subq_0.paid_at__extract_dow
+  , subq_0.paid_at__extract_doy
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
@@ -46,8 +46,8 @@ SELECT
   , subq_0.booking__ds__extract_month
   , subq_0.booking__ds__extract_week
   , subq_0.booking__ds__extract_day
-  , subq_0.booking__ds__extract_dayofweek
-  , subq_0.booking__ds__extract_dayofyear
+  , subq_0.booking__ds__extract_dow
+  , subq_0.booking__ds__extract_doy
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
@@ -58,8 +58,8 @@ SELECT
   , subq_0.booking__ds_partitioned__extract_month
   , subq_0.booking__ds_partitioned__extract_week
   , subq_0.booking__ds_partitioned__extract_day
-  , subq_0.booking__ds_partitioned__extract_dayofweek
-  , subq_0.booking__ds_partitioned__extract_dayofyear
+  , subq_0.booking__ds_partitioned__extract_dow
+  , subq_0.booking__ds_partitioned__extract_doy
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
@@ -70,8 +70,8 @@ SELECT
   , subq_0.booking__paid_at__extract_month
   , subq_0.booking__paid_at__extract_week
   , subq_0.booking__paid_at__extract_day
-  , subq_0.booking__paid_at__extract_dayofweek
-  , subq_0.booking__paid_at__extract_dayofyear
+  , subq_0.booking__paid_at__extract_dow
+  , subq_0.booking__paid_at__extract_doy
   , subq_0.paid_at__day AS metric_time__day
   , subq_0.paid_at__week AS metric_time__week
   , subq_0.paid_at__month AS metric_time__month
@@ -82,8 +82,8 @@ SELECT
   , subq_0.paid_at__extract_month AS metric_time__extract_month
   , subq_0.paid_at__extract_week AS metric_time__extract_week
   , subq_0.paid_at__extract_day AS metric_time__extract_day
-  , subq_0.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
+  , subq_0.paid_at__extract_dow AS metric_time__extract_dow
+  , subq_0.paid_at__extract_doy AS metric_time__extract_doy
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
@@ -116,74 +116,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 9326cd820a..00e036ec03 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -6,85 +6,85 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , paid_at AS metric_time__day
   , DATE_TRUNC('week', paid_at) AS metric_time__week
   , DATE_TRUNC('month', paid_at) AS metric_time__month
   , DATE_TRUNC('quarter', paid_at) AS metric_time__quarter
   , DATE_TRUNC('year', paid_at) AS metric_time__year
-  , EXTRACT(YEAR FROM paid_at) AS metric_time__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS metric_time__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS metric_time__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS metric_time__extract_week
-  , EXTRACT(DAY FROM paid_at) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS metric_time__extract_year
+  , EXTRACT(quarter FROM paid_at) AS metric_time__extract_quarter
+  , EXTRACT(month FROM paid_at) AS metric_time__extract_month
+  , EXTRACT(week FROM paid_at) AS metric_time__extract_week
+  , EXTRACT(day FROM paid_at) AS metric_time__extract_day
+  , EXTRACT(dow FROM paid_at) AS metric_time__extract_dow
+  , EXTRACT(doy FROM paid_at) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index a2a9795f0c..e2cc747ae2 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month
   , subq_0.ds__extract_week
   , subq_0.ds__extract_day
-  , subq_0.ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear
+  , subq_0.ds__extract_dow
+  , subq_0.ds__extract_doy
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.ds_partitioned__extract_month
   , subq_0.ds_partitioned__extract_week
   , subq_0.ds_partitioned__extract_day
-  , subq_0.ds_partitioned__extract_dayofweek
-  , subq_0.ds_partitioned__extract_dayofyear
+  , subq_0.ds_partitioned__extract_dow
+  , subq_0.ds_partitioned__extract_doy
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
@@ -34,8 +34,8 @@ SELECT
   , subq_0.paid_at__extract_month
   , subq_0.paid_at__extract_week
   , subq_0.paid_at__extract_day
-  , subq_0.paid_at__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear
+  , subq_0.paid_at__extract_dow
+  , subq_0.paid_at__extract_doy
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
@@ -46,8 +46,8 @@ SELECT
   , subq_0.booking__ds__extract_month
   , subq_0.booking__ds__extract_week
   , subq_0.booking__ds__extract_day
-  , subq_0.booking__ds__extract_dayofweek
-  , subq_0.booking__ds__extract_dayofyear
+  , subq_0.booking__ds__extract_dow
+  , subq_0.booking__ds__extract_doy
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
@@ -58,8 +58,8 @@ SELECT
   , subq_0.booking__ds_partitioned__extract_month
   , subq_0.booking__ds_partitioned__extract_week
   , subq_0.booking__ds_partitioned__extract_day
-  , subq_0.booking__ds_partitioned__extract_dayofweek
-  , subq_0.booking__ds_partitioned__extract_dayofyear
+  , subq_0.booking__ds_partitioned__extract_dow
+  , subq_0.booking__ds_partitioned__extract_doy
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
@@ -70,8 +70,8 @@ SELECT
   , subq_0.booking__paid_at__extract_month
   , subq_0.booking__paid_at__extract_week
   , subq_0.booking__paid_at__extract_day
-  , subq_0.booking__paid_at__extract_dayofweek
-  , subq_0.booking__paid_at__extract_dayofyear
+  , subq_0.booking__paid_at__extract_dow
+  , subq_0.booking__paid_at__extract_doy
   , subq_0.ds__day AS metric_time__day
   , subq_0.ds__week AS metric_time__week
   , subq_0.ds__month AS metric_time__month
@@ -82,8 +82,8 @@ SELECT
   , subq_0.ds__extract_month AS metric_time__extract_month
   , subq_0.ds__extract_week AS metric_time__extract_week
   , subq_0.ds__extract_day AS metric_time__extract_day
-  , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+  , subq_0.ds__extract_dow AS metric_time__extract_dow
+  , subq_0.ds__extract_doy AS metric_time__extract_doy
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
@@ -128,74 +128,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 30a42573dd..c6d742fae0 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -6,85 +6,85 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , ds AS metric_time__day
   , DATE_TRUNC('week', ds) AS metric_time__week
   , DATE_TRUNC('month', ds) AS metric_time__month
   , DATE_TRUNC('quarter', ds) AS metric_time__quarter
   , DATE_TRUNC('year', ds) AS metric_time__year
-  , EXTRACT(YEAR FROM ds) AS metric_time__extract_year
-  , EXTRACT(QUARTER FROM ds) AS metric_time__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS metric_time__extract_month
-  , EXTRACT(WEEK FROM ds) AS metric_time__extract_week
-  , EXTRACT(DAY FROM ds) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_dayofyear
+  , EXTRACT(year FROM ds) AS metric_time__extract_year
+  , EXTRACT(quarter FROM ds) AS metric_time__extract_quarter
+  , EXTRACT(month FROM ds) AS metric_time__extract_month
+  , EXTRACT(week FROM ds) AS metric_time__extract_week
+  , EXTRACT(day FROM ds) AS metric_time__extract_day
+  , EXTRACT(dow FROM ds) AS metric_time__extract_dow
+  , EXTRACT(doy FROM ds) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
index 4b399298d5..c88105f92d 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Postgres/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -150,74 +150,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -261,8 +261,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month
           , subq_5.ds__extract_week
           , subq_5.ds__extract_day
-          , subq_5.ds__extract_dayofweek
-          , subq_5.ds__extract_dayofyear
+          , subq_5.ds__extract_dow
+          , subq_5.ds__extract_doy
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
@@ -273,8 +273,8 @@ FULL OUTER JOIN (
           , subq_5.ds_partitioned__extract_month
           , subq_5.ds_partitioned__extract_week
           , subq_5.ds_partitioned__extract_day
-          , subq_5.ds_partitioned__extract_dayofweek
-          , subq_5.ds_partitioned__extract_dayofyear
+          , subq_5.ds_partitioned__extract_dow
+          , subq_5.ds_partitioned__extract_doy
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
@@ -285,8 +285,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month
           , subq_5.paid_at__extract_week
           , subq_5.paid_at__extract_day
-          , subq_5.paid_at__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear
+          , subq_5.paid_at__extract_dow
+          , subq_5.paid_at__extract_doy
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
@@ -297,8 +297,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds__extract_month
           , subq_5.booking__ds__extract_week
           , subq_5.booking__ds__extract_day
-          , subq_5.booking__ds__extract_dayofweek
-          , subq_5.booking__ds__extract_dayofyear
+          , subq_5.booking__ds__extract_dow
+          , subq_5.booking__ds__extract_doy
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
@@ -309,8 +309,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds_partitioned__extract_month
           , subq_5.booking__ds_partitioned__extract_week
           , subq_5.booking__ds_partitioned__extract_day
-          , subq_5.booking__ds_partitioned__extract_dayofweek
-          , subq_5.booking__ds_partitioned__extract_dayofyear
+          , subq_5.booking__ds_partitioned__extract_dow
+          , subq_5.booking__ds_partitioned__extract_doy
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
@@ -321,8 +321,8 @@ FULL OUTER JOIN (
           , subq_5.booking__paid_at__extract_month
           , subq_5.booking__paid_at__extract_week
           , subq_5.booking__paid_at__extract_day
-          , subq_5.booking__paid_at__extract_dayofweek
-          , subq_5.booking__paid_at__extract_dayofyear
+          , subq_5.booking__paid_at__extract_dow
+          , subq_5.booking__paid_at__extract_doy
           , subq_5.paid_at__day AS metric_time__day
           , subq_5.paid_at__week AS metric_time__week
           , subq_5.paid_at__month AS metric_time__month
@@ -333,8 +333,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month AS metric_time__extract_month
           , subq_5.paid_at__extract_week AS metric_time__extract_week
           , subq_5.paid_at__extract_day AS metric_time__extract_day
-          , subq_5.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_5.paid_at__extract_dow AS metric_time__extract_dow
+          , subq_5.paid_at__extract_doy AS metric_time__extract_doy
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
@@ -367,74 +367,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index b9c1d34bad..e9ab8e5153 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month
   , subq_0.ds__extract_week
   , subq_0.ds__extract_day
-  , subq_0.ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear
+  , subq_0.ds__extract_dow
+  , subq_0.ds__extract_doy
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.ds_partitioned__extract_month
   , subq_0.ds_partitioned__extract_week
   , subq_0.ds_partitioned__extract_day
-  , subq_0.ds_partitioned__extract_dayofweek
-  , subq_0.ds_partitioned__extract_dayofyear
+  , subq_0.ds_partitioned__extract_dow
+  , subq_0.ds_partitioned__extract_doy
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
@@ -34,8 +34,8 @@ SELECT
   , subq_0.paid_at__extract_month
   , subq_0.paid_at__extract_week
   , subq_0.paid_at__extract_day
-  , subq_0.paid_at__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear
+  , subq_0.paid_at__extract_dow
+  , subq_0.paid_at__extract_doy
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
@@ -46,8 +46,8 @@ SELECT
   , subq_0.booking__ds__extract_month
   , subq_0.booking__ds__extract_week
   , subq_0.booking__ds__extract_day
-  , subq_0.booking__ds__extract_dayofweek
-  , subq_0.booking__ds__extract_dayofyear
+  , subq_0.booking__ds__extract_dow
+  , subq_0.booking__ds__extract_doy
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
@@ -58,8 +58,8 @@ SELECT
   , subq_0.booking__ds_partitioned__extract_month
   , subq_0.booking__ds_partitioned__extract_week
   , subq_0.booking__ds_partitioned__extract_day
-  , subq_0.booking__ds_partitioned__extract_dayofweek
-  , subq_0.booking__ds_partitioned__extract_dayofyear
+  , subq_0.booking__ds_partitioned__extract_dow
+  , subq_0.booking__ds_partitioned__extract_doy
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
@@ -70,8 +70,8 @@ SELECT
   , subq_0.booking__paid_at__extract_month
   , subq_0.booking__paid_at__extract_week
   , subq_0.booking__paid_at__extract_day
-  , subq_0.booking__paid_at__extract_dayofweek
-  , subq_0.booking__paid_at__extract_dayofyear
+  , subq_0.booking__paid_at__extract_dow
+  , subq_0.booking__paid_at__extract_doy
   , subq_0.paid_at__day AS metric_time__day
   , subq_0.paid_at__week AS metric_time__week
   , subq_0.paid_at__month AS metric_time__month
@@ -82,8 +82,8 @@ SELECT
   , subq_0.paid_at__extract_month AS metric_time__extract_month
   , subq_0.paid_at__extract_week AS metric_time__extract_week
   , subq_0.paid_at__extract_day AS metric_time__extract_day
-  , subq_0.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
+  , subq_0.paid_at__extract_dow AS metric_time__extract_dow
+  , subq_0.paid_at__extract_doy AS metric_time__extract_doy
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
@@ -116,74 +116,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 9326cd820a..00e036ec03 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -6,85 +6,85 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , paid_at AS metric_time__day
   , DATE_TRUNC('week', paid_at) AS metric_time__week
   , DATE_TRUNC('month', paid_at) AS metric_time__month
   , DATE_TRUNC('quarter', paid_at) AS metric_time__quarter
   , DATE_TRUNC('year', paid_at) AS metric_time__year
-  , EXTRACT(YEAR FROM paid_at) AS metric_time__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS metric_time__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS metric_time__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS metric_time__extract_week
-  , EXTRACT(DAY FROM paid_at) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS metric_time__extract_year
+  , EXTRACT(quarter FROM paid_at) AS metric_time__extract_quarter
+  , EXTRACT(month FROM paid_at) AS metric_time__extract_month
+  , EXTRACT(week FROM paid_at) AS metric_time__extract_week
+  , EXTRACT(day FROM paid_at) AS metric_time__extract_day
+  , EXTRACT(dow FROM paid_at) AS metric_time__extract_dow
+  , EXTRACT(doy FROM paid_at) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index a2a9795f0c..e2cc747ae2 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month
   , subq_0.ds__extract_week
   , subq_0.ds__extract_day
-  , subq_0.ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear
+  , subq_0.ds__extract_dow
+  , subq_0.ds__extract_doy
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.ds_partitioned__extract_month
   , subq_0.ds_partitioned__extract_week
   , subq_0.ds_partitioned__extract_day
-  , subq_0.ds_partitioned__extract_dayofweek
-  , subq_0.ds_partitioned__extract_dayofyear
+  , subq_0.ds_partitioned__extract_dow
+  , subq_0.ds_partitioned__extract_doy
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
@@ -34,8 +34,8 @@ SELECT
   , subq_0.paid_at__extract_month
   , subq_0.paid_at__extract_week
   , subq_0.paid_at__extract_day
-  , subq_0.paid_at__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear
+  , subq_0.paid_at__extract_dow
+  , subq_0.paid_at__extract_doy
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
@@ -46,8 +46,8 @@ SELECT
   , subq_0.booking__ds__extract_month
   , subq_0.booking__ds__extract_week
   , subq_0.booking__ds__extract_day
-  , subq_0.booking__ds__extract_dayofweek
-  , subq_0.booking__ds__extract_dayofyear
+  , subq_0.booking__ds__extract_dow
+  , subq_0.booking__ds__extract_doy
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
@@ -58,8 +58,8 @@ SELECT
   , subq_0.booking__ds_partitioned__extract_month
   , subq_0.booking__ds_partitioned__extract_week
   , subq_0.booking__ds_partitioned__extract_day
-  , subq_0.booking__ds_partitioned__extract_dayofweek
-  , subq_0.booking__ds_partitioned__extract_dayofyear
+  , subq_0.booking__ds_partitioned__extract_dow
+  , subq_0.booking__ds_partitioned__extract_doy
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
@@ -70,8 +70,8 @@ SELECT
   , subq_0.booking__paid_at__extract_month
   , subq_0.booking__paid_at__extract_week
   , subq_0.booking__paid_at__extract_day
-  , subq_0.booking__paid_at__extract_dayofweek
-  , subq_0.booking__paid_at__extract_dayofyear
+  , subq_0.booking__paid_at__extract_dow
+  , subq_0.booking__paid_at__extract_doy
   , subq_0.ds__day AS metric_time__day
   , subq_0.ds__week AS metric_time__week
   , subq_0.ds__month AS metric_time__month
@@ -82,8 +82,8 @@ SELECT
   , subq_0.ds__extract_month AS metric_time__extract_month
   , subq_0.ds__extract_week AS metric_time__extract_week
   , subq_0.ds__extract_day AS metric_time__extract_day
-  , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+  , subq_0.ds__extract_dow AS metric_time__extract_dow
+  , subq_0.ds__extract_doy AS metric_time__extract_doy
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
@@ -128,74 +128,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 30a42573dd..c6d742fae0 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -6,85 +6,85 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , ds AS metric_time__day
   , DATE_TRUNC('week', ds) AS metric_time__week
   , DATE_TRUNC('month', ds) AS metric_time__month
   , DATE_TRUNC('quarter', ds) AS metric_time__quarter
   , DATE_TRUNC('year', ds) AS metric_time__year
-  , EXTRACT(YEAR FROM ds) AS metric_time__extract_year
-  , EXTRACT(QUARTER FROM ds) AS metric_time__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS metric_time__extract_month
-  , EXTRACT(WEEK FROM ds) AS metric_time__extract_week
-  , EXTRACT(DAY FROM ds) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_dayofyear
+  , EXTRACT(year FROM ds) AS metric_time__extract_year
+  , EXTRACT(quarter FROM ds) AS metric_time__extract_quarter
+  , EXTRACT(month FROM ds) AS metric_time__extract_month
+  , EXTRACT(week FROM ds) AS metric_time__extract_week
+  , EXTRACT(day FROM ds) AS metric_time__extract_day
+  , EXTRACT(dow FROM ds) AS metric_time__extract_dow
+  , EXTRACT(doy FROM ds) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
index 4b399298d5..c88105f92d 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Redshift/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -150,74 +150,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -261,8 +261,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month
           , subq_5.ds__extract_week
           , subq_5.ds__extract_day
-          , subq_5.ds__extract_dayofweek
-          , subq_5.ds__extract_dayofyear
+          , subq_5.ds__extract_dow
+          , subq_5.ds__extract_doy
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
@@ -273,8 +273,8 @@ FULL OUTER JOIN (
           , subq_5.ds_partitioned__extract_month
           , subq_5.ds_partitioned__extract_week
           , subq_5.ds_partitioned__extract_day
-          , subq_5.ds_partitioned__extract_dayofweek
-          , subq_5.ds_partitioned__extract_dayofyear
+          , subq_5.ds_partitioned__extract_dow
+          , subq_5.ds_partitioned__extract_doy
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
@@ -285,8 +285,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month
           , subq_5.paid_at__extract_week
           , subq_5.paid_at__extract_day
-          , subq_5.paid_at__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear
+          , subq_5.paid_at__extract_dow
+          , subq_5.paid_at__extract_doy
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
@@ -297,8 +297,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds__extract_month
           , subq_5.booking__ds__extract_week
           , subq_5.booking__ds__extract_day
-          , subq_5.booking__ds__extract_dayofweek
-          , subq_5.booking__ds__extract_dayofyear
+          , subq_5.booking__ds__extract_dow
+          , subq_5.booking__ds__extract_doy
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
@@ -309,8 +309,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds_partitioned__extract_month
           , subq_5.booking__ds_partitioned__extract_week
           , subq_5.booking__ds_partitioned__extract_day
-          , subq_5.booking__ds_partitioned__extract_dayofweek
-          , subq_5.booking__ds_partitioned__extract_dayofyear
+          , subq_5.booking__ds_partitioned__extract_dow
+          , subq_5.booking__ds_partitioned__extract_doy
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
@@ -321,8 +321,8 @@ FULL OUTER JOIN (
           , subq_5.booking__paid_at__extract_month
           , subq_5.booking__paid_at__extract_week
           , subq_5.booking__paid_at__extract_day
-          , subq_5.booking__paid_at__extract_dayofweek
-          , subq_5.booking__paid_at__extract_dayofyear
+          , subq_5.booking__paid_at__extract_dow
+          , subq_5.booking__paid_at__extract_doy
           , subq_5.paid_at__day AS metric_time__day
           , subq_5.paid_at__week AS metric_time__week
           , subq_5.paid_at__month AS metric_time__month
@@ -333,8 +333,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month AS metric_time__extract_month
           , subq_5.paid_at__extract_week AS metric_time__extract_week
           , subq_5.paid_at__extract_day AS metric_time__extract_day
-          , subq_5.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_5.paid_at__extract_dow AS metric_time__extract_dow
+          , subq_5.paid_at__extract_doy AS metric_time__extract_doy
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
@@ -367,74 +367,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index b9c1d34bad..e9ab8e5153 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month
   , subq_0.ds__extract_week
   , subq_0.ds__extract_day
-  , subq_0.ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear
+  , subq_0.ds__extract_dow
+  , subq_0.ds__extract_doy
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.ds_partitioned__extract_month
   , subq_0.ds_partitioned__extract_week
   , subq_0.ds_partitioned__extract_day
-  , subq_0.ds_partitioned__extract_dayofweek
-  , subq_0.ds_partitioned__extract_dayofyear
+  , subq_0.ds_partitioned__extract_dow
+  , subq_0.ds_partitioned__extract_doy
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
@@ -34,8 +34,8 @@ SELECT
   , subq_0.paid_at__extract_month
   , subq_0.paid_at__extract_week
   , subq_0.paid_at__extract_day
-  , subq_0.paid_at__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear
+  , subq_0.paid_at__extract_dow
+  , subq_0.paid_at__extract_doy
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
@@ -46,8 +46,8 @@ SELECT
   , subq_0.booking__ds__extract_month
   , subq_0.booking__ds__extract_week
   , subq_0.booking__ds__extract_day
-  , subq_0.booking__ds__extract_dayofweek
-  , subq_0.booking__ds__extract_dayofyear
+  , subq_0.booking__ds__extract_dow
+  , subq_0.booking__ds__extract_doy
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
@@ -58,8 +58,8 @@ SELECT
   , subq_0.booking__ds_partitioned__extract_month
   , subq_0.booking__ds_partitioned__extract_week
   , subq_0.booking__ds_partitioned__extract_day
-  , subq_0.booking__ds_partitioned__extract_dayofweek
-  , subq_0.booking__ds_partitioned__extract_dayofyear
+  , subq_0.booking__ds_partitioned__extract_dow
+  , subq_0.booking__ds_partitioned__extract_doy
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
@@ -70,8 +70,8 @@ SELECT
   , subq_0.booking__paid_at__extract_month
   , subq_0.booking__paid_at__extract_week
   , subq_0.booking__paid_at__extract_day
-  , subq_0.booking__paid_at__extract_dayofweek
-  , subq_0.booking__paid_at__extract_dayofyear
+  , subq_0.booking__paid_at__extract_dow
+  , subq_0.booking__paid_at__extract_doy
   , subq_0.paid_at__day AS metric_time__day
   , subq_0.paid_at__week AS metric_time__week
   , subq_0.paid_at__month AS metric_time__month
@@ -82,8 +82,8 @@ SELECT
   , subq_0.paid_at__extract_month AS metric_time__extract_month
   , subq_0.paid_at__extract_week AS metric_time__extract_week
   , subq_0.paid_at__extract_day AS metric_time__extract_day
-  , subq_0.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
+  , subq_0.paid_at__extract_dow AS metric_time__extract_dow
+  , subq_0.paid_at__extract_doy AS metric_time__extract_doy
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
@@ -116,74 +116,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index 9326cd820a..00e036ec03 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -6,85 +6,85 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , paid_at AS metric_time__day
   , DATE_TRUNC('week', paid_at) AS metric_time__week
   , DATE_TRUNC('month', paid_at) AS metric_time__month
   , DATE_TRUNC('quarter', paid_at) AS metric_time__quarter
   , DATE_TRUNC('year', paid_at) AS metric_time__year
-  , EXTRACT(YEAR FROM paid_at) AS metric_time__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS metric_time__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS metric_time__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS metric_time__extract_week
-  , EXTRACT(DAY FROM paid_at) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS metric_time__extract_year
+  , EXTRACT(quarter FROM paid_at) AS metric_time__extract_quarter
+  , EXTRACT(month FROM paid_at) AS metric_time__extract_month
+  , EXTRACT(week FROM paid_at) AS metric_time__extract_week
+  , EXTRACT(day FROM paid_at) AS metric_time__extract_day
+  , EXTRACT(dow FROM paid_at) AS metric_time__extract_dow
+  , EXTRACT(doy FROM paid_at) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index a2a9795f0c..e2cc747ae2 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -10,8 +10,8 @@ SELECT
   , subq_0.ds__extract_month
   , subq_0.ds__extract_week
   , subq_0.ds__extract_day
-  , subq_0.ds__extract_dayofweek
-  , subq_0.ds__extract_dayofyear
+  , subq_0.ds__extract_dow
+  , subq_0.ds__extract_doy
   , subq_0.ds_partitioned__day
   , subq_0.ds_partitioned__week
   , subq_0.ds_partitioned__month
@@ -22,8 +22,8 @@ SELECT
   , subq_0.ds_partitioned__extract_month
   , subq_0.ds_partitioned__extract_week
   , subq_0.ds_partitioned__extract_day
-  , subq_0.ds_partitioned__extract_dayofweek
-  , subq_0.ds_partitioned__extract_dayofyear
+  , subq_0.ds_partitioned__extract_dow
+  , subq_0.ds_partitioned__extract_doy
   , subq_0.paid_at__day
   , subq_0.paid_at__week
   , subq_0.paid_at__month
@@ -34,8 +34,8 @@ SELECT
   , subq_0.paid_at__extract_month
   , subq_0.paid_at__extract_week
   , subq_0.paid_at__extract_day
-  , subq_0.paid_at__extract_dayofweek
-  , subq_0.paid_at__extract_dayofyear
+  , subq_0.paid_at__extract_dow
+  , subq_0.paid_at__extract_doy
   , subq_0.booking__ds__day
   , subq_0.booking__ds__week
   , subq_0.booking__ds__month
@@ -46,8 +46,8 @@ SELECT
   , subq_0.booking__ds__extract_month
   , subq_0.booking__ds__extract_week
   , subq_0.booking__ds__extract_day
-  , subq_0.booking__ds__extract_dayofweek
-  , subq_0.booking__ds__extract_dayofyear
+  , subq_0.booking__ds__extract_dow
+  , subq_0.booking__ds__extract_doy
   , subq_0.booking__ds_partitioned__day
   , subq_0.booking__ds_partitioned__week
   , subq_0.booking__ds_partitioned__month
@@ -58,8 +58,8 @@ SELECT
   , subq_0.booking__ds_partitioned__extract_month
   , subq_0.booking__ds_partitioned__extract_week
   , subq_0.booking__ds_partitioned__extract_day
-  , subq_0.booking__ds_partitioned__extract_dayofweek
-  , subq_0.booking__ds_partitioned__extract_dayofyear
+  , subq_0.booking__ds_partitioned__extract_dow
+  , subq_0.booking__ds_partitioned__extract_doy
   , subq_0.booking__paid_at__day
   , subq_0.booking__paid_at__week
   , subq_0.booking__paid_at__month
@@ -70,8 +70,8 @@ SELECT
   , subq_0.booking__paid_at__extract_month
   , subq_0.booking__paid_at__extract_week
   , subq_0.booking__paid_at__extract_day
-  , subq_0.booking__paid_at__extract_dayofweek
-  , subq_0.booking__paid_at__extract_dayofyear
+  , subq_0.booking__paid_at__extract_dow
+  , subq_0.booking__paid_at__extract_doy
   , subq_0.ds__day AS metric_time__day
   , subq_0.ds__week AS metric_time__week
   , subq_0.ds__month AS metric_time__month
@@ -82,8 +82,8 @@ SELECT
   , subq_0.ds__extract_month AS metric_time__extract_month
   , subq_0.ds__extract_week AS metric_time__extract_week
   , subq_0.ds__extract_day AS metric_time__extract_day
-  , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-  , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+  , subq_0.ds__extract_dow AS metric_time__extract_dow
+  , subq_0.ds__extract_doy AS metric_time__extract_doy
   , subq_0.listing
   , subq_0.guest
   , subq_0.host
@@ -128,74 +128,74 @@ FROM (
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
     , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
     , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
     , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
     , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-    , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-    , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-    , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-    , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+    , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+    , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+    , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+    , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+    , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 30a42573dd..c6d742fae0 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -6,85 +6,85 @@ SELECT
   , DATE_TRUNC('month', ds) AS ds__month
   , DATE_TRUNC('quarter', ds) AS ds__quarter
   , DATE_TRUNC('year', ds) AS ds__year
-  , EXTRACT(YEAR FROM ds) AS ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS ds__extract_week
-  , EXTRACT(DAY FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS ds__extract_year
+  , EXTRACT(quarter FROM ds) AS ds__extract_quarter
+  , EXTRACT(month FROM ds) AS ds__extract_month
+  , EXTRACT(week FROM ds) AS ds__extract_week
+  , EXTRACT(day FROM ds) AS ds__extract_day
+  , EXTRACT(dow FROM ds) AS ds__extract_dow
+  , EXTRACT(doy FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC('week', paid_at) AS paid_at__week
   , DATE_TRUNC('month', paid_at) AS paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC('week', ds) AS booking__ds__week
   , DATE_TRUNC('month', ds) AS booking__ds__month
   , DATE_TRUNC('quarter', ds) AS booking__ds__quarter
   , DATE_TRUNC('year', ds) AS booking__ds__year
-  , EXTRACT(YEAR FROM ds) AS booking__ds__extract_year
-  , EXTRACT(QUARTER FROM ds) AS booking__ds__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS booking__ds__extract_month
-  , EXTRACT(WEEK FROM ds) AS booking__ds__extract_week
-  , EXTRACT(DAY FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_dayofyear
+  , EXTRACT(year FROM ds) AS booking__ds__extract_year
+  , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
+  , EXTRACT(month FROM ds) AS booking__ds__extract_month
+  , EXTRACT(week FROM ds) AS booking__ds__extract_week
+  , EXTRACT(day FROM ds) AS booking__ds__extract_day
+  , EXTRACT(dow FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(doy FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC('week', ds_partitioned) AS booking__ds_partitioned__week
   , DATE_TRUNC('month', ds_partitioned) AS booking__ds_partitioned__month
   , DATE_TRUNC('quarter', ds_partitioned) AS booking__ds_partitioned__quarter
   , DATE_TRUNC('year', ds_partitioned) AS booking__ds_partitioned__year
-  , EXTRACT(YEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_year
-  , EXTRACT(QUARTER FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
-  , EXTRACT(MONTH FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(WEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
-  , EXTRACT(DAY FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+  , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
+  , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
+  , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
+  , EXTRACT(week FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
+  , EXTRACT(dow FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(doy FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC('week', paid_at) AS booking__paid_at__week
   , DATE_TRUNC('month', paid_at) AS booking__paid_at__month
   , DATE_TRUNC('quarter', paid_at) AS booking__paid_at__quarter
   , DATE_TRUNC('year', paid_at) AS booking__paid_at__year
-  , EXTRACT(YEAR FROM paid_at) AS booking__paid_at__extract_year
-  , EXTRACT(QUARTER FROM paid_at) AS booking__paid_at__extract_quarter
-  , EXTRACT(MONTH FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(WEEK FROM paid_at) AS booking__paid_at__extract_week
-  , EXTRACT(DAY FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_dayofyear
+  , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
+  , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
+  , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
+  , EXTRACT(week FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
+  , EXTRACT(dow FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(doy FROM paid_at) AS booking__paid_at__extract_doy
   , ds AS metric_time__day
   , DATE_TRUNC('week', ds) AS metric_time__week
   , DATE_TRUNC('month', ds) AS metric_time__month
   , DATE_TRUNC('quarter', ds) AS metric_time__quarter
   , DATE_TRUNC('year', ds) AS metric_time__year
-  , EXTRACT(YEAR FROM ds) AS metric_time__extract_year
-  , EXTRACT(QUARTER FROM ds) AS metric_time__extract_quarter
-  , EXTRACT(MONTH FROM ds) AS metric_time__extract_month
-  , EXTRACT(WEEK FROM ds) AS metric_time__extract_week
-  , EXTRACT(DAY FROM ds) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dayofweek
-  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_dayofyear
+  , EXTRACT(year FROM ds) AS metric_time__extract_year
+  , EXTRACT(quarter FROM ds) AS metric_time__extract_quarter
+  , EXTRACT(month FROM ds) AS metric_time__extract_month
+  , EXTRACT(week FROM ds) AS metric_time__extract_week
+  , EXTRACT(day FROM ds) AS metric_time__extract_day
+  , EXTRACT(dow FROM ds) AS metric_time__extract_dow
+  , EXTRACT(doy FROM ds) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
index 4b399298d5..c88105f92d 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/Snowflake/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -32,8 +32,8 @@ FROM (
           , subq_0.ds__extract_month
           , subq_0.ds__extract_week
           , subq_0.ds__extract_day
-          , subq_0.ds__extract_dayofweek
-          , subq_0.ds__extract_dayofyear
+          , subq_0.ds__extract_dow
+          , subq_0.ds__extract_doy
           , subq_0.ds_partitioned__day
           , subq_0.ds_partitioned__week
           , subq_0.ds_partitioned__month
@@ -44,8 +44,8 @@ FROM (
           , subq_0.ds_partitioned__extract_month
           , subq_0.ds_partitioned__extract_week
           , subq_0.ds_partitioned__extract_day
-          , subq_0.ds_partitioned__extract_dayofweek
-          , subq_0.ds_partitioned__extract_dayofyear
+          , subq_0.ds_partitioned__extract_dow
+          , subq_0.ds_partitioned__extract_doy
           , subq_0.paid_at__day
           , subq_0.paid_at__week
           , subq_0.paid_at__month
@@ -56,8 +56,8 @@ FROM (
           , subq_0.paid_at__extract_month
           , subq_0.paid_at__extract_week
           , subq_0.paid_at__extract_day
-          , subq_0.paid_at__extract_dayofweek
-          , subq_0.paid_at__extract_dayofyear
+          , subq_0.paid_at__extract_dow
+          , subq_0.paid_at__extract_doy
           , subq_0.booking__ds__day
           , subq_0.booking__ds__week
           , subq_0.booking__ds__month
@@ -68,8 +68,8 @@ FROM (
           , subq_0.booking__ds__extract_month
           , subq_0.booking__ds__extract_week
           , subq_0.booking__ds__extract_day
-          , subq_0.booking__ds__extract_dayofweek
-          , subq_0.booking__ds__extract_dayofyear
+          , subq_0.booking__ds__extract_dow
+          , subq_0.booking__ds__extract_doy
           , subq_0.booking__ds_partitioned__day
           , subq_0.booking__ds_partitioned__week
           , subq_0.booking__ds_partitioned__month
@@ -80,8 +80,8 @@ FROM (
           , subq_0.booking__ds_partitioned__extract_month
           , subq_0.booking__ds_partitioned__extract_week
           , subq_0.booking__ds_partitioned__extract_day
-          , subq_0.booking__ds_partitioned__extract_dayofweek
-          , subq_0.booking__ds_partitioned__extract_dayofyear
+          , subq_0.booking__ds_partitioned__extract_dow
+          , subq_0.booking__ds_partitioned__extract_doy
           , subq_0.booking__paid_at__day
           , subq_0.booking__paid_at__week
           , subq_0.booking__paid_at__month
@@ -92,8 +92,8 @@ FROM (
           , subq_0.booking__paid_at__extract_month
           , subq_0.booking__paid_at__extract_week
           , subq_0.booking__paid_at__extract_day
-          , subq_0.booking__paid_at__extract_dayofweek
-          , subq_0.booking__paid_at__extract_dayofyear
+          , subq_0.booking__paid_at__extract_dow
+          , subq_0.booking__paid_at__extract_doy
           , subq_0.ds__day AS metric_time__day
           , subq_0.ds__week AS metric_time__week
           , subq_0.ds__month AS metric_time__month
@@ -104,8 +104,8 @@ FROM (
           , subq_0.ds__extract_month AS metric_time__extract_month
           , subq_0.ds__extract_week AS metric_time__extract_week
           , subq_0.ds__extract_day AS metric_time__extract_day
-          , subq_0.ds__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_0.ds__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_0.ds__extract_dow AS metric_time__extract_dow
+          , subq_0.ds__extract_doy AS metric_time__extract_doy
           , subq_0.listing
           , subq_0.guest
           , subq_0.host
@@ -150,74 +150,74 @@ FROM (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -261,8 +261,8 @@ FULL OUTER JOIN (
           , subq_5.ds__extract_month
           , subq_5.ds__extract_week
           , subq_5.ds__extract_day
-          , subq_5.ds__extract_dayofweek
-          , subq_5.ds__extract_dayofyear
+          , subq_5.ds__extract_dow
+          , subq_5.ds__extract_doy
           , subq_5.ds_partitioned__day
           , subq_5.ds_partitioned__week
           , subq_5.ds_partitioned__month
@@ -273,8 +273,8 @@ FULL OUTER JOIN (
           , subq_5.ds_partitioned__extract_month
           , subq_5.ds_partitioned__extract_week
           , subq_5.ds_partitioned__extract_day
-          , subq_5.ds_partitioned__extract_dayofweek
-          , subq_5.ds_partitioned__extract_dayofyear
+          , subq_5.ds_partitioned__extract_dow
+          , subq_5.ds_partitioned__extract_doy
           , subq_5.paid_at__day
           , subq_5.paid_at__week
           , subq_5.paid_at__month
@@ -285,8 +285,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month
           , subq_5.paid_at__extract_week
           , subq_5.paid_at__extract_day
-          , subq_5.paid_at__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear
+          , subq_5.paid_at__extract_dow
+          , subq_5.paid_at__extract_doy
           , subq_5.booking__ds__day
           , subq_5.booking__ds__week
           , subq_5.booking__ds__month
@@ -297,8 +297,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds__extract_month
           , subq_5.booking__ds__extract_week
           , subq_5.booking__ds__extract_day
-          , subq_5.booking__ds__extract_dayofweek
-          , subq_5.booking__ds__extract_dayofyear
+          , subq_5.booking__ds__extract_dow
+          , subq_5.booking__ds__extract_doy
           , subq_5.booking__ds_partitioned__day
           , subq_5.booking__ds_partitioned__week
           , subq_5.booking__ds_partitioned__month
@@ -309,8 +309,8 @@ FULL OUTER JOIN (
           , subq_5.booking__ds_partitioned__extract_month
           , subq_5.booking__ds_partitioned__extract_week
           , subq_5.booking__ds_partitioned__extract_day
-          , subq_5.booking__ds_partitioned__extract_dayofweek
-          , subq_5.booking__ds_partitioned__extract_dayofyear
+          , subq_5.booking__ds_partitioned__extract_dow
+          , subq_5.booking__ds_partitioned__extract_doy
           , subq_5.booking__paid_at__day
           , subq_5.booking__paid_at__week
           , subq_5.booking__paid_at__month
@@ -321,8 +321,8 @@ FULL OUTER JOIN (
           , subq_5.booking__paid_at__extract_month
           , subq_5.booking__paid_at__extract_week
           , subq_5.booking__paid_at__extract_day
-          , subq_5.booking__paid_at__extract_dayofweek
-          , subq_5.booking__paid_at__extract_dayofyear
+          , subq_5.booking__paid_at__extract_dow
+          , subq_5.booking__paid_at__extract_doy
           , subq_5.paid_at__day AS metric_time__day
           , subq_5.paid_at__week AS metric_time__week
           , subq_5.paid_at__month AS metric_time__month
@@ -333,8 +333,8 @@ FULL OUTER JOIN (
           , subq_5.paid_at__extract_month AS metric_time__extract_month
           , subq_5.paid_at__extract_week AS metric_time__extract_week
           , subq_5.paid_at__extract_day AS metric_time__extract_day
-          , subq_5.paid_at__extract_dayofweek AS metric_time__extract_dayofweek
-          , subq_5.paid_at__extract_dayofyear AS metric_time__extract_dayofyear
+          , subq_5.paid_at__extract_dow AS metric_time__extract_dow
+          , subq_5.paid_at__extract_doy AS metric_time__extract_doy
           , subq_5.listing
           , subq_5.guest
           , subq_5.host
@@ -367,74 +367,74 @@ FULL OUTER JOIN (
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
             , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
             , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
             , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
             , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
-            , EXTRACT(YEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
-            , EXTRACT(QUARTER FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
-            , EXTRACT(MONTH FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(WEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
-            , EXTRACT(DAY FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofweek
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dayofyear
+            , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+            , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+            , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+            , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+            , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/sql/test_sql_expr_render.py b/metricflow/test/sql/test_sql_expr_render.py
index 035dca2f2e..5d3e309b36 100644
--- a/metricflow/test/sql/test_sql_expr_render.py
+++ b/metricflow/test/sql/test_sql_expr_render.py
@@ -197,9 +197,9 @@ def test_date_trunc_expr(default_expr_renderer: DefaultSqlExpressionRenderer) ->
 
 def test_extract_expr(default_expr_renderer: DefaultSqlExpressionRenderer) -> None:  # noqa: D
     actual = default_expr_renderer.render_sql_expr(
-        SqlExtractExpression(date_part=DatePart.DAYOFYEAR, arg=SqlStringExpression("ds"))
+        SqlExtractExpression(date_part=DatePart.DOY, arg=SqlStringExpression("ds"))
     ).sql
-    assert actual == "EXTRACT(DAYOFYEAR FROM ds)"
+    assert actual == "EXTRACT(doy FROM ds)"
 
 
 def test_ratio_computation_expr(default_expr_renderer: DefaultSqlExpressionRenderer) -> None:  # noqa: D
diff --git a/metricflow/time/date_part.py b/metricflow/time/date_part.py
index cccb1be6c8..4dad63d644 100644
--- a/metricflow/time/date_part.py
+++ b/metricflow/time/date_part.py
@@ -17,16 +17,16 @@ class DatePart(Enum):
     MONTH = "month"
     WEEK = "week"
     DAY = "day"
-    DAYOFWEEK = "dow"
-    DAYOFYEAR = "doy"
+    DOW = "dow"
+    DOY = "doy"
 
     def to_int(self) -> int:
         """Convert to an int so that the size of the granularity can be easily compared."""
         if self is DatePart.DAY:
             return TimeGranularity.DAY.to_int()
-        elif self is DatePart.DAYOFWEEK:
+        elif self is DatePart.DOW:
             return TimeGranularity.DAY.to_int()
-        elif self is DatePart.DAYOFYEAR:
+        elif self is DatePart.DOY:
             return TimeGranularity.DAY.to_int()
         elif self is DatePart.WEEK:
             return TimeGranularity.WEEK.to_int()

From 254093ebbdb861f5d704b5aa92efcb2480b0b225 Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Tue, 12 Sep 2023 13:46:19 -0700
Subject: [PATCH 09/15] Undo snapshot script edit

---
 metricflow/test/generate_snapshots.py | 40 +++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/metricflow/test/generate_snapshots.py b/metricflow/test/generate_snapshots.py
index 9acafe9573..64b87d91b5 100644
--- a/metricflow/test/generate_snapshots.py
+++ b/metricflow/test/generate_snapshots.py
@@ -70,30 +70,30 @@ class MetricFlowTestCredentialSetForAllEngines(FrozenBaseModel):  # noqa: D
     @property
     def as_configurations(self) -> Sequence[MetricFlowTestConfiguration]:  # noqa: D
         return (
-            # MetricFlowTestConfiguration(
-            #     engine=SqlEngine.DUCKDB,
-            #     credential_set=self.duck_db,
-            # ),
-            # MetricFlowTestConfiguration(
-            #     engine=SqlEngine.REDSHIFT,
-            #     credential_set=self.redshift,
-            # ),
-            # MetricFlowTestConfiguration(
-            #     engine=SqlEngine.SNOWFLAKE,
-            #     credential_set=self.snowflake,
-            # ),
+            MetricFlowTestConfiguration(
+                engine=SqlEngine.DUCKDB,
+                credential_set=self.duck_db,
+            ),
+            MetricFlowTestConfiguration(
+                engine=SqlEngine.REDSHIFT,
+                credential_set=self.redshift,
+            ),
+            MetricFlowTestConfiguration(
+                engine=SqlEngine.SNOWFLAKE,
+                credential_set=self.snowflake,
+            ),
             MetricFlowTestConfiguration(
                 engine=SqlEngine.BIGQUERY,
                 credential_set=self.big_query,
             ),
-            # MetricFlowTestConfiguration(
-            #     engine=SqlEngine.DATABRICKS,
-            #     credential_set=self.databricks,
-            # ),
-            # MetricFlowTestConfiguration(
-            #     engine=SqlEngine.POSTGRES,
-            #     credential_set=self.postgres,
-            # ),
+            MetricFlowTestConfiguration(
+                engine=SqlEngine.DATABRICKS,
+                credential_set=self.databricks,
+            ),
+            MetricFlowTestConfiguration(
+                engine=SqlEngine.POSTGRES,
+                credential_set=self.postgres,
+            ),
         )
 
 

From 85252b0d81b1437102226aba0c719023f5393f8b Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Tue, 12 Sep 2023 17:44:47 -0700
Subject: [PATCH 10/15] Handle group by object parameter

---
 .../dataflow/builder/dataflow_plan_builder.py |  2 +-
 metricflow/engine/metricflow_engine.py        |  1 +
 metricflow/naming/linkable_spec_name.py       | 26 -------
 metricflow/query/query_parser.py              | 76 +++++++++++++++----
 metricflow/test/conftest.py                   | 15 ++++
 .../test/integration/configured_test_case.py  |  3 +-
 .../integration/test_cases/itest_metrics.yaml | 12 ++-
 .../test/integration/test_configured_cases.py | 10 +++
 metricflow/test/query/test_query_parser.py    | 46 +++++++----
 .../test/time/test_time_granularity_solver.py | 16 ++--
 metricflow/time/time_granularity_solver.py    | 31 +++++---
 11 files changed, 159 insertions(+), 79 deletions(-)

diff --git a/metricflow/dataflow/builder/dataflow_plan_builder.py b/metricflow/dataflow/builder/dataflow_plan_builder.py
index 1445c7918f..c989d43131 100644
--- a/metricflow/dataflow/builder/dataflow_plan_builder.py
+++ b/metricflow/dataflow/builder/dataflow_plan_builder.py
@@ -792,7 +792,7 @@ def _build_aggregated_measures_from_measure_source_node(
         # If querying an offset metric, join to time spine.
         join_to_time_spine_node: Optional[JoinToTimeSpineNode] = None
         if metric_spec.offset_window or metric_spec.offset_to_grain:
-            assert metric_time_dimension_specs, "Joining to time spine requires querying with metric time."
+            assert metric_time_dimension_specs, "Joining to time spine requires querying with metric_time."
             join_to_time_spine_node = JoinToTimeSpineNode(
                 parent_node=time_range_node or measure_recipe.measure_node,
                 metric_time_dimension_specs=metric_time_dimension_specs,
diff --git a/metricflow/engine/metricflow_engine.py b/metricflow/engine/metricflow_engine.py
index d08163c5d4..e508c32a92 100644
--- a/metricflow/engine/metricflow_engine.py
+++ b/metricflow/engine/metricflow_engine.py
@@ -456,6 +456,7 @@ def _create_execution_plan(self, mf_query_request: MetricFlowQueryRequest) -> Me
                 query_spec = self._query_parser.parse_and_validate_query(
                     metric_names=mf_query_request.metric_names,
                     group_by_names=mf_query_request.group_by_names,
+                    group_by=mf_query_request.group_by,
                     limit=mf_query_request.limit,
                     time_constraint_start=mf_query_request.time_constraint_start,
                     time_constraint_end=mf_query_request.time_constraint_end,
diff --git a/metricflow/naming/linkable_spec_name.py b/metricflow/naming/linkable_spec_name.py
index 01c3863ad0..0e73415cd4 100644
--- a/metricflow/naming/linkable_spec_name.py
+++ b/metricflow/naming/linkable_spec_name.py
@@ -37,31 +37,6 @@ def from_name(qualified_name: str) -> StructuredLinkableSpecName:
         if len(name_parts) == 1:
             return StructuredLinkableSpecName(entity_link_names=(), element_name=name_parts[0])
 
-        associated_date_part: Optional[DatePart] = None
-        for date_part in DatePart:
-            if name_parts[-1] == StructuredLinkableSpecName.date_part_suffix(date_part):
-                associated_date_part = date_part
-
-        # Has a date_part
-        if associated_date_part:
-            #  e.g. "ds__extract_month"
-            if len(name_parts) == 2:
-                # Since DAY works with all currently supported DateParts & changing the granularity will not change the
-                # extracted date part, assume day granularity here.
-                time_granularity = TimeGranularity.DAY
-                return StructuredLinkableSpecName(
-                    entity_link_names=(),
-                    element_name=name_parts[0],
-                    time_granularity=time_granularity,
-                    date_part=associated_date_part,
-                )
-            # e.g. "messages__ds__extract_month"
-            return StructuredLinkableSpecName(
-                entity_link_names=tuple(name_parts[:-2]),
-                element_name=name_parts[-2],
-                date_part=associated_date_part,
-            )
-
         associated_granularity = None
         granularity: TimeGranularity
         for granularity in TimeGranularity:
@@ -94,7 +69,6 @@ def qualified_name(self) -> str:
             items.append(self.date_part_suffix(date_part=self.date_part))
         elif self.time_granularity:
             items.append(self.time_granularity.value)
-
         return DUNDER.join(items)
 
     @property
diff --git a/metricflow/query/query_parser.py b/metricflow/query/query_parser.py
index 956f3933fc..329bb3bdc3 100644
--- a/metricflow/query/query_parser.py
+++ b/metricflow/query/query_parser.py
@@ -299,7 +299,12 @@ def _get_group_by_names(
         return (
             group_by_names
             if group_by_names
-            else [f"{g.name}__{g.date_part or g.grain}" if (g.date_part or g.grain) else g.name for g in group_by]
+            else [
+                StructuredLinkableSpecName(
+                    entity_link_names=(), element_name=g.name, time_granularity=g.grain, date_part=g.date_part
+                ).qualified_name
+                for g in group_by
+            ]
             if group_by
             else []
         )
@@ -344,7 +349,6 @@ def _parse_and_validate_query(
         time_granularity: Optional[TimeGranularity] = None,
     ) -> MetricFlowQuerySpec:
         metric_names = self._get_metric_names(metric_names, metrics)
-        group_by_names = self._get_group_by_names(group_by_names, group_by)
         where_filter = self._get_where_filter(where_constraint, where_constraint_str)
         order = self._get_order(order, order_by)
 
@@ -394,7 +398,9 @@ def _parse_and_validate_query(
             # If the time constraint is all time, just ignore and not render
             time_constraint = None
 
-        requested_linkable_specs = self._parse_linkable_element_names(group_by_names, metric_references)
+        requested_linkable_specs = self._parse_linkable_elements(
+            qualified_linkable_names=group_by_names, linkable_elements=group_by, metric_references=metric_references
+        )
         where_filter_spec: Optional[WhereFilterSpec] = None
         if where_filter is not None:
             try:
@@ -427,7 +433,16 @@ def _parse_and_validate_query(
         if len(time_dimension_specs) == 0:
             self._validate_no_time_dimension_query(metric_references=metric_references)
 
-        self._time_granularity_solver.validate_time_granularity(metric_references, time_dimension_specs)
+        self._time_granularity_solver.validate_time_granularity_and_date_part(metric_references, time_dimension_specs)
+        for time_dimension_spec in time_dimension_specs:
+            if (
+                time_dimension_spec.date_part
+                and time_dimension_spec.date_part.to_int() < time_dimension_spec.time_granularity.to_int()
+            ):
+                raise RequestTimeGranularityException(
+                    f"Date part {time_dimension_spec.date_part.name} is not compatible with time granularity "
+                    f"{time_dimension_spec.time_granularity.name}."
+                )
 
         order_by_specs = self._parse_order_by(order or [], partial_time_dimension_spec_replacements)
 
@@ -437,8 +452,9 @@ def _parse_and_validate_query(
         for metric_reference in metric_references:
             metric = self._metric_lookup.get_metric(metric_reference)
             if metric.filter is not None:
-                group_by_specs_for_one_metric = self._parse_linkable_element_names(
+                group_by_specs_for_one_metric = self._parse_linkable_elements(
                     qualified_linkable_names=group_by_names,
+                    linkable_elements=group_by,
                     metric_references=(metric_reference,),
                 )
 
@@ -492,7 +508,7 @@ def _parse_and_validate_query(
             raise InvalidQueryException(f"Limit was specified as {limit}, which is < 0.")
 
         if where_filter_spec:
-            self._time_granularity_solver.validate_time_granularity(
+            self._time_granularity_solver.validate_time_granularity_and_date_part(
                 metric_references=metric_references,
                 time_dimension_specs=where_filter_spec.linkable_spec_set.time_dimension_specs,
             )
@@ -537,7 +553,7 @@ def _adjust_time_range_constraint(
         time_range_constraint: TimeRangeConstraint,
     ) -> TimeRangeConstraint:
         """Adjust the time range constraint so that it matches the boundaries of the granularity of the result."""
-        self._time_granularity_solver.validate_time_granularity(metric_references, time_dimension_specs)
+        self._time_granularity_solver.validate_time_granularity_and_date_part(metric_references, time_dimension_specs)
 
         smallest_primary_time_granularity_in_query = self._find_smallest_metric_time_dimension_spec_granularity(
             time_dimension_specs
@@ -644,21 +660,38 @@ def _parse_metric_names(
                     metric_references.extend(list(input_metrics))
         return tuple(metric_references)
 
-    def _parse_linkable_element_names(
+    def _parse_linkable_elements(
         self,
-        qualified_linkable_names: Sequence[str],
         metric_references: Sequence[MetricReference],
+        qualified_linkable_names: Optional[Sequence[str]] = None,
+        linkable_elements: Optional[Sequence[QueryParameter]] = None,
     ) -> QueryTimeLinkableSpecSet:
         """Convert the linkable spec names into the respective specification objects."""
-        qualified_linkable_names = [x.lower() for x in qualified_linkable_names]
+        assert not (qualified_linkable_names and linkable_elements)
+
+        structured_names: List[StructuredLinkableSpecName] = []
+        if qualified_linkable_names:
+            qualified_linkable_names = [x.lower() for x in qualified_linkable_names]
+            structured_names = [StructuredLinkableSpecName.from_name(name) for name in qualified_linkable_names]
+        elif linkable_elements:
+            for linkable_element in linkable_elements:
+                parsed_name = StructuredLinkableSpecName.from_name(linkable_element.name)
+                if parsed_name.time_granularity:
+                    raise ValueError("Time granularity must be passed in the grain attribute for group_by query param.")
+                structured_name = StructuredLinkableSpecName(
+                    entity_link_names=parsed_name.entity_link_names,
+                    element_name=parsed_name.element_name,
+                    time_granularity=linkable_element.grain,
+                    date_part=linkable_element.date_part,
+                )
+                structured_names.append(structured_name)
 
         dimension_specs = []
         time_dimension_specs = []
         partial_time_dimension_specs = []
         entity_specs = []
 
-        for qualified_name in qualified_linkable_names:
-            structured_name = StructuredLinkableSpecName.from_name(qualified_name)
+        for structured_name in structured_names:
             element_name = structured_name.element_name
             entity_links = tuple(EntityReference(element_name=x) for x in structured_name.entity_link_names)
             # Create the spec based on the type of element referenced.
@@ -677,6 +710,7 @@ def _parse_linkable_element_names(
                         PartialTimeDimensionSpec(
                             element_name=element_name,
                             entity_links=entity_links,
+                            date_part=structured_name.date_part,
                         )
                     )
             elif DimensionReference(element_name=element_name) in self._known_dimension_element_references:
@@ -684,20 +718,30 @@ def _parse_linkable_element_names(
             elif EntityReference(element_name=element_name) in self._known_entity_element_references:
                 entity_specs.append(EntitySpec(element_name=element_name, entity_links=entity_links))
             else:
+                valid_group_bys_for_metrics = self._metric_lookup.element_specs_for_metrics(list(metric_references))
                 valid_group_by_names_for_metrics = sorted(
-                    x.qualified_name for x in self._metric_lookup.element_specs_for_metrics(list(metric_references))
+                    list(
+                        set(
+                            x.qualified_name if qualified_linkable_names else x.element_name
+                            for x in valid_group_bys_for_metrics
+                        )
+                    )
                 )
 
+                # If requested by name, show qualified name. If requested as object, show element name.
+                display_name = structured_name.qualified_name if qualified_linkable_names else element_name
                 suggestions = {
-                    f"Suggestions for '{qualified_name}'": pformat_big_objects(
+                    f"Suggestions for '{display_name}'": pformat_big_objects(
                         MetricFlowQueryParser._top_fuzzy_matches(
-                            item=qualified_name,
+                            item=display_name,
                             candidate_items=valid_group_by_names_for_metrics,
                         )
                     )
                 }
                 raise UnableToSatisfyQueryError(
-                    f"Unknown element name '{element_name}' in dimension name '{qualified_name}'",
+                    f"Unknown element name '{element_name}' in dimension name '{display_name}'"
+                    if qualified_linkable_names
+                    else f"Unknown dimension {element_name}",
                     context=suggestions,
                 )
 
diff --git a/metricflow/test/conftest.py b/metricflow/test/conftest.py
index 31cb6d558e..13318c9f16 100644
--- a/metricflow/test/conftest.py
+++ b/metricflow/test/conftest.py
@@ -1,6 +1,11 @@
 # These imports are required to properly set up pytest fixtures.
 from __future__ import annotations
 
+from dataclasses import dataclass
+from typing import Optional
+
+from dbt_semantic_interfaces.type_enums.time_granularity import TimeGranularity
+
 from metricflow.test.fixtures.cli_fixtures import *  # noqa: F401, F403
 from metricflow.test.fixtures.dataflow_fixtures import *  # noqa: F401, F403
 from metricflow.test.fixtures.id_fixtures import *  # noqa: F401, F403
@@ -9,3 +14,13 @@
 from metricflow.test.fixtures.sql_client_fixtures import *  # noqa: F401, F403
 from metricflow.test.fixtures.sql_fixtures import *  # noqa: F401, F403
 from metricflow.test.fixtures.table_fixtures import *  # noqa: F401, F403
+from metricflow.time.date_part import DatePart
+
+
+@dataclass
+class MockQueryParameter:
+    """This is a mock that is just used to test the query parser."""
+
+    name: str
+    grain: Optional[TimeGranularity] = None
+    date_part: Optional[DatePart] = None
diff --git a/metricflow/test/integration/configured_test_case.py b/metricflow/test/integration/configured_test_case.py
index a6c0ac8e20..766873b9b0 100644
--- a/metricflow/test/integration/configured_test_case.py
+++ b/metricflow/test/integration/configured_test_case.py
@@ -4,7 +4,7 @@
 import os
 from collections import OrderedDict
 from enum import Enum
-from typing import Optional, Sequence, Tuple
+from typing import Dict, Optional, Sequence, Tuple
 
 import yaml
 from dbt_semantic_interfaces.implementations.base import FrozenBaseModel
@@ -53,6 +53,7 @@ class Config:  # noqa: D
     check_query: str
     file_path: str
     group_bys: Tuple[str, ...] = ()
+    group_by_objs: Tuple[Dict, ...] = ()
     order_bys: Tuple[str, ...] = ()
     # The required features in the DW engine for the test to complete.
     required_features: Tuple[RequiredDwEngineFeatures, ...] = ()
diff --git a/metricflow/test/integration/test_cases/itest_metrics.yaml b/metricflow/test/integration/test_cases/itest_metrics.yaml
index bd53ff686f..20c0f302d4 100644
--- a/metricflow/test/integration/test_cases/itest_metrics.yaml
+++ b/metricflow/test/integration/test_cases/itest_metrics.yaml
@@ -1049,7 +1049,7 @@ integration_test:
   description: Test query using date_part
   model: SIMPLE_MODEL
   metrics: ["bookings"]
-  group_bys: ["metric_time__extract_year"]
+  group_by_objs: [{"name": "metric_time", "date_part": "year"}]
   check_query: |
     SELECT
       SUM(1) AS bookings
@@ -1062,7 +1062,13 @@ integration_test:
   description: Test query using multiple date_parts
   model: SIMPLE_MODEL
   metrics: ["bookings"]
-  group_bys: ["metric_time__extract_quarter", "metric_time__extract_dow", "metric_time__extract_doy", "metric_time__extract_day", "metric_time__extract_week"]
+  group_by_objs: [
+    {"name": "metric_time", "date_part": "quarter"},
+    {"name": "metric_time", "date_part": "dow"},
+    {"name": "metric_time", "date_part": "doy"},
+    {"name": "metric_time", "date_part": "day"},
+    {"name": "metric_time", "date_part": "week"},
+  ]
   check_query: |
     SELECT
       SUM(1) AS bookings
@@ -1084,7 +1090,7 @@ integration_test:
   description: Tests a derived metric offset query with window and date_part
   model: SIMPLE_MODEL
   metrics: ["bookings_5_day_lag"]
-  group_bys: ["metric_time__extract_month"]
+  group_by_objs: [{"name": "metric_time", "date_part": "month"}]
   check_query: |
     SELECT
       {{ render_extract("a.ds", DatePart.MONTH) }} AS metric_time__extract_month
diff --git a/metricflow/test/integration/test_configured_cases.py b/metricflow/test/integration/test_configured_cases.py
index cde625fde7..46dd07e2a3 100644
--- a/metricflow/test/integration/test_configured_cases.py
+++ b/metricflow/test/integration/test_configured_cases.py
@@ -2,6 +2,7 @@
 
 import datetime
 import logging
+from copy import copy
 from typing import List, Optional, Sequence, Tuple
 
 import jinja2
@@ -31,6 +32,7 @@
     SqlTimeDeltaExpression,
 )
 from metricflow.test.compare_df import assert_dataframes_equal
+from metricflow.test.conftest import MockQueryParameter
 from metricflow.test.fixtures.setup_fixtures import MetricFlowTestSessionState
 from metricflow.test.integration.configured_test_case import (
     CONFIGURED_INTEGRATION_TESTS_REPOSITORY,
@@ -253,10 +255,18 @@ def test_case(
 
     check_query_helpers = CheckQueryHelpers(sql_client)
 
+    group_by: List[MockQueryParameter] = []
+    for group_by_kwargs in case.group_by_objs:
+        kwargs = copy(group_by_kwargs)
+        date_part = kwargs.get("date_part")
+        if date_part:
+            kwargs["date_part"] = DatePart(date_part)
+        group_by.append(MockQueryParameter(**kwargs))
     query_result = engine.query(
         MetricFlowQueryRequest.create_with_random_request_id(
             metric_names=case.metrics,
             group_by_names=case.group_bys,
+            group_by=tuple(group_by),
             limit=case.limit,
             time_constraint_start=parser.parse(case.time_constraint[0]) if case.time_constraint else None,
             time_constraint_end=parser.parse(case.time_constraint[1]) if case.time_constraint else None,
diff --git a/metricflow/test/query/test_query_parser.py b/metricflow/test/query/test_query_parser.py
index b4962b4bee..41f205ed05 100644
--- a/metricflow/test/query/test_query_parser.py
+++ b/metricflow/test/query/test_query_parser.py
@@ -21,9 +21,11 @@
     OrderBySpec,
     TimeDimensionSpec,
 )
+from metricflow.test.conftest import MockQueryParameter
 from metricflow.test.fixtures.model_fixtures import query_parser_from_yaml
 from metricflow.test.model.example_project_configuration import EXAMPLE_PROJECT_CONFIGURATION_YAML_CONFIG_FILE
 from metricflow.test.time.metric_time_dimension import MTD
+from metricflow.time.date_part import DatePart
 from metricflow.time.time_granularity_solver import RequestTimeGranularityException
 
 logger = logging.getLogger(__name__)
@@ -171,16 +173,6 @@ def test_query_parser(bookings_query_parser: MetricFlowQueryParser) -> None:  #
     )
 
 
-class MockQueryParameter:
-    """This is a mock that is just used to test the query parser."""
-
-    grain = None
-    date_part = None
-
-    def __init__(self, name: str):  # noqa: D
-        self.name = name
-
-
 def test_query_parser_with_object_params(bookings_query_parser: MetricFlowQueryParser) -> None:  # noqa: D
     Metric = namedtuple("Metric", ["name"])
     metric = Metric("bookings")
@@ -372,11 +364,10 @@ def test_derived_metric_query_parsing() -> None:
 
 def test_derived_metric_with_offset_parsing() -> None:
     """Test that querying derived metrics with a time offset requires a time dimension."""
-    bookings_yaml_file = YamlConfigFile(filepath="inline_for_test_1", contents=BOOKINGS_YAML)
-    bookings_yaml_file = YamlConfigFile(filepath="inline_for_test_1", contents=REVENUE_YAML)
+    revenue_yaml_file = YamlConfigFile(filepath="inline_for_test_1", contents=REVENUE_YAML)
     metrics_yaml_file = YamlConfigFile(filepath="inline_for_test_1", contents=METRICS_YAML)
     query_parser = query_parser_from_yaml(
-        [EXAMPLE_PROJECT_CONFIGURATION_YAML_CONFIG_FILE, bookings_yaml_file, metrics_yaml_file]
+        [EXAMPLE_PROJECT_CONFIGURATION_YAML_CONFIG_FILE, revenue_yaml_file, metrics_yaml_file]
     )
     # Attempt to query with no dimension
     with pytest.raises(UnableToSatisfyQueryError):
@@ -397,3 +388,32 @@ def test_derived_metric_with_offset_parsing() -> None:
         metric_names=["revenue_growth_2_weeks"],
         group_by_names=[MTD],
     )
+
+
+def test_date_part_parsing() -> None:
+    """Test that querying with a date_part verifies compatibility with time_granularity."""
+    revenue_yaml_file = YamlConfigFile(filepath="inline_for_test_1", contents=REVENUE_YAML)
+    metrics_yaml_file = YamlConfigFile(filepath="inline_for_test_1", contents=METRICS_YAML)
+    query_parser = query_parser_from_yaml(
+        [EXAMPLE_PROJECT_CONFIGURATION_YAML_CONFIG_FILE, revenue_yaml_file, metrics_yaml_file]
+    )
+
+    # Date part is incompatible with metric's defined time granularity
+    with pytest.raises(RequestTimeGranularityException, match="is not valid for querying"):
+        query_parser.parse_and_validate_query(
+            metric_names=["revenue"],
+            group_by=[MockQueryParameter(name="metric_time", date_part=DatePart.DOW)],
+        )
+
+    # Date part is compatible with the requested time granularity for the same time dimension
+    with pytest.raises(RequestTimeGranularityException, match="is not compatible with time granularity"):
+        query_parser.parse_and_validate_query(
+            metric_names=["revenue"],
+            group_by=[MockQueryParameter(name="metric_time", grain=TimeGranularity.YEAR, date_part=DatePart.MONTH)],
+        )
+
+    # Date part is compatible
+    query_parser.parse_and_validate_query(
+        metric_names=["revenue"],
+        group_by=[MockQueryParameter(name="metric_time", date_part=DatePart.MONTH)],
+    )
diff --git a/metricflow/test/time/test_time_granularity_solver.py b/metricflow/test/time/test_time_granularity_solver.py
index 025778df10..e354881588 100644
--- a/metricflow/test/time/test_time_granularity_solver.py
+++ b/metricflow/test/time/test_time_granularity_solver.py
@@ -27,21 +27,21 @@ def time_granularity_solver(  # noqa: D
 
 
 def test_validate_day_granuarity_for_day_metric(time_granularity_solver: TimeGranularitySolver) -> None:  # noqa: D
-    time_granularity_solver.validate_time_granularity(
+    time_granularity_solver.validate_time_granularity_and_date_part(
         metric_references=[MetricReference(element_name="bookings")],
         time_dimension_specs=[DataSet.metric_time_dimension_spec(TimeGranularity.DAY)],
     )
 
 
 def test_validate_month_granuarity_for_day_metric(time_granularity_solver: TimeGranularitySolver) -> None:  # noqa: D
-    time_granularity_solver.validate_time_granularity(
+    time_granularity_solver.validate_time_granularity_and_date_part(
         metric_references=[MetricReference(element_name="bookings")],
         time_dimension_specs=[DataSet.metric_time_dimension_spec(TimeGranularity.MONTH)],
     )
 
 
 def test_validate_month_granuarity_for_month_metric(time_granularity_solver: TimeGranularitySolver) -> None:  # noqa: D
-    time_granularity_solver.validate_time_granularity(
+    time_granularity_solver.validate_time_granularity_and_date_part(
         metric_references=[MetricReference(element_name="bookings_monthly")],
         time_dimension_specs=[DataSet.metric_time_dimension_spec(TimeGranularity.MONTH)],
     )
@@ -50,7 +50,7 @@ def test_validate_month_granuarity_for_month_metric(time_granularity_solver: Tim
 def test_validate_month_granuarity_for_day_and_month_metrics(  # noqa: D
     time_granularity_solver: TimeGranularitySolver,
 ) -> None:
-    time_granularity_solver.validate_time_granularity(
+    time_granularity_solver.validate_time_granularity_and_date_part(
         metric_references=[MetricReference(element_name="bookings"), MetricReference(element_name="bookings_monthly")],
         time_dimension_specs=[DataSet.metric_time_dimension_spec(TimeGranularity.MONTH)],
     )
@@ -59,7 +59,7 @@ def test_validate_month_granuarity_for_day_and_month_metrics(  # noqa: D
 def test_validate_year_granularity_for_day_and_month_metrics(  # noqa: D
     time_granularity_solver: TimeGranularitySolver,
 ) -> None:
-    time_granularity_solver.validate_time_granularity(
+    time_granularity_solver.validate_time_granularity_and_date_part(
         metric_references=[MetricReference(element_name="bookings"), MetricReference(element_name="bookings_monthly")],
         time_dimension_specs=[DataSet.metric_time_dimension_spec(TimeGranularity.YEAR)],
     )
@@ -67,7 +67,7 @@ def test_validate_year_granularity_for_day_and_month_metrics(  # noqa: D
 
 def test_validate_day_granuarity_for_month_metric(time_granularity_solver: TimeGranularitySolver) -> None:  # noqa: D
     with pytest.raises(RequestTimeGranularityException):
-        time_granularity_solver.validate_time_granularity(
+        time_granularity_solver.validate_time_granularity_and_date_part(
             metric_references=[MetricReference(element_name="bookings_monthly")],
             time_dimension_specs=[DataSet.metric_time_dimension_spec(TimeGranularity.DAY)],
         )
@@ -77,7 +77,7 @@ def test_validate_day_granularity_for_day_and_month_metric(  # noqa: D
     time_granularity_solver: TimeGranularitySolver,
 ) -> None:
     with pytest.raises(RequestTimeGranularityException):
-        time_granularity_solver.validate_time_granularity(
+        time_granularity_solver.validate_time_granularity_and_date_part(
             metric_references=[
                 MetricReference(element_name="bookings"),
                 MetricReference(element_name="bookings_monthly"),
@@ -120,7 +120,7 @@ def test_granularity_error_for_cumulative_metric(  # noqa: D
     time_granularity_solver: TimeGranularitySolver,
 ) -> None:
     with pytest.raises(RequestTimeGranularityException):
-        time_granularity_solver.validate_time_granularity(
+        time_granularity_solver.validate_time_granularity_and_date_part(
             metric_references=[
                 MetricReference(element_name="weekly_bookers"),
                 MetricReference(element_name="bookings_monthly"),
diff --git a/metricflow/time/time_granularity_solver.py b/metricflow/time/time_granularity_solver.py
index 8fbf95c601..367fc832a5 100644
--- a/metricflow/time/time_granularity_solver.py
+++ b/metricflow/time/time_granularity_solver.py
@@ -19,6 +19,7 @@
 from metricflow.specs.specs import (
     TimeDimensionSpec,
 )
+from metricflow.time.date_part import DatePart
 from metricflow.time.time_granularity import (
     adjust_to_end_of_period,
     adjust_to_start_of_period,
@@ -38,6 +39,7 @@ class PartialTimeDimensionSpec:
 
     element_name: str
     entity_links: Tuple[EntityReference, ...]
+    date_part: Optional[DatePart] = None
 
 
 @dataclass(frozen=True)
@@ -65,28 +67,34 @@ def __init__(  # noqa: D
     ) -> None:
         self._semantic_manifest_lookup = semantic_manifest_lookup
 
-    def validate_time_granularity(
+    def validate_time_granularity_and_date_part(
         self, metric_references: Sequence[MetricReference], time_dimension_specs: Sequence[TimeDimensionSpec]
     ) -> None:
-        """Check that the granularity specified for time dimensions is valid with respect to the metrics.
+        """Check that the granularity & date_part specified for time dimensions is valid with respect to the metrics.
 
-        e.g. throw an error if "ds__week" is specified for a metric with a time granularity of MONTH.
+        e.g. throw an error if "ds__week" or "extract week" is specified for a metric with a time granularity of MONTH.
         """
         valid_group_by_elements = self._semantic_manifest_lookup.metric_lookup.linkable_set_for_metrics(
             metric_references=metric_references,
         )
 
         for time_dimension_spec in time_dimension_specs:
-            match_found = False
+            match_found_with_granularity = False
+            match_found_for_date_part = False
             for path_key in valid_group_by_elements.path_key_to_linkable_dimensions:
-                if (
-                    path_key.element_name == time_dimension_spec.element_name
-                    and (path_key.entity_links == time_dimension_spec.entity_links)
-                    and path_key.time_granularity == time_dimension_spec.time_granularity
+                if path_key.element_name == time_dimension_spec.element_name and (
+                    path_key.entity_links == time_dimension_spec.entity_links
                 ):
-                    match_found = True
-                    break
-            if not match_found:
+                    if path_key.time_granularity == time_dimension_spec.time_granularity:
+                        match_found_with_granularity = True
+                    if not time_dimension_spec.date_part or (
+                        path_key.time_granularity
+                        and path_key.time_granularity.to_int() <= time_dimension_spec.date_part.to_int()
+                    ):
+                        match_found_for_date_part = True
+                    if match_found_with_granularity and match_found_for_date_part:
+                        break
+            if not (match_found_with_granularity and match_found_for_date_part):
                 raise RequestTimeGranularityException(
                     f"{time_dimension_spec} is not valid for querying {metric_references}"
                 )
@@ -123,6 +131,7 @@ def resolve_granularity_for_partial_time_dimension_specs(
                     element_name=partial_time_dimension_spec.element_name,
                     entity_links=partial_time_dimension_spec.entity_links,
                     time_granularity=minimum_time_granularity,
+                    date_part=partial_time_dimension_spec.date_part,
                 )
             else:
                 raise RequestTimeGranularityException(

From 7f64a70c27a66ddc5923dec8dea629ebf8f39fe7 Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Tue, 12 Sep 2023 18:17:23 -0700
Subject: [PATCH 11/15] Separate validation for date part, esp for cumulative
 metrics

---
 metricflow/query/query_parser.py              | 21 ++++++++++++--
 metricflow/test/query/test_query_parser.py    | 13 +++++++--
 .../test/time/test_time_granularity_solver.py | 16 +++++------
 metricflow/time/time_granularity_solver.py    | 28 ++++++++-----------
 4 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/metricflow/query/query_parser.py b/metricflow/query/query_parser.py
index 329bb3bdc3..82cc913303 100644
--- a/metricflow/query/query_parser.py
+++ b/metricflow/query/query_parser.py
@@ -433,7 +433,8 @@ def _parse_and_validate_query(
         if len(time_dimension_specs) == 0:
             self._validate_no_time_dimension_query(metric_references=metric_references)
 
-        self._time_granularity_solver.validate_time_granularity_and_date_part(metric_references, time_dimension_specs)
+        self._time_granularity_solver.validate_time_granularity(metric_references, time_dimension_specs)
+        self._validate_date_part(metric_references, time_dimension_specs)
         for time_dimension_spec in time_dimension_specs:
             if (
                 time_dimension_spec.date_part
@@ -508,7 +509,7 @@ def _parse_and_validate_query(
             raise InvalidQueryException(f"Limit was specified as {limit}, which is < 0.")
 
         if where_filter_spec:
-            self._time_granularity_solver.validate_time_granularity_and_date_part(
+            self._time_granularity_solver.validate_time_granularity(
                 metric_references=metric_references,
                 time_dimension_specs=where_filter_spec.linkable_spec_set.time_dimension_specs,
             )
@@ -546,6 +547,20 @@ def _validate_order_by_specs(
             ):
                 raise InvalidQueryException(f"Order by item {order_by_spec} not in the query")
 
+    def _validate_date_part(
+        self, metric_references: Sequence[MetricReference], time_dimension_specs: Sequence[TimeDimensionSpec]
+    ) -> None:
+        """Validate that date parts can be used for metrics."""
+        date_part_requested = False
+        for time_dimension_spec in time_dimension_specs:
+            if time_dimension_spec.date_part:
+                date_part_requested = True
+                break
+
+        for metric_reference in metric_references:
+            if self._metric_lookup.get_metric(metric_reference).type == MetricType.CUMULATIVE and date_part_requested:
+                raise UnableToSatisfyQueryError("Cannot extract date part for cumulative metrics.")
+
     def _adjust_time_range_constraint(
         self,
         metric_references: Sequence[MetricReference],
@@ -553,7 +568,7 @@ def _adjust_time_range_constraint(
         time_range_constraint: TimeRangeConstraint,
     ) -> TimeRangeConstraint:
         """Adjust the time range constraint so that it matches the boundaries of the granularity of the result."""
-        self._time_granularity_solver.validate_time_granularity_and_date_part(metric_references, time_dimension_specs)
+        self._time_granularity_solver.validate_time_granularity(metric_references, time_dimension_specs)
 
         smallest_primary_time_granularity_in_query = self._find_smallest_metric_time_dimension_spec_granularity(
             time_dimension_specs
diff --git a/metricflow/test/query/test_query_parser.py b/metricflow/test/query/test_query_parser.py
index 41f205ed05..2bba217baf 100644
--- a/metricflow/test/query/test_query_parser.py
+++ b/metricflow/test/query/test_query_parser.py
@@ -399,19 +399,26 @@ def test_date_part_parsing() -> None:
     )
 
     # Date part is incompatible with metric's defined time granularity
-    with pytest.raises(RequestTimeGranularityException, match="is not valid for querying"):
+    with pytest.raises(RequestTimeGranularityException):
         query_parser.parse_and_validate_query(
             metric_names=["revenue"],
             group_by=[MockQueryParameter(name="metric_time", date_part=DatePart.DOW)],
         )
 
-    # Date part is compatible with the requested time granularity for the same time dimension
-    with pytest.raises(RequestTimeGranularityException, match="is not compatible with time granularity"):
+    # Date part is incompatible with the requested time granularity for the same time dimension
+    with pytest.raises(RequestTimeGranularityException):
         query_parser.parse_and_validate_query(
             metric_names=["revenue"],
             group_by=[MockQueryParameter(name="metric_time", grain=TimeGranularity.YEAR, date_part=DatePart.MONTH)],
         )
 
+    # Can't query date part for cumulative metrics
+    with pytest.raises(UnableToSatisfyQueryError):
+        query_parser.parse_and_validate_query(
+            metric_names=["revenue_cumulative"],
+            group_by=[MockQueryParameter(name="metric_time", date_part=DatePart.DOY)],
+        )
+
     # Date part is compatible
     query_parser.parse_and_validate_query(
         metric_names=["revenue"],
diff --git a/metricflow/test/time/test_time_granularity_solver.py b/metricflow/test/time/test_time_granularity_solver.py
index e354881588..025778df10 100644
--- a/metricflow/test/time/test_time_granularity_solver.py
+++ b/metricflow/test/time/test_time_granularity_solver.py
@@ -27,21 +27,21 @@ def time_granularity_solver(  # noqa: D
 
 
 def test_validate_day_granuarity_for_day_metric(time_granularity_solver: TimeGranularitySolver) -> None:  # noqa: D
-    time_granularity_solver.validate_time_granularity_and_date_part(
+    time_granularity_solver.validate_time_granularity(
         metric_references=[MetricReference(element_name="bookings")],
         time_dimension_specs=[DataSet.metric_time_dimension_spec(TimeGranularity.DAY)],
     )
 
 
 def test_validate_month_granuarity_for_day_metric(time_granularity_solver: TimeGranularitySolver) -> None:  # noqa: D
-    time_granularity_solver.validate_time_granularity_and_date_part(
+    time_granularity_solver.validate_time_granularity(
         metric_references=[MetricReference(element_name="bookings")],
         time_dimension_specs=[DataSet.metric_time_dimension_spec(TimeGranularity.MONTH)],
     )
 
 
 def test_validate_month_granuarity_for_month_metric(time_granularity_solver: TimeGranularitySolver) -> None:  # noqa: D
-    time_granularity_solver.validate_time_granularity_and_date_part(
+    time_granularity_solver.validate_time_granularity(
         metric_references=[MetricReference(element_name="bookings_monthly")],
         time_dimension_specs=[DataSet.metric_time_dimension_spec(TimeGranularity.MONTH)],
     )
@@ -50,7 +50,7 @@ def test_validate_month_granuarity_for_month_metric(time_granularity_solver: Tim
 def test_validate_month_granuarity_for_day_and_month_metrics(  # noqa: D
     time_granularity_solver: TimeGranularitySolver,
 ) -> None:
-    time_granularity_solver.validate_time_granularity_and_date_part(
+    time_granularity_solver.validate_time_granularity(
         metric_references=[MetricReference(element_name="bookings"), MetricReference(element_name="bookings_monthly")],
         time_dimension_specs=[DataSet.metric_time_dimension_spec(TimeGranularity.MONTH)],
     )
@@ -59,7 +59,7 @@ def test_validate_month_granuarity_for_day_and_month_metrics(  # noqa: D
 def test_validate_year_granularity_for_day_and_month_metrics(  # noqa: D
     time_granularity_solver: TimeGranularitySolver,
 ) -> None:
-    time_granularity_solver.validate_time_granularity_and_date_part(
+    time_granularity_solver.validate_time_granularity(
         metric_references=[MetricReference(element_name="bookings"), MetricReference(element_name="bookings_monthly")],
         time_dimension_specs=[DataSet.metric_time_dimension_spec(TimeGranularity.YEAR)],
     )
@@ -67,7 +67,7 @@ def test_validate_year_granularity_for_day_and_month_metrics(  # noqa: D
 
 def test_validate_day_granuarity_for_month_metric(time_granularity_solver: TimeGranularitySolver) -> None:  # noqa: D
     with pytest.raises(RequestTimeGranularityException):
-        time_granularity_solver.validate_time_granularity_and_date_part(
+        time_granularity_solver.validate_time_granularity(
             metric_references=[MetricReference(element_name="bookings_monthly")],
             time_dimension_specs=[DataSet.metric_time_dimension_spec(TimeGranularity.DAY)],
         )
@@ -77,7 +77,7 @@ def test_validate_day_granularity_for_day_and_month_metric(  # noqa: D
     time_granularity_solver: TimeGranularitySolver,
 ) -> None:
     with pytest.raises(RequestTimeGranularityException):
-        time_granularity_solver.validate_time_granularity_and_date_part(
+        time_granularity_solver.validate_time_granularity(
             metric_references=[
                 MetricReference(element_name="bookings"),
                 MetricReference(element_name="bookings_monthly"),
@@ -120,7 +120,7 @@ def test_granularity_error_for_cumulative_metric(  # noqa: D
     time_granularity_solver: TimeGranularitySolver,
 ) -> None:
     with pytest.raises(RequestTimeGranularityException):
-        time_granularity_solver.validate_time_granularity_and_date_part(
+        time_granularity_solver.validate_time_granularity(
             metric_references=[
                 MetricReference(element_name="weekly_bookers"),
                 MetricReference(element_name="bookings_monthly"),
diff --git a/metricflow/time/time_granularity_solver.py b/metricflow/time/time_granularity_solver.py
index 367fc832a5..ecf6c5d13c 100644
--- a/metricflow/time/time_granularity_solver.py
+++ b/metricflow/time/time_granularity_solver.py
@@ -67,34 +67,28 @@ def __init__(  # noqa: D
     ) -> None:
         self._semantic_manifest_lookup = semantic_manifest_lookup
 
-    def validate_time_granularity_and_date_part(
+    def validate_time_granularity(
         self, metric_references: Sequence[MetricReference], time_dimension_specs: Sequence[TimeDimensionSpec]
     ) -> None:
-        """Check that the granularity & date_part specified for time dimensions is valid with respect to the metrics.
+        """Check that the granularity specified for time dimensions is valid with respect to the metrics.
 
-        e.g. throw an error if "ds__week" or "extract week" is specified for a metric with a time granularity of MONTH.
+        e.g. throw an error if "ds__week" is specified for a metric with a time granularity of MONTH.
         """
         valid_group_by_elements = self._semantic_manifest_lookup.metric_lookup.linkable_set_for_metrics(
             metric_references=metric_references,
         )
 
         for time_dimension_spec in time_dimension_specs:
-            match_found_with_granularity = False
-            match_found_for_date_part = False
+            match_found = False
             for path_key in valid_group_by_elements.path_key_to_linkable_dimensions:
-                if path_key.element_name == time_dimension_spec.element_name and (
-                    path_key.entity_links == time_dimension_spec.entity_links
+                if (
+                    path_key.element_name == time_dimension_spec.element_name
+                    and (path_key.entity_links == time_dimension_spec.entity_links)
+                    and path_key.time_granularity == time_dimension_spec.time_granularity
                 ):
-                    if path_key.time_granularity == time_dimension_spec.time_granularity:
-                        match_found_with_granularity = True
-                    if not time_dimension_spec.date_part or (
-                        path_key.time_granularity
-                        and path_key.time_granularity.to_int() <= time_dimension_spec.date_part.to_int()
-                    ):
-                        match_found_for_date_part = True
-                    if match_found_with_granularity and match_found_for_date_part:
-                        break
-            if not (match_found_with_granularity and match_found_for_date_part):
+                    match_found = True
+                    break
+            if not match_found:
                 raise RequestTimeGranularityException(
                     f"{time_dimension_spec} is not valid for querying {metric_references}"
                 )

From 32fba86f7eed23d89a9e298fc209ad15c6918f03 Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Tue, 12 Sep 2023 18:38:35 -0700
Subject: [PATCH 12/15] Temp: block date part for grain to date

---
 metricflow/query/query_parser.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/metricflow/query/query_parser.py b/metricflow/query/query_parser.py
index 82cc913303..b220239631 100644
--- a/metricflow/query/query_parser.py
+++ b/metricflow/query/query_parser.py
@@ -550,16 +550,26 @@ def _validate_order_by_specs(
     def _validate_date_part(
         self, metric_references: Sequence[MetricReference], time_dimension_specs: Sequence[TimeDimensionSpec]
     ) -> None:
-        """Validate that date parts can be used for metrics."""
+        """Validate that date parts can be used for metrics.
+
+        TODO: figure out expected behavior for date part with these types of metrics.
+        """
         date_part_requested = False
         for time_dimension_spec in time_dimension_specs:
             if time_dimension_spec.date_part:
                 date_part_requested = True
                 break
-
-        for metric_reference in metric_references:
-            if self._metric_lookup.get_metric(metric_reference).type == MetricType.CUMULATIVE and date_part_requested:
-                raise UnableToSatisfyQueryError("Cannot extract date part for cumulative metrics.")
+        if date_part_requested:
+            for metric_reference in metric_references:
+                metric = self._metric_lookup.get_metric(metric_reference)
+                if metric.type == MetricType.CUMULATIVE:
+                    raise UnableToSatisfyQueryError("Cannot extract date part for cumulative metrics.")
+                elif metric.type == MetricType.DERIVED:
+                    for input_metric in metric.type_params.metrics or []:
+                        if input_metric.offset_to_grain:
+                            raise UnableToSatisfyQueryError(
+                                "Cannot extract date part for metrics with offset_to_grain."
+                            )
 
     def _adjust_time_range_constraint(
         self,

From 38761fec874fdd843f6283fe130ff64353e1ab89 Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Tue, 12 Sep 2023 18:40:11 -0700
Subject: [PATCH 13/15] Temp: block date part for grain to date

---
 metricflow/plan_conversion/dataflow_to_sql.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metricflow/plan_conversion/dataflow_to_sql.py b/metricflow/plan_conversion/dataflow_to_sql.py
index 84b2e0d261..1b04666460 100644
--- a/metricflow/plan_conversion/dataflow_to_sql.py
+++ b/metricflow/plan_conversion/dataflow_to_sql.py
@@ -1376,7 +1376,6 @@ def visit_join_to_time_spine_node(self, node: JoinToTimeSpineNode[SourceDataSetT
                     time_granularity=metric_time_dimension_spec.time_granularity, arg=time_spine_column_select_expr
                 )
                 if node.offset_to_grain:
-                    # TODO: allow offset_to_grain w/ granularity & datepart? what's the expected behavior?
                     # Filter down to one row per granularity period
                     new_filter = SqlComparisonExpression(
                         left_expr=select_expr, comparison=SqlComparison.EQUALS, right_expr=time_spine_column_select_expr

From ddec74e89cc55e15784335d8ea9fdd106014da61 Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Wed, 13 Sep 2023 09:12:07 -0700
Subject: [PATCH 14/15] Cleanup

---
 .../unreleased/Features-20230911-190924.yaml  |    2 +-
 .../dataflow/builder/dataflow_plan_builder.py |    2 +-
 metricflow/naming/linkable_spec_name.py       |    5 +-
 metricflow/query/query_parser.py              |    8 +-
 metricflow/specs/specs.py                     |    1 +
 metricflow/sql/render/big_query.py            |    6 +-
 .../integration/test_cases/itest_metrics.yaml |   13 +
 .../test/integration/test_configured_cases.py |    3 +
 .../test_dataflow_to_sql_plan.py              |   82 +
 metricflow/test/query/test_query_parser.py    |   32 +-
 ...st_convert_query_semantic_model__plan0.sql |   12 +-
 ...le_semantic_model_with_measures__plan0.sql |   24 +-
 ...semantic_model_without_measures__plan0.sql |   12 +-
 .../test_multihop_join_plan__dfp_0.xml        |   62 +-
 .../test_common_semantic_model__plan0.sql     |   72 +-
 .../test_compute_metrics_node__plan0.sql      |   60 +-
 ...o_from_multiple_semantic_models__plan0.sql |  108 +-
 ...atio_from_single_semantic_model__plan0.sql |   60 +-
 ...ompute_metrics_node_simple_expr__plan0.sql |   60 +-
 .../test_constrain_time_range_node__plan0.sql |   36 +-
 .../test_cumulative_metric__plan0.sql         |   12 +-
 ...cumulative_metric_grain_to_date__plan0.sql |   12 +-
 .../test_cumulative_metric_no_ds__plan0.sql   |   12 +-
 ...est_cumulative_metric_no_window__plan0.sql |   12 +-
 ..._no_window_with_time_constraint__plan0.sql |   12 +-
 ...ive_metric_with_time_constraint__plan0.sql |   12 +-
 .../BigQuery/test_derived_metric__plan0.sql   |   72 +-
 ...ved_metric_with_offset_to_grain__plan0.sql |   72 +-
 ...offset_to_grain_and_granularity__plan0.sql |   72 +-
 ...rived_metric_with_offset_window__plan0.sql |   72 +-
 ...h_offset_window_and_granularity__plan0.sql |   72 +-
 ...fset_window_and_offset_to_grain__plan0.sql |   72 +-
 ...offset_to_grain_and_granularity__plan0.sql |   72 +-
 ...erived_offset_cumulative_metric__plan0.sql |   36 +-
 ...et_metric_with_one_input_metric__plan0.sql |   36 +-
 .../BigQuery/test_distinct_values__plan0.sql  |   60 +-
 .../BigQuery/test_filter_node__plan0.sql      |   36 +-
 ...lter_with_where_constraint_node__plan0.sql |   36 +-
 ...th_where_constraint_on_join_dim__plan0.sql |   60 +-
 .../test_join_to_scd_dimension__plan0.sql     |   60 +-
 ...spine_node_with_offset_to_grain__plan0.sql |   36 +-
 ...e_spine_node_with_offset_window__plan0.sql |   36 +-
 ..._time_spine_node_without_offset__plan0.sql |   36 +-
 .../BigQuery/test_limit_rows__plan0.sql       |   36 +-
 ...al_dimension_using_local_entity__plan0.sql |   24 +-
 .../test_measure_aggregation_node__plan0.sql  |   36 +-
 .../test_measure_constraint__plan0.sql        |  156 +-
 ..._constraint_with_reused_measure__plan0.sql |   72 +-
 ...aint_with_single_expr_and_alias__plan0.sql |   36 +-
 ..._multiple_sources_no_dimensions__plan0.sql |   60 +-
 ...multi_hop_through_scd_dimension__plan0.sql |  100 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |  116 +-
 .../BigQuery/test_multi_join_node__plan0.sql  |   84 +-
 .../BigQuery/test_multihop_node__plan0.sql    |   76 +-
 ..._multiple_metrics_no_dimensions__plan0.sql |   60 +-
 .../test_nested_derived_metric__plan0.sql     |  144 +-
 ...st_offset_window_with_date_part__plan0.sql |  585 +++++
 ...window_with_date_part__plan0_optimized.sql |   63 +
 .../BigQuery/test_order_by_node__plan0.sql    |   36 +-
 .../BigQuery/test_partitioned_join__plan0.sql |   60 +-
 .../test_semi_additive_join_node__plan0.sql   |   24 +-
 ...mi_additive_join_node__plan0_optimized.sql |   12 +-
 ...dditive_join_node_with_grouping__plan0.sql |   24 +-
 ...in_node_with_grouping__plan0_optimized.sql |   12 +-
 ...join_node_with_queried_group_by__plan0.sql |   24 +-
 ...with_queried_group_by__plan0_optimized.sql |   12 +-
 ...est_simple_query_with_date_part__plan0.sql |  227 ++
 ..._query_with_date_part__plan0_optimized.sql |   17 +
 ..._query_with_multiple_date_parts__plan0.sql |  258 ++
 ...h_multiple_date_parts__plan0_optimized.sql |   42 +
 .../BigQuery/test_single_join_node__plan0.sql |   60 +-
 .../BigQuery/test_source_node__plan0.sql      |   36 +-
 .../test_source_node__plan0_optimized.sql     |   36 +-
 ...multi_hop_through_scd_dimension__plan0.sql |   28 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |   56 +-
 .../Databricks/test_multihop_node__plan0.sql  |   28 +-
 ...st_offset_window_with_date_part__plan0.sql |  585 +++++
 ...window_with_date_part__plan0_optimized.sql |   63 +
 ...est_simple_query_with_date_part__plan0.sql |  227 ++
 ..._query_with_date_part__plan0_optimized.sql |   17 +
 ..._query_with_multiple_date_parts__plan0.sql |  258 ++
 ...h_multiple_date_parts__plan0_optimized.sql |   42 +
 ...multi_hop_through_scd_dimension__plan0.sql |   28 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |   56 +-
 .../DuckDB/test_multihop_node__plan0.sql      |   28 +-
 ...st_offset_window_with_date_part__plan0.sql |  585 +++++
 ...window_with_date_part__plan0_optimized.sql |   63 +
 ...est_simple_query_with_date_part__plan0.sql |  227 ++
 ..._query_with_date_part__plan0_optimized.sql |   17 +
 ..._query_with_multiple_date_parts__plan0.sql |  258 ++
 ...h_multiple_date_parts__plan0_optimized.sql |   42 +
 ...multi_hop_through_scd_dimension__plan0.sql |   28 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |   56 +-
 .../Postgres/test_multihop_node__plan0.sql    |   28 +-
 ...st_offset_window_with_date_part__plan0.sql |  585 +++++
 ...window_with_date_part__plan0_optimized.sql |   63 +
 ...est_simple_query_with_date_part__plan0.sql |  227 ++
 ..._query_with_date_part__plan0_optimized.sql |   17 +
 ..._query_with_multiple_date_parts__plan0.sql |  258 ++
 ...h_multiple_date_parts__plan0_optimized.sql |   42 +
 ...multi_hop_through_scd_dimension__plan0.sql |   28 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |   56 +-
 .../Redshift/test_multihop_node__plan0.sql    |   28 +-
 ...st_offset_window_with_date_part__plan0.sql |  585 +++++
 ...window_with_date_part__plan0_optimized.sql |   63 +
 ...est_simple_query_with_date_part__plan0.sql |  227 ++
 ..._query_with_date_part__plan0_optimized.sql |   17 +
 ..._query_with_multiple_date_parts__plan0.sql |  258 ++
 ...h_multiple_date_parts__plan0_optimized.sql |   42 +
 ...multi_hop_through_scd_dimension__plan0.sql |   28 +-
 ...test_multi_hop_to_scd_dimension__plan0.sql |   56 +-
 .../Snowflake/test_multihop_node__plan0.sql   |   28 +-
 ...st_offset_window_with_date_part__plan0.sql |  585 +++++
 ...window_with_date_part__plan0_optimized.sql |   63 +
 ...est_simple_query_with_date_part__plan0.sql |  227 ++
 ..._query_with_date_part__plan0_optimized.sql |   17 +
 ..._query_with_multiple_date_parts__plan0.sql |  258 ++
 ...h_multiple_date_parts__plan0_optimized.sql |   42 +
 ...multi_hop_through_scd_dimension__plan0.xml |   58 +-
 ...test_multi_hop_to_scd_dimension__plan0.xml |  106 +-
 .../test_multihop_node__plan0.xml             |   62 +-
 ...st_offset_window_with_date_part__plan0.xml | 2165 +++++++++++++++++
 ...est_simple_query_with_date_part__plan0.xml |  863 +++++++
 ..._query_with_multiple_date_parts__plan0.xml |  966 ++++++++
 ...orm_node_using_non_primary_time__plan0.sql |   36 +-
 ...sing_non_primary_time__plan0_optimized.sql |   42 +-
 ...ansform_node_using_primary_time__plan0.sql |   36 +-
 ...de_using_primary_time__plan0_optimized.sql |   42 +-
 ...uery_with_metric_time_dimension__plan0.sql |   72 +-
 .../test_joined_node_data_set__result0.txt    |   42 +-
 130 files changed, 13237 insertions(+), 1969 deletions(-)
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_offset_window_with_date_part__plan0.xml
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_date_part__plan0.xml
 create mode 100644 metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_multiple_date_parts__plan0.xml

diff --git a/.changes/unreleased/Features-20230911-190924.yaml b/.changes/unreleased/Features-20230911-190924.yaml
index 8370049390..85d9d36c35 100644
--- a/.changes/unreleased/Features-20230911-190924.yaml
+++ b/.changes/unreleased/Features-20230911-190924.yaml
@@ -1,5 +1,5 @@
 kind: Features
-body: DatePart aggregation for time dimensions
+body: Enable DATE PART aggregation for time dimensions
 time: 2023-09-11T19:09:24.960342-07:00
 custom:
   Author: courtneyholcomb
diff --git a/metricflow/dataflow/builder/dataflow_plan_builder.py b/metricflow/dataflow/builder/dataflow_plan_builder.py
index c989d43131..1445c7918f 100644
--- a/metricflow/dataflow/builder/dataflow_plan_builder.py
+++ b/metricflow/dataflow/builder/dataflow_plan_builder.py
@@ -792,7 +792,7 @@ def _build_aggregated_measures_from_measure_source_node(
         # If querying an offset metric, join to time spine.
         join_to_time_spine_node: Optional[JoinToTimeSpineNode] = None
         if metric_spec.offset_window or metric_spec.offset_to_grain:
-            assert metric_time_dimension_specs, "Joining to time spine requires querying with metric_time."
+            assert metric_time_dimension_specs, "Joining to time spine requires querying with metric time."
             join_to_time_spine_node = JoinToTimeSpineNode(
                 parent_node=time_range_node or measure_recipe.measure_node,
                 metric_time_dimension_specs=metric_time_dimension_specs,
diff --git a/metricflow/naming/linkable_spec_name.py b/metricflow/naming/linkable_spec_name.py
index 0e73415cd4..3a886b7faf 100644
--- a/metricflow/naming/linkable_spec_name.py
+++ b/metricflow/naming/linkable_spec_name.py
@@ -63,7 +63,10 @@ def from_name(qualified_name: str) -> StructuredLinkableSpecName:
 
     @property
     def qualified_name(self) -> str:
-        """Return the full name form. e.g. ds or listing__ds__month."""
+        """Return the full name form. e.g. ds or listing__ds__month.
+
+        If date_part is specified, don't include granularity in qualified_name since it will not impact the result.
+        """
         items = list(self.entity_link_names) + [self.element_name]
         if self.date_part:
             items.append(self.date_part_suffix(date_part=self.date_part))
diff --git a/metricflow/query/query_parser.py b/metricflow/query/query_parser.py
index b220239631..3cf160a559 100644
--- a/metricflow/query/query_parser.py
+++ b/metricflow/query/query_parser.py
@@ -702,7 +702,9 @@ def _parse_linkable_elements(
             for linkable_element in linkable_elements:
                 parsed_name = StructuredLinkableSpecName.from_name(linkable_element.name)
                 if parsed_name.time_granularity:
-                    raise ValueError("Time granularity must be passed in the grain attribute for group_by query param.")
+                    raise ValueError(
+                        "Time granularity must be passed in the `grain` attribute for `group_by` query param."
+                    )
                 structured_name = StructuredLinkableSpecName(
                     entity_link_names=parsed_name.entity_link_names,
                     element_name=parsed_name.element_name,
@@ -721,15 +723,15 @@ def _parse_linkable_elements(
             entity_links = tuple(EntityReference(element_name=x) for x in structured_name.entity_link_names)
             # Create the spec based on the type of element referenced.
             if TimeDimensionReference(element_name=element_name) in self._known_time_dimension_element_references:
-                if structured_name.time_granularity:
+                if structured_name.time_granularity and not structured_name.date_part:
                     time_dimension_specs.append(
                         TimeDimensionSpec(
                             element_name=element_name,
                             entity_links=entity_links,
                             time_granularity=structured_name.time_granularity,
-                            date_part=structured_name.date_part,
                         )
                     )
+                # If date part is passed, remove requested granularity (to be overridden with default).
                 else:
                     partial_time_dimension_specs.append(
                         PartialTimeDimensionSpec(
diff --git a/metricflow/specs/specs.py b/metricflow/specs/specs.py
index f065c0d693..81e1f68e23 100644
--- a/metricflow/specs/specs.py
+++ b/metricflow/specs/specs.py
@@ -327,6 +327,7 @@ def qualified_name(self) -> str:  # noqa: D
             entity_link_names=tuple(x.element_name for x in self.entity_links),
             element_name=self.element_name,
             time_granularity=self.time_granularity,
+            date_part=self.date_part,
         ).qualified_name
 
     @property
diff --git a/metricflow/sql/render/big_query.py b/metricflow/sql/render/big_query.py
index 9b55c6a28d..4dcb42aaa3 100644
--- a/metricflow/sql/render/big_query.py
+++ b/metricflow/sql/render/big_query.py
@@ -133,11 +133,11 @@ def visit_date_trunc_expr(self, node: SqlDateTruncExpression) -> SqlExpressionRe
     @override
     def render_date_part(self, date_part: DatePart) -> str:
         if date_part == DatePart.DOY:
-            return "DAYOFYEAR"
+            return "dayofyear"
         if date_part == DatePart.DOW:
-            return "DAYOFWEEK"
+            return "dayofweek"
         if date_part == DatePart.WEEK:
-            return "ISOWEEK"
+            return "isoweek"
 
         return super().render_date_part(date_part)
 
diff --git a/metricflow/test/integration/test_cases/itest_metrics.yaml b/metricflow/test/integration/test_cases/itest_metrics.yaml
index 20c0f302d4..bc3b0ec79e 100644
--- a/metricflow/test/integration/test_cases/itest_metrics.yaml
+++ b/metricflow/test/integration/test_cases/itest_metrics.yaml
@@ -1104,3 +1104,16 @@ integration_test:
     ) b
     ON {{ render_date_sub("a", "ds", 5, TimeGranularity.DAY) }} = b.metric_time__day
     GROUP BY metric_time__extract_month
+---
+integration_test:
+  name: date_part_overrides_granularity
+  description: Test query using date_part with incompatible granularity; should override granularity
+  model: SIMPLE_MODEL
+  metrics: ["bookings"]
+  group_by_objs: [{"name": "metric_time", "grain": "month", "date_part": "dow"}]
+  check_query: |
+    SELECT
+      SUM(1) AS bookings
+      , {{ render_extract("ds", DatePart.DOW) }} AS metric_time__extract_dow
+    FROM {{ source_schema }}.fct_bookings
+    GROUP BY {{ render_extract("ds", DatePart.DOW) }};
diff --git a/metricflow/test/integration/test_configured_cases.py b/metricflow/test/integration/test_configured_cases.py
index 46dd07e2a3..28bfc0112c 100644
--- a/metricflow/test/integration/test_configured_cases.py
+++ b/metricflow/test/integration/test_configured_cases.py
@@ -259,8 +259,11 @@ def test_case(
     for group_by_kwargs in case.group_by_objs:
         kwargs = copy(group_by_kwargs)
         date_part = kwargs.get("date_part")
+        grain = kwargs.get("grain")
         if date_part:
             kwargs["date_part"] = DatePart(date_part)
+        if grain:
+            kwargs["grain"] = TimeGranularity(grain)
         group_by.append(MockQueryParameter(**kwargs))
     query_result = engine.query(
         MetricFlowQueryRequest.create_with_random_request_id(
diff --git a/metricflow/test/plan_conversion/test_dataflow_to_sql_plan.py b/metricflow/test/plan_conversion/test_dataflow_to_sql_plan.py
index 0bb3ded01d..a09a5efe73 100644
--- a/metricflow/test/plan_conversion/test_dataflow_to_sql_plan.py
+++ b/metricflow/test/plan_conversion/test_dataflow_to_sql_plan.py
@@ -57,6 +57,7 @@
 from metricflow.test.snapshot_utils import assert_plan_snapshot_text_equal
 from metricflow.test.sql.compare_sql_plan import assert_rendered_sql_from_plan_equal, assert_sql_plan_text_equal
 from metricflow.test.time.metric_time_dimension import MTD_SPEC_DAY, MTD_SPEC_QUARTER, MTD_SPEC_WEEK, MTD_SPEC_YEAR
+from metricflow.time.date_part import DatePart
 
 
 @pytest.fixture(scope="session")
@@ -1858,3 +1859,84 @@ def test_derived_offset_cumulative_metric(  # noqa: D
         sql_client=sql_client,
         node=dataflow_plan.sink_output_nodes[0].parent_node,
     )
+
+
+def test_simple_query_with_date_part(  # noqa: D
+    request: FixtureRequest,
+    mf_test_session_state: MetricFlowTestSessionState,
+    dataflow_plan_builder: DataflowPlanBuilder[SemanticModelDataSet],
+    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter[SemanticModelDataSet],
+    sql_client: SqlClient,
+) -> None:
+    dataflow_plan = dataflow_plan_builder.build_plan(
+        MetricFlowQuerySpec(
+            metric_specs=(MetricSpec(element_name="bookings"),),
+            time_dimension_specs=(
+                DataSet.metric_time_dimension_spec(time_granularity=TimeGranularity.DAY, date_part=DatePart.DOW),
+            ),
+        )
+    )
+
+    convert_and_check(
+        request=request,
+        mf_test_session_state=mf_test_session_state,
+        dataflow_to_sql_converter=dataflow_to_sql_converter,
+        sql_client=sql_client,
+        node=dataflow_plan.sink_output_nodes[0].parent_node,
+    )
+
+
+def test_simple_query_with_multiple_date_parts(  # noqa: D
+    request: FixtureRequest,
+    mf_test_session_state: MetricFlowTestSessionState,
+    dataflow_plan_builder: DataflowPlanBuilder[SemanticModelDataSet],
+    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter[SemanticModelDataSet],
+    sql_client: SqlClient,
+) -> None:
+    dataflow_plan = dataflow_plan_builder.build_plan(
+        MetricFlowQuerySpec(
+            metric_specs=(MetricSpec(element_name="bookings"),),
+            time_dimension_specs=(
+                DataSet.metric_time_dimension_spec(time_granularity=TimeGranularity.DAY, date_part=DatePart.DAY),
+                DataSet.metric_time_dimension_spec(time_granularity=TimeGranularity.DAY, date_part=DatePart.DOW),
+                DataSet.metric_time_dimension_spec(time_granularity=TimeGranularity.DAY, date_part=DatePart.DOY),
+                DataSet.metric_time_dimension_spec(time_granularity=TimeGranularity.DAY, date_part=DatePart.WEEK),
+                DataSet.metric_time_dimension_spec(time_granularity=TimeGranularity.DAY, date_part=DatePart.MONTH),
+                DataSet.metric_time_dimension_spec(time_granularity=TimeGranularity.DAY, date_part=DatePart.QUARTER),
+                DataSet.metric_time_dimension_spec(time_granularity=TimeGranularity.DAY, date_part=DatePart.YEAR),
+            ),
+        )
+    )
+
+    convert_and_check(
+        request=request,
+        mf_test_session_state=mf_test_session_state,
+        dataflow_to_sql_converter=dataflow_to_sql_converter,
+        sql_client=sql_client,
+        node=dataflow_plan.sink_output_nodes[0].parent_node,
+    )
+
+
+def test_offset_window_with_date_part(  # noqa: D
+    request: FixtureRequest,
+    mf_test_session_state: MetricFlowTestSessionState,
+    dataflow_plan_builder: DataflowPlanBuilder[SemanticModelDataSet],
+    dataflow_to_sql_converter: DataflowToSqlQueryPlanConverter[SemanticModelDataSet],
+    sql_client: SqlClient,
+) -> None:
+    dataflow_plan = dataflow_plan_builder.build_plan(
+        MetricFlowQuerySpec(
+            metric_specs=(MetricSpec(element_name="bookings_growth_2_weeks"),),
+            time_dimension_specs=(
+                DataSet.metric_time_dimension_spec(time_granularity=TimeGranularity.DAY, date_part=DatePart.DOW),
+            ),
+        )
+    )
+
+    convert_and_check(
+        request=request,
+        mf_test_session_state=mf_test_session_state,
+        dataflow_to_sql_converter=dataflow_to_sql_converter,
+        sql_client=sql_client,
+        node=dataflow_plan.sink_output_nodes[0].parent_node,
+    )
diff --git a/metricflow/test/query/test_query_parser.py b/metricflow/test/query/test_query_parser.py
index 2bba217baf..b1926067b7 100644
--- a/metricflow/test/query/test_query_parser.py
+++ b/metricflow/test/query/test_query_parser.py
@@ -136,6 +136,18 @@
           - name: revenue
             offset_window: 14 days
             alias: revenue_2_weeks_ago
+    ---
+    metric:
+      name: revenue_since_start_of_year
+      description: Revenue since start of year
+      type: derived
+      type_params:
+        expr: revenue - revenue_start_of_year
+        metrics:
+          - name: revenue
+          - name: revenue
+            offset_to_grain: year
+            alias: revenue_start_of_year
     """
 )
 
@@ -405,13 +417,6 @@ def test_date_part_parsing() -> None:
             group_by=[MockQueryParameter(name="metric_time", date_part=DatePart.DOW)],
         )
 
-    # Date part is incompatible with the requested time granularity for the same time dimension
-    with pytest.raises(RequestTimeGranularityException):
-        query_parser.parse_and_validate_query(
-            metric_names=["revenue"],
-            group_by=[MockQueryParameter(name="metric_time", grain=TimeGranularity.YEAR, date_part=DatePart.MONTH)],
-        )
-
     # Can't query date part for cumulative metrics
     with pytest.raises(UnableToSatisfyQueryError):
         query_parser.parse_and_validate_query(
@@ -419,8 +424,21 @@ def test_date_part_parsing() -> None:
             group_by=[MockQueryParameter(name="metric_time", date_part=DatePart.DOY)],
         )
 
+    # Can't query date part for metrics with offset to grain
+    with pytest.raises(UnableToSatisfyQueryError):
+        query_parser.parse_and_validate_query(
+            metric_names=["revenue_since_start_of_year"],
+            group_by=[MockQueryParameter(name="metric_time", date_part=DatePart.DAY)],
+        )
+
     # Date part is compatible
     query_parser.parse_and_validate_query(
         metric_names=["revenue"],
         group_by=[MockQueryParameter(name="metric_time", date_part=DatePart.MONTH)],
     )
+
+    # Incompatible granularity gets overriden
+    query_parser.parse_and_validate_query(
+        metric_names=["revenue"],
+        group_by=[MockQueryParameter(name="metric_time", grain=TimeGranularity.YEAR, date_part=DatePart.MONTH)],
+    )
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
index f00e2be64e..95c23db647 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_query_semantic_model__plan0.sql
@@ -9,10 +9,10 @@ SELECT
   , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
   , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
   , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
-  , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+  , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS ds__extract_week
   , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+  , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS ds__extract_dow
+  , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS ds__extract_doy
   , revenue_src_10006.created_at AS company__ds__day
   , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
   , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
@@ -21,10 +21,10 @@ SELECT
   , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
   , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
   , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
-  , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+  , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS company__ds__extract_week
   , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+  , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+  , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS company__ds__extract_doy
   , revenue_src_10006.user_id AS user
   , revenue_src_10006.user_id AS company__user
 FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
index b6a752aa1c..21f374f1fe 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_with_measures__plan0.sql
@@ -9,10 +9,10 @@ SELECT
   , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
   , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
   , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
-  , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+  , EXTRACT(isoweek FROM id_verifications_src_10003.ds) AS ds__extract_week
   , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_doy
+  , EXTRACT(dayofweek FROM id_verifications_src_10003.ds) AS ds__extract_dow
+  , EXTRACT(dayofyear FROM id_verifications_src_10003.ds) AS ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, month) AS ds_partitioned__month
@@ -21,10 +21,10 @@ SELECT
   , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
   , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
   , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(isoweek FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
   , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
+  , EXTRACT(dayofweek FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(dayofyear FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type
   , id_verifications_src_10003.ds AS verification__ds__day
   , DATE_TRUNC(id_verifications_src_10003.ds, isoweek) AS verification__ds__week
@@ -34,10 +34,10 @@ SELECT
   , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
   , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
   , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-  , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+  , EXTRACT(isoweek FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
   , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
+  , EXTRACT(dayofweek FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+  , EXTRACT(dayofyear FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
   , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, isoweek) AS verification__ds_partitioned__week
   , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, month) AS verification__ds_partitioned__month
@@ -46,10 +46,10 @@ SELECT
   , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
   , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
   , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-  , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+  , EXTRACT(isoweek FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
   , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
+  , EXTRACT(dayofweek FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+  , EXTRACT(dayofyear FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
   , id_verifications_src_10003.verification_type AS verification__verification_type
   , id_verifications_src_10003.verification_id AS verification
   , id_verifications_src_10003.user_id AS user
diff --git a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
index c698caae42..abec542070 100644
--- a/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
+++ b/metricflow/test/snapshots/test_convert_semantic_model.py/SqlQueryPlan/BigQuery/test_convert_table_semantic_model_without_measures__plan0.sql
@@ -8,10 +8,10 @@ SELECT
   , EXTRACT(year FROM users_latest_src_10008.ds) AS ds__extract_year
   , EXTRACT(quarter FROM users_latest_src_10008.ds) AS ds__extract_quarter
   , EXTRACT(month FROM users_latest_src_10008.ds) AS ds__extract_month
-  , EXTRACT(ISOWEEK FROM users_latest_src_10008.ds) AS ds__extract_week
+  , EXTRACT(isoweek FROM users_latest_src_10008.ds) AS ds__extract_week
   , EXTRACT(day FROM users_latest_src_10008.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS ds__extract_doy
+  , EXTRACT(dayofweek FROM users_latest_src_10008.ds) AS ds__extract_dow
+  , EXTRACT(dayofyear FROM users_latest_src_10008.ds) AS ds__extract_doy
   , users_latest_src_10008.home_state_latest
   , users_latest_src_10008.ds AS user__ds__day
   , DATE_TRUNC(users_latest_src_10008.ds, isoweek) AS user__ds__week
@@ -21,10 +21,10 @@ SELECT
   , EXTRACT(year FROM users_latest_src_10008.ds) AS user__ds__extract_year
   , EXTRACT(quarter FROM users_latest_src_10008.ds) AS user__ds__extract_quarter
   , EXTRACT(month FROM users_latest_src_10008.ds) AS user__ds__extract_month
-  , EXTRACT(ISOWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_week
+  , EXTRACT(isoweek FROM users_latest_src_10008.ds) AS user__ds__extract_week
   , EXTRACT(day FROM users_latest_src_10008.ds) AS user__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM users_latest_src_10008.ds) AS user__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM users_latest_src_10008.ds) AS user__ds__extract_doy
+  , EXTRACT(dayofweek FROM users_latest_src_10008.ds) AS user__ds__extract_dow
+  , EXTRACT(dayofyear FROM users_latest_src_10008.ds) AS user__ds__extract_doy
   , users_latest_src_10008.home_state_latest AS user__home_state_latest
   , users_latest_src_10008.user_id AS user
 FROM ***************************.dim_users_latest users_latest_src_10008
diff --git a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
index 4b1abcc4e0..108556d708 100644
--- a/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
+++ b/metricflow/test/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_multihop_join_plan__dfp_0.xml
@@ -138,37 +138,37 @@
                                     <!--   SemanticModelDataSet(SemanticModelReference(semantic_model_name='bridge_table'))  -->
                                 </ReadSqlSourceNode>
                                 <FilterElementsNode>
-                                    <!-- description =                                 -->
-                                    <!--   Pass Only Elements:                         -->
-                                    <!--     ['customer_name',                         -->
-                                    <!--      'customer_atomic_weight',                -->
-                                    <!--      'customer_id__customer_name',            -->
-                                    <!--      'customer_id__customer_atomic_weight',   -->
-                                    <!--      'ds_partitioned__day',                   -->
-                                    <!--      'ds_partitioned__week',                  -->
-                                    <!--      'ds_partitioned__month',                 -->
-                                    <!--      'ds_partitioned__quarter',               -->
-                                    <!--      'ds_partitioned__year',                  -->
-                                    <!--      'ds_partitioned__day',                   -->
-                                    <!--      'ds_partitioned__day',                   -->
-                                    <!--      'ds_partitioned__day',                   -->
-                                    <!--      'ds_partitioned__day',                   -->
-                                    <!--      'ds_partitioned__day',                   -->
-                                    <!--      'ds_partitioned__day',                   -->
-                                    <!--      'ds_partitioned__day',                   -->
-                                    <!--      'customer_id__ds_partitioned__day',      -->
-                                    <!--      'customer_id__ds_partitioned__week',     -->
-                                    <!--      'customer_id__ds_partitioned__month',    -->
-                                    <!--      'customer_id__ds_partitioned__quarter',  -->
-                                    <!--      'customer_id__ds_partitioned__year',     -->
-                                    <!--      'customer_id__ds_partitioned__day',      -->
-                                    <!--      'customer_id__ds_partitioned__day',      -->
-                                    <!--      'customer_id__ds_partitioned__day',      -->
-                                    <!--      'customer_id__ds_partitioned__day',      -->
-                                    <!--      'customer_id__ds_partitioned__day',      -->
-                                    <!--      'customer_id__ds_partitioned__day',      -->
-                                    <!--      'customer_id__ds_partitioned__day',      -->
-                                    <!--      'customer_id']                           -->
+                                    <!-- description =                                         -->
+                                    <!--   Pass Only Elements:                                 -->
+                                    <!--     ['customer_name',                                 -->
+                                    <!--      'customer_atomic_weight',                        -->
+                                    <!--      'customer_id__customer_name',                    -->
+                                    <!--      'customer_id__customer_atomic_weight',           -->
+                                    <!--      'ds_partitioned__day',                           -->
+                                    <!--      'ds_partitioned__week',                          -->
+                                    <!--      'ds_partitioned__month',                         -->
+                                    <!--      'ds_partitioned__quarter',                       -->
+                                    <!--      'ds_partitioned__year',                          -->
+                                    <!--      'ds_partitioned__extract_year',                  -->
+                                    <!--      'ds_partitioned__extract_quarter',               -->
+                                    <!--      'ds_partitioned__extract_month',                 -->
+                                    <!--      'ds_partitioned__extract_week',                  -->
+                                    <!--      'ds_partitioned__extract_day',                   -->
+                                    <!--      'ds_partitioned__extract_dow',                   -->
+                                    <!--      'ds_partitioned__extract_doy',                   -->
+                                    <!--      'customer_id__ds_partitioned__day',              -->
+                                    <!--      'customer_id__ds_partitioned__week',             -->
+                                    <!--      'customer_id__ds_partitioned__month',            -->
+                                    <!--      'customer_id__ds_partitioned__quarter',          -->
+                                    <!--      'customer_id__ds_partitioned__year',             -->
+                                    <!--      'customer_id__ds_partitioned__extract_year',     -->
+                                    <!--      'customer_id__ds_partitioned__extract_quarter',  -->
+                                    <!--      'customer_id__ds_partitioned__extract_month',    -->
+                                    <!--      'customer_id__ds_partitioned__extract_week',     -->
+                                    <!--      'customer_id__ds_partitioned__extract_day',      -->
+                                    <!--      'customer_id__ds_partitioned__extract_dow',      -->
+                                    <!--      'customer_id__ds_partitioned__extract_doy',      -->
+                                    <!--      'customer_id']                                   -->
                                     <!-- node_id = pfe_0 -->
                                     <!-- include_spec = DimensionSpec(element_name='customer_name', entity_links=()) -->
                                     <!-- include_spec =                                -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
index 8d272a50fc..eda032ff2f 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_common_semantic_model__plan0.sql
@@ -153,10 +153,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -165,10 +165,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -177,10 +177,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -190,10 +190,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -202,10 +202,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -214,10 +214,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -382,10 +382,10 @@ FULL OUTER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -394,10 +394,10 @@ FULL OUTER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -406,10 +406,10 @@ FULL OUTER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -419,10 +419,10 @@ FULL OUTER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -431,10 +431,10 @@ FULL OUTER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -443,10 +443,10 @@ FULL OUTER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql
index fdcc14c145..ed7c79b643 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node__plan0.sql
@@ -47,10 +47,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -59,10 +59,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -71,10 +71,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -84,10 +84,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -96,10 +96,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -108,10 +108,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -141,10 +141,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -153,10 +153,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -168,10 +168,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -180,10 +180,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
index a0d4381867..178465c7ed 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_multiple_semantic_models__plan0.sql
@@ -177,10 +177,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -189,10 +189,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -201,10 +201,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -214,10 +214,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -226,10 +226,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -238,10 +238,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -347,10 +347,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -359,10 +359,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -374,10 +374,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -386,10 +386,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -522,10 +522,10 @@ FROM (
                   , EXTRACT(year FROM views_source_src_10009.ds) AS ds__extract_year
                   , EXTRACT(quarter FROM views_source_src_10009.ds) AS ds__extract_quarter
                   , EXTRACT(month FROM views_source_src_10009.ds) AS ds__extract_month
-                  , EXTRACT(ISOWEEK FROM views_source_src_10009.ds) AS ds__extract_week
+                  , EXTRACT(isoweek FROM views_source_src_10009.ds) AS ds__extract_week
                   , EXTRACT(day FROM views_source_src_10009.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS ds__extract_doy
+                  , EXTRACT(dayofweek FROM views_source_src_10009.ds) AS ds__extract_dow
+                  , EXTRACT(dayofyear FROM views_source_src_10009.ds) AS ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, month) AS ds_partitioned__month
@@ -534,10 +534,10 @@ FROM (
                   , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_year
                   , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_quarter
                   , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM views_source_src_10009.ds_partitioned) AS ds_partitioned__extract_doy
                   , views_source_src_10009.ds AS view__ds__day
                   , DATE_TRUNC(views_source_src_10009.ds, isoweek) AS view__ds__week
                   , DATE_TRUNC(views_source_src_10009.ds, month) AS view__ds__month
@@ -546,10 +546,10 @@ FROM (
                   , EXTRACT(year FROM views_source_src_10009.ds) AS view__ds__extract_year
                   , EXTRACT(quarter FROM views_source_src_10009.ds) AS view__ds__extract_quarter
                   , EXTRACT(month FROM views_source_src_10009.ds) AS view__ds__extract_month
-                  , EXTRACT(ISOWEEK FROM views_source_src_10009.ds) AS view__ds__extract_week
+                  , EXTRACT(isoweek FROM views_source_src_10009.ds) AS view__ds__extract_week
                   , EXTRACT(day FROM views_source_src_10009.ds) AS view__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds) AS view__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds) AS view__ds__extract_doy
+                  , EXTRACT(dayofweek FROM views_source_src_10009.ds) AS view__ds__extract_dow
+                  , EXTRACT(dayofyear FROM views_source_src_10009.ds) AS view__ds__extract_doy
                   , views_source_src_10009.ds_partitioned AS view__ds_partitioned__day
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, isoweek) AS view__ds_partitioned__week
                   , DATE_TRUNC(views_source_src_10009.ds_partitioned, month) AS view__ds_partitioned__month
@@ -558,10 +558,10 @@ FROM (
                   , EXTRACT(year FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_year
                   , EXTRACT(quarter FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_quarter
                   , EXTRACT(month FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_week
                   , EXTRACT(day FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM views_source_src_10009.ds_partitioned) AS view__ds_partitioned__extract_doy
                   , views_source_src_10009.listing_id AS listing
                   , views_source_src_10009.user_id AS user
                   , views_source_src_10009.listing_id AS view__listing
@@ -665,10 +665,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -677,10 +677,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -692,10 +692,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -704,10 +704,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
index ad59db3e71..8969f7a6c0 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_ratio_from_single_semantic_model__plan0.sql
@@ -50,10 +50,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -62,10 +62,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -74,10 +74,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -87,10 +87,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -99,10 +99,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -111,10 +111,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -144,10 +144,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -156,10 +156,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -171,10 +171,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -183,10 +183,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
index 4d1af3e704..1ddd22d435 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_compute_metrics_node_simple_expr__plan0.sql
@@ -47,10 +47,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -59,10 +59,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -71,10 +71,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -84,10 +84,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -96,10 +96,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -108,10 +108,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
@@ -141,10 +141,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -153,10 +153,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -168,10 +168,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -180,10 +180,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql
index 539cd1c2ea..7e50393d6d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_constrain_time_range_node__plan0.sql
@@ -41,10 +41,10 @@ FROM (
         , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
         , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
         , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-        , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+        , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
         , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+        , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+        , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -53,10 +53,10 @@ FROM (
         , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
         , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
         , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-        , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+        , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
         , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+        , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+        , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS paid_at__day
         , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
         , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -65,10 +65,10 @@ FROM (
         , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
         , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
         , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-        , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+        , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
         , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+        , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+        , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
         , bookings_source_src_10001.is_instant AS booking__is_instant
         , bookings_source_src_10001.ds AS booking__ds__day
         , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -78,10 +78,10 @@ FROM (
         , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
         , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
         , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-        , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+        , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
         , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+        , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+        , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
         , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
         , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -90,10 +90,10 @@ FROM (
         , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
         , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
         , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-        , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+        , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
         , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+        , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+        , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
         , bookings_source_src_10001.paid_at AS booking__paid_at__day
         , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
         , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -102,10 +102,10 @@ FROM (
         , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
         , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
         , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-        , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+        , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
         , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-        , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-        , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+        , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+        , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
         , bookings_source_src_10001.listing_id AS listing
         , bookings_source_src_10001.guest_id AS guest
         , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
index c60a8f1013..bd9b392402 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric__plan0.sql
@@ -67,10 +67,10 @@ FROM (
           , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
           , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
           , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS ds__extract_week
           , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+          , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
@@ -79,10 +79,10 @@ FROM (
           , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
           , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
           , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS company__ds__extract_week
           , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+          , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
index c2e7e2ba3a..639e816eb6 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_grain_to_date__plan0.sql
@@ -67,10 +67,10 @@ FROM (
           , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
           , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
           , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS ds__extract_week
           , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+          , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
@@ -79,10 +79,10 @@ FROM (
           , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
           , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
           , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS company__ds__extract_week
           , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+          , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
index 5690d18f05..cd58d0ce0d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_ds__plan0.sql
@@ -64,10 +64,10 @@ FROM (
           , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
           , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
           , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS ds__extract_week
           , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+          , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
@@ -76,10 +76,10 @@ FROM (
           , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
           , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
           , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS company__ds__extract_week
           , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+          , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
index 958cb5faa4..35cc71b613 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window__plan0.sql
@@ -67,10 +67,10 @@ FROM (
           , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
           , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
           , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
-          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+          , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS ds__extract_week
           , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+          , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS ds__extract_doy
           , revenue_src_10006.created_at AS company__ds__day
           , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
           , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
@@ -79,10 +79,10 @@ FROM (
           , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
           , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
           , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
-          , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+          , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS company__ds__extract_week
           , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+          , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+          , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS company__ds__extract_doy
           , revenue_src_10006.user_id AS user
           , revenue_src_10006.user_id AS company__user
         FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
index 431635cda5..829e30ded9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_no_window_with_time_constraint__plan0.sql
@@ -109,10 +109,10 @@ FROM (
             , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
             , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
             , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS ds__extract_week
             , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+            , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
             , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
@@ -121,10 +121,10 @@ FROM (
             , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
             , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
             , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS company__ds__extract_week
             , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+            , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
index f16e293fe0..c8630b8f49 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_time_constraint__plan0.sql
@@ -109,10 +109,10 @@ FROM (
             , EXTRACT(year FROM revenue_src_10006.created_at) AS ds__extract_year
             , EXTRACT(quarter FROM revenue_src_10006.created_at) AS ds__extract_quarter
             , EXTRACT(month FROM revenue_src_10006.created_at) AS ds__extract_month
-            , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS ds__extract_week
+            , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS ds__extract_week
             , EXTRACT(day FROM revenue_src_10006.created_at) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS ds__extract_doy
+            , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS ds__extract_dow
+            , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS ds__extract_doy
             , revenue_src_10006.created_at AS company__ds__day
             , DATE_TRUNC(revenue_src_10006.created_at, isoweek) AS company__ds__week
             , DATE_TRUNC(revenue_src_10006.created_at, month) AS company__ds__month
@@ -121,10 +121,10 @@ FROM (
             , EXTRACT(year FROM revenue_src_10006.created_at) AS company__ds__extract_year
             , EXTRACT(quarter FROM revenue_src_10006.created_at) AS company__ds__extract_quarter
             , EXTRACT(month FROM revenue_src_10006.created_at) AS company__ds__extract_month
-            , EXTRACT(ISOWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_week
+            , EXTRACT(isoweek FROM revenue_src_10006.created_at) AS company__ds__extract_week
             , EXTRACT(day FROM revenue_src_10006.created_at) AS company__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM revenue_src_10006.created_at) AS company__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM revenue_src_10006.created_at) AS company__ds__extract_doy
+            , EXTRACT(dayofweek FROM revenue_src_10006.created_at) AS company__ds__extract_dow
+            , EXTRACT(dayofyear FROM revenue_src_10006.created_at) AS company__ds__extract_doy
             , revenue_src_10006.user_id AS user
             , revenue_src_10006.user_id AS company__user
           FROM ***************************.fct_revenue revenue_src_10006
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
index 2982019f1d..ffc899b824 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric__plan0.sql
@@ -158,10 +158,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -170,10 +170,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -182,10 +182,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -195,10 +195,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -207,10 +207,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -219,10 +219,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -387,10 +387,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -399,10 +399,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -411,10 +411,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -424,10 +424,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -436,10 +436,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -448,10 +448,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
index 9b40278672..2705007543 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -158,10 +158,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -170,10 +170,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -182,10 +182,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -195,10 +195,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -207,10 +207,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -219,10 +219,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -490,10 +490,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -502,10 +502,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -514,10 +514,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -527,10 +527,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -539,10 +539,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -551,10 +551,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 2ab4211e28..7d7c920907 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -158,10 +158,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -170,10 +170,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -182,10 +182,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -195,10 +195,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -207,10 +207,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -219,10 +219,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -490,10 +490,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -502,10 +502,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -514,10 +514,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -527,10 +527,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -539,10 +539,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -551,10 +551,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
index b344f149a4..62768ac034 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
@@ -158,10 +158,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -170,10 +170,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -182,10 +182,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -195,10 +195,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -207,10 +207,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -219,10 +219,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -490,10 +490,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -502,10 +502,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -514,10 +514,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -527,10 +527,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -539,10 +539,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -551,10 +551,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 8028b1f148..229acaf841 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -158,10 +158,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -170,10 +170,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -182,10 +182,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -195,10 +195,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -207,10 +207,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -219,10 +219,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -490,10 +490,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -502,10 +502,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -514,10 +514,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -527,10 +527,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -539,10 +539,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -551,10 +551,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 64d1c8125b..a4c8b503e4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -261,10 +261,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -273,10 +273,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -285,10 +285,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -298,10 +298,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -310,10 +310,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -322,10 +322,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -596,10 +596,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -608,10 +608,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -620,10 +620,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -633,10 +633,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -645,10 +645,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -657,10 +657,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 3bf4e0e3cd..9107fdbe8a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -261,10 +261,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -273,10 +273,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -285,10 +285,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -298,10 +298,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -310,10 +310,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -322,10 +322,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
@@ -597,10 +597,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -609,10 +609,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -621,10 +621,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -634,10 +634,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -646,10 +646,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -658,10 +658,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
index b6f236cde8..0d9742944b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
@@ -369,10 +369,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -381,10 +381,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -393,10 +393,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -406,10 +406,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -418,10 +418,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -430,10 +430,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 4d754919c2..13415b0ae2 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -255,10 +255,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -267,10 +267,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -279,10 +279,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -292,10 +292,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -304,10 +304,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -316,10 +316,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
index 9373149736..5c0e215038 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_distinct_values__plan0.sql
@@ -168,10 +168,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -180,10 +180,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -192,10 +192,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -205,10 +205,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -217,10 +217,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -229,10 +229,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -338,10 +338,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -350,10 +350,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -365,10 +365,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -377,10 +377,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql
index 84160306fc..12f6f6e38a 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_node__plan0.sql
@@ -28,10 +28,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -40,10 +40,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -52,10 +52,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -65,10 +65,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -77,10 +77,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -89,10 +89,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
index 74d3cae54a..d13bb8fafe 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_node__plan0.sql
@@ -34,10 +34,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -46,10 +46,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -58,10 +58,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -71,10 +71,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -83,10 +83,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -95,10 +95,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
index 0352822f08..a4205ece06 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_filter_with_where_constraint_on_join_dim__plan0.sql
@@ -174,10 +174,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -186,10 +186,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -198,10 +198,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -211,10 +211,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -223,10 +223,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -235,10 +235,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -344,10 +344,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                   , listings_latest_src_10004.created_at AS created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -356,10 +356,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                   , listings_latest_src_10004.country AS country_latest
                   , listings_latest_src_10004.is_lux AS is_lux_latest
                   , listings_latest_src_10004.capacity AS capacity_latest
@@ -371,10 +371,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                   , listings_latest_src_10004.created_at AS listing__created_at__day
                   , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                   , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -383,10 +383,10 @@ FROM (
                   , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
                   , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
                   , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                  , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                  , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
                   , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+                  , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                  , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                   , listings_latest_src_10004.country AS listing__country_latest
                   , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                   , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
index 1ebeb96fdf..1d933aaf04 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_scd_dimension__plan0.sql
@@ -162,10 +162,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10015.ds) AS ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10015.ds) AS ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10015.ds) AS ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS ds_partitioned__month
@@ -174,10 +174,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS paid_at__month
@@ -186,10 +186,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10015.is_instant AS booking__is_instant
                   , bookings_source_src_10015.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10015.ds, isoweek) AS booking__ds__week
@@ -199,10 +199,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -211,10 +211,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10015.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS booking__paid_at__month
@@ -223,10 +223,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10015.listing_id AS listing
                   , bookings_source_src_10015.guest_id AS guest
                   , bookings_source_src_10015.host_id AS host
@@ -258,10 +258,10 @@ FROM (
                 , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
                 , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
                 , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
-                , EXTRACT(ISOWEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+                , EXTRACT(isoweek FROM listings_src_10017.active_from) AS window_start__extract_week
                 , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dow
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_doy
+                , EXTRACT(dayofweek FROM listings_src_10017.active_from) AS window_start__extract_dow
+                , EXTRACT(dayofyear FROM listings_src_10017.active_from) AS window_start__extract_doy
                 , listings_src_10017.active_to AS window_end__day
                 , DATE_TRUNC(listings_src_10017.active_to, isoweek) AS window_end__week
                 , DATE_TRUNC(listings_src_10017.active_to, month) AS window_end__month
@@ -270,10 +270,10 @@ FROM (
                 , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
                 , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
                 , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
-                , EXTRACT(ISOWEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+                , EXTRACT(isoweek FROM listings_src_10017.active_to) AS window_end__extract_week
                 , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dow
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_doy
+                , EXTRACT(dayofweek FROM listings_src_10017.active_to) AS window_end__extract_dow
+                , EXTRACT(dayofyear FROM listings_src_10017.active_to) AS window_end__extract_doy
                 , listings_src_10017.country
                 , listings_src_10017.is_lux
                 , listings_src_10017.capacity
@@ -285,10 +285,10 @@ FROM (
                 , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
                 , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
                 , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-                , EXTRACT(ISOWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+                , EXTRACT(isoweek FROM listings_src_10017.active_from) AS listing__window_start__extract_week
                 , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
+                , EXTRACT(dayofweek FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+                , EXTRACT(dayofyear FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
                 , listings_src_10017.active_to AS listing__window_end__day
                 , DATE_TRUNC(listings_src_10017.active_to, isoweek) AS listing__window_end__week
                 , DATE_TRUNC(listings_src_10017.active_to, month) AS listing__window_end__month
@@ -297,10 +297,10 @@ FROM (
                 , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
                 , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
                 , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-                , EXTRACT(ISOWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+                , EXTRACT(isoweek FROM listings_src_10017.active_to) AS listing__window_end__extract_week
                 , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
-                , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
+                , EXTRACT(dayofweek FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+                , EXTRACT(dayofyear FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
                 , listings_src_10017.country AS listing__country
                 , listings_src_10017.is_lux AS listing__is_lux
                 , listings_src_10017.capacity AS listing__capacity
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
index f40b5933ab..fd5aaaa276 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_to_grain__plan0.sql
@@ -163,10 +163,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -175,10 +175,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -187,10 +187,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -200,10 +200,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -212,10 +212,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -224,10 +224,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
index bdb3b55b6b..438ffdddad 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_with_offset_window__plan0.sql
@@ -163,10 +163,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -175,10 +175,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -187,10 +187,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -200,10 +200,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -212,10 +212,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -224,10 +224,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
index f0523526b9..919c372968 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_join_to_time_spine_node_without_offset__plan0.sql
@@ -163,10 +163,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -175,10 +175,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -187,10 +187,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -200,10 +200,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -212,10 +212,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -224,10 +224,10 @@ INNER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
index 8aac1294f0..9bedbf14e2 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_limit_rows__plan0.sql
@@ -152,10 +152,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -164,10 +164,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -176,10 +176,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -189,10 +189,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -201,10 +201,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -213,10 +213,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
index bc42027f9e..5ee683c896 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_local_dimension_using_local_entity__plan0.sql
@@ -102,10 +102,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
           , listings_latest_src_10004.created_at AS created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -114,10 +114,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
           , listings_latest_src_10004.country AS country_latest
           , listings_latest_src_10004.is_lux AS is_lux_latest
           , listings_latest_src_10004.capacity AS capacity_latest
@@ -129,10 +129,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
           , listings_latest_src_10004.created_at AS listing__created_at__day
           , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
           , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -141,10 +141,10 @@ FROM (
           , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
           , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
           , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-          , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+          , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
           , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+          , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+          , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
           , listings_latest_src_10004.country AS listing__country_latest
           , listings_latest_src_10004.is_lux AS listing__is_lux_latest
           , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql
index 7cffe26a94..ff2afccd69 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_aggregation_node__plan0.sql
@@ -38,10 +38,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -50,10 +50,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -62,10 +62,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -75,10 +75,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -87,10 +87,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -99,10 +99,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
index 451625b47c..77cede8ad4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint__plan0.sql
@@ -186,10 +186,10 @@ FROM (
                       , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                       , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                       , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                       , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -198,10 +198,10 @@ FROM (
                       , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                       , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                       , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                       , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -210,10 +210,10 @@ FROM (
                       , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                       , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                       , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                       , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                      , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -223,10 +223,10 @@ FROM (
                       , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                       , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                       , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                       , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -235,10 +235,10 @@ FROM (
                       , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                       , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                       , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                       , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -247,10 +247,10 @@ FROM (
                       , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                       , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                       , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                       , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                      , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -356,10 +356,10 @@ FROM (
                       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
                       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
                       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
                       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+                      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -368,10 +368,10 @@ FROM (
                       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
                       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
                       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
                       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+                      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -383,10 +383,10 @@ FROM (
                       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
                       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
                       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
                       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+                      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -395,10 +395,10 @@ FROM (
                       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
                       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
                       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
                       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+                      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -597,10 +597,10 @@ FROM (
                       , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                       , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                       , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                      , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                       , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -609,10 +609,10 @@ FROM (
                       , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                       , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                       , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                      , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                       , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS paid_at__day
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -621,10 +621,10 @@ FROM (
                       , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                       , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                       , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                      , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                       , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                      , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                      , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                       , bookings_source_src_10001.is_instant AS booking__is_instant
                       , bookings_source_src_10001.ds AS booking__ds__day
                       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -634,10 +634,10 @@ FROM (
                       , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                       , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                       , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                      , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                       , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -646,10 +646,10 @@ FROM (
                       , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                       , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                       , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                      , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                       , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                       , bookings_source_src_10001.paid_at AS booking__paid_at__day
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -658,10 +658,10 @@ FROM (
                       , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                       , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                       , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                      , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                       , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                      , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                      , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                       , bookings_source_src_10001.listing_id AS listing
                       , bookings_source_src_10001.guest_id AS guest
                       , bookings_source_src_10001.host_id AS host
@@ -767,10 +767,10 @@ FROM (
                       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
                       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
                       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+                      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
                       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+                      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+                      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
                       , listings_latest_src_10004.created_at AS created_at__day
                       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -779,10 +779,10 @@ FROM (
                       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
                       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
                       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+                      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
                       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+                      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+                      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
                       , listings_latest_src_10004.country AS country_latest
                       , listings_latest_src_10004.is_lux AS is_lux_latest
                       , listings_latest_src_10004.capacity AS capacity_latest
@@ -794,10 +794,10 @@ FROM (
                       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
                       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
                       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+                      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
                       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+                      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+                      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
                       , listings_latest_src_10004.created_at AS listing__created_at__day
                       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
                       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -806,10 +806,10 @@ FROM (
                       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
                       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
                       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-                      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+                      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
                       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-                      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-                      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+                      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+                      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
                       , listings_latest_src_10004.country AS listing__country_latest
                       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
                       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -991,10 +991,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -1003,10 +1003,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -1015,10 +1015,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -1028,10 +1028,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -1040,10 +1040,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -1052,10 +1052,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
index 74ac44eb4b..2431233751 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_reused_measure__plan0.sql
@@ -171,10 +171,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -183,10 +183,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -195,10 +195,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -208,10 +208,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -220,10 +220,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -232,10 +232,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -403,10 +403,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -415,10 +415,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -427,10 +427,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -440,10 +440,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -452,10 +452,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -464,10 +464,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
index 6afff7eaab..c9052ccd01 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_measure_constraint_with_single_expr_and_alias__plan0.sql
@@ -165,10 +165,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -177,10 +177,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -189,10 +189,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                 , bookings_source_src_10001.is_instant AS booking__is_instant
                 , bookings_source_src_10001.ds AS booking__ds__day
                 , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -202,10 +202,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                 , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                 , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -214,10 +214,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                 , bookings_source_src_10001.paid_at AS booking__paid_at__day
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                 , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -226,10 +226,10 @@ FROM (
                 , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                 , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                 , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                 , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                 , bookings_source_src_10001.listing_id AS listing
                 , bookings_source_src_10001.guest_id AS guest
                 , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
index e0d87aa819..78bc20baf3 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_metric_with_measures_from_multiple_sources_no_dimensions__plan0.sql
@@ -153,10 +153,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -165,10 +165,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -177,10 +177,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -190,10 +190,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -202,10 +202,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -214,10 +214,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -332,10 +332,10 @@ FROM (
               , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
               , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
               , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
               , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -344,10 +344,10 @@ FROM (
               , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
               , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
               , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
               , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+              , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -359,10 +359,10 @@ FROM (
               , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
               , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
               , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
               , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+              , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -371,10 +371,10 @@ FROM (
               , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
               , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
               , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
               , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+              , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
index ba0780ad72..fa17fe59fa 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_through_scd_dimension__plan0.sql
@@ -152,10 +152,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10015.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS ds_partitioned__month
@@ -164,10 +164,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS paid_at__month
@@ -176,10 +176,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10015.ds, isoweek) AS booking__ds__week
@@ -189,10 +189,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -201,10 +201,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS booking__paid_at__month
@@ -213,10 +213,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -321,10 +321,10 @@ FROM (
               , EXTRACT(year FROM listings_src_10017.active_from) AS window_start__extract_year
               , EXTRACT(quarter FROM listings_src_10017.active_from) AS window_start__extract_quarter
               , EXTRACT(month FROM listings_src_10017.active_from) AS window_start__extract_month
-              , EXTRACT(ISOWEEK FROM listings_src_10017.active_from) AS window_start__extract_week
+              , EXTRACT(isoweek FROM listings_src_10017.active_from) AS window_start__extract_week
               , EXTRACT(day FROM listings_src_10017.active_from) AS window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS window_start__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS window_start__extract_doy
+              , EXTRACT(dayofweek FROM listings_src_10017.active_from) AS window_start__extract_dow
+              , EXTRACT(dayofyear FROM listings_src_10017.active_from) AS window_start__extract_doy
               , listings_src_10017.active_to AS window_end__day
               , DATE_TRUNC(listings_src_10017.active_to, isoweek) AS window_end__week
               , DATE_TRUNC(listings_src_10017.active_to, month) AS window_end__month
@@ -333,10 +333,10 @@ FROM (
               , EXTRACT(year FROM listings_src_10017.active_to) AS window_end__extract_year
               , EXTRACT(quarter FROM listings_src_10017.active_to) AS window_end__extract_quarter
               , EXTRACT(month FROM listings_src_10017.active_to) AS window_end__extract_month
-              , EXTRACT(ISOWEEK FROM listings_src_10017.active_to) AS window_end__extract_week
+              , EXTRACT(isoweek FROM listings_src_10017.active_to) AS window_end__extract_week
               , EXTRACT(day FROM listings_src_10017.active_to) AS window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS window_end__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS window_end__extract_doy
+              , EXTRACT(dayofweek FROM listings_src_10017.active_to) AS window_end__extract_dow
+              , EXTRACT(dayofyear FROM listings_src_10017.active_to) AS window_end__extract_doy
               , listings_src_10017.country
               , listings_src_10017.is_lux
               , listings_src_10017.capacity
@@ -348,10 +348,10 @@ FROM (
               , EXTRACT(year FROM listings_src_10017.active_from) AS listing__window_start__extract_year
               , EXTRACT(quarter FROM listings_src_10017.active_from) AS listing__window_start__extract_quarter
               , EXTRACT(month FROM listings_src_10017.active_from) AS listing__window_start__extract_month
-              , EXTRACT(ISOWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_week
+              , EXTRACT(isoweek FROM listings_src_10017.active_from) AS listing__window_start__extract_week
               , EXTRACT(day FROM listings_src_10017.active_from) AS listing__window_start__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
+              , EXTRACT(dayofweek FROM listings_src_10017.active_from) AS listing__window_start__extract_dow
+              , EXTRACT(dayofyear FROM listings_src_10017.active_from) AS listing__window_start__extract_doy
               , listings_src_10017.active_to AS listing__window_end__day
               , DATE_TRUNC(listings_src_10017.active_to, isoweek) AS listing__window_end__week
               , DATE_TRUNC(listings_src_10017.active_to, month) AS listing__window_end__month
@@ -360,10 +360,10 @@ FROM (
               , EXTRACT(year FROM listings_src_10017.active_to) AS listing__window_end__extract_year
               , EXTRACT(quarter FROM listings_src_10017.active_to) AS listing__window_end__extract_quarter
               , EXTRACT(month FROM listings_src_10017.active_to) AS listing__window_end__extract_month
-              , EXTRACT(ISOWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_week
+              , EXTRACT(isoweek FROM listings_src_10017.active_to) AS listing__window_end__extract_week
               , EXTRACT(day FROM listings_src_10017.active_to) AS listing__window_end__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
+              , EXTRACT(dayofweek FROM listings_src_10017.active_to) AS listing__window_end__extract_dow
+              , EXTRACT(dayofyear FROM listings_src_10017.active_to) AS listing__window_end__extract_doy
               , listings_src_10017.country AS listing__country
               , listings_src_10017.is_lux AS listing__is_lux
               , listings_src_10017.capacity AS listing__capacity
@@ -381,25 +381,25 @@ FROM (
             --    'ds__month',
             --    'ds__quarter',
             --    'ds__year',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
+            --    'ds__extract_year',
+            --    'ds__extract_quarter',
+            --    'ds__extract_month',
+            --    'ds__extract_week',
+            --    'ds__extract_day',
+            --    'ds__extract_dow',
+            --    'ds__extract_doy',
             --    'user__ds__day',
             --    'user__ds__week',
             --    'user__ds__month',
             --    'user__ds__quarter',
             --    'user__ds__year',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
+            --    'user__ds__extract_year',
+            --    'user__ds__extract_quarter',
+            --    'user__ds__extract_month',
+            --    'user__ds__extract_week',
+            --    'user__ds__extract_day',
+            --    'user__ds__extract_dow',
+            --    'user__ds__extract_doy',
             --    'user']
             SELECT
               subq_4.ds__day
@@ -440,10 +440,10 @@ FROM (
                 , EXTRACT(year FROM users_latest_src_10021.ds) AS ds__extract_year
                 , EXTRACT(quarter FROM users_latest_src_10021.ds) AS ds__extract_quarter
                 , EXTRACT(month FROM users_latest_src_10021.ds) AS ds__extract_month
-                , EXTRACT(ISOWEEK FROM users_latest_src_10021.ds) AS ds__extract_week
+                , EXTRACT(isoweek FROM users_latest_src_10021.ds) AS ds__extract_week
                 , EXTRACT(day FROM users_latest_src_10021.ds) AS ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS ds__extract_doy
+                , EXTRACT(dayofweek FROM users_latest_src_10021.ds) AS ds__extract_dow
+                , EXTRACT(dayofyear FROM users_latest_src_10021.ds) AS ds__extract_doy
                 , users_latest_src_10021.home_state_latest
                 , users_latest_src_10021.ds AS user__ds__day
                 , DATE_TRUNC(users_latest_src_10021.ds, isoweek) AS user__ds__week
@@ -453,10 +453,10 @@ FROM (
                 , EXTRACT(year FROM users_latest_src_10021.ds) AS user__ds__extract_year
                 , EXTRACT(quarter FROM users_latest_src_10021.ds) AS user__ds__extract_quarter
                 , EXTRACT(month FROM users_latest_src_10021.ds) AS user__ds__extract_month
-                , EXTRACT(ISOWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_week
+                , EXTRACT(isoweek FROM users_latest_src_10021.ds) AS user__ds__extract_week
                 , EXTRACT(day FROM users_latest_src_10021.ds) AS user__ds__extract_day
-                , EXTRACT(DAYOFWEEK FROM users_latest_src_10021.ds) AS user__ds__extract_dow
-                , EXTRACT(DAYOFYEAR FROM users_latest_src_10021.ds) AS user__ds__extract_doy
+                , EXTRACT(dayofweek FROM users_latest_src_10021.ds) AS user__ds__extract_dow
+                , EXTRACT(dayofyear FROM users_latest_src_10021.ds) AS user__ds__extract_doy
                 , users_latest_src_10021.home_state_latest AS user__home_state_latest
                 , users_latest_src_10021.user_id AS user
               FROM ***************************.dim_users_latest users_latest_src_10021
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
index 62d24b00ba..eb008dd112 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_hop_to_scd_dimension__plan0.sql
@@ -152,10 +152,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10015.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10015.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10015.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10015.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10015.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10015.ds) AS ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS ds_partitioned__month
@@ -164,10 +164,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10015.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS paid_at__month
@@ -176,10 +176,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10015.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10015.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10015.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10015.is_instant AS booking__is_instant
               , bookings_source_src_10015.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10015.ds, isoweek) AS booking__ds__week
@@ -189,10 +189,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10015.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10015.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10015.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10015.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10015.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10015.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10015.ds) AS booking__ds__extract_doy
               , bookings_source_src_10015.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10015.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -201,10 +201,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10015.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10015.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10015.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10015.paid_at, month) AS booking__paid_at__month
@@ -213,10 +213,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10015.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10015.listing_id AS listing
               , bookings_source_src_10015.guest_id AS guest
               , bookings_source_src_10015.host_id AS host
@@ -288,49 +288,49 @@ FROM (
             --    'window_start__month',
             --    'window_start__quarter',
             --    'window_start__year',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
+            --    'window_start__extract_year',
+            --    'window_start__extract_quarter',
+            --    'window_start__extract_month',
+            --    'window_start__extract_week',
+            --    'window_start__extract_day',
+            --    'window_start__extract_dow',
+            --    'window_start__extract_doy',
             --    'window_end__day',
             --    'window_end__week',
             --    'window_end__month',
             --    'window_end__quarter',
             --    'window_end__year',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
+            --    'window_end__extract_year',
+            --    'window_end__extract_quarter',
+            --    'window_end__extract_month',
+            --    'window_end__extract_week',
+            --    'window_end__extract_day',
+            --    'window_end__extract_dow',
+            --    'window_end__extract_doy',
             --    'lux_listing__window_start__day',
             --    'lux_listing__window_start__week',
             --    'lux_listing__window_start__month',
             --    'lux_listing__window_start__quarter',
             --    'lux_listing__window_start__year',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__extract_year',
+            --    'lux_listing__window_start__extract_quarter',
+            --    'lux_listing__window_start__extract_month',
+            --    'lux_listing__window_start__extract_week',
+            --    'lux_listing__window_start__extract_day',
+            --    'lux_listing__window_start__extract_dow',
+            --    'lux_listing__window_start__extract_doy',
             --    'lux_listing__window_end__day',
             --    'lux_listing__window_end__week',
             --    'lux_listing__window_end__month',
             --    'lux_listing__window_end__quarter',
             --    'lux_listing__window_end__year',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__extract_year',
+            --    'lux_listing__window_end__extract_quarter',
+            --    'lux_listing__window_end__extract_month',
+            --    'lux_listing__window_end__extract_week',
+            --    'lux_listing__window_end__extract_day',
+            --    'lux_listing__window_end__extract_dow',
+            --    'lux_listing__window_end__extract_doy',
             --    'lux_listing']
             SELECT
               subq_4.window_start__day
@@ -395,10 +395,10 @@ FROM (
                 , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS window_start__extract_year
                 , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS window_start__extract_quarter
                 , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS window_start__extract_month
-                , EXTRACT(ISOWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
+                , EXTRACT(isoweek FROM lux_listings_src_10019.valid_from) AS window_start__extract_week
                 , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS window_start__extract_dow
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS window_start__extract_doy
+                , EXTRACT(dayofweek FROM lux_listings_src_10019.valid_from) AS window_start__extract_dow
+                , EXTRACT(dayofyear FROM lux_listings_src_10019.valid_from) AS window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS window_end__day
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, isoweek) AS window_end__week
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, month) AS window_end__month
@@ -407,10 +407,10 @@ FROM (
                 , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS window_end__extract_year
                 , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS window_end__extract_quarter
                 , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS window_end__extract_month
-                , EXTRACT(ISOWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
+                , EXTRACT(isoweek FROM lux_listings_src_10019.valid_to) AS window_end__extract_week
                 , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS window_end__extract_dow
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS window_end__extract_doy
+                , EXTRACT(dayofweek FROM lux_listings_src_10019.valid_to) AS window_end__extract_dow
+                , EXTRACT(dayofyear FROM lux_listings_src_10019.valid_to) AS window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux
                 , lux_listings_src_10019.valid_from AS lux_listing__window_start__day
                 , DATE_TRUNC(lux_listings_src_10019.valid_from, isoweek) AS lux_listing__window_start__week
@@ -420,10 +420,10 @@ FROM (
                 , EXTRACT(year FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_year
                 , EXTRACT(quarter FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_quarter
                 , EXTRACT(month FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_month
-                , EXTRACT(ISOWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
+                , EXTRACT(isoweek FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_week
                 , EXTRACT(day FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dow
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_doy
+                , EXTRACT(dayofweek FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_dow
+                , EXTRACT(dayofyear FROM lux_listings_src_10019.valid_from) AS lux_listing__window_start__extract_doy
                 , lux_listings_src_10019.valid_to AS lux_listing__window_end__day
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, isoweek) AS lux_listing__window_end__week
                 , DATE_TRUNC(lux_listings_src_10019.valid_to, month) AS lux_listing__window_end__month
@@ -432,10 +432,10 @@ FROM (
                 , EXTRACT(year FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_year
                 , EXTRACT(quarter FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_quarter
                 , EXTRACT(month FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_month
-                , EXTRACT(ISOWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
+                , EXTRACT(isoweek FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_week
                 , EXTRACT(day FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_day
-                , EXTRACT(DAYOFWEEK FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dow
-                , EXTRACT(DAYOFYEAR FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_doy
+                , EXTRACT(dayofweek FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_dow
+                , EXTRACT(dayofyear FROM lux_listings_src_10019.valid_to) AS lux_listing__window_end__extract_doy
                 , lux_listings_src_10019.is_confirmed_lux AS lux_listing__is_confirmed_lux
                 , lux_listings_src_10019.lux_listing_id AS lux_listing
               FROM ***************************.dim_lux_listings lux_listings_src_10019
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql
index 0b80e4d74f..7896f7776d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multi_join_node__plan0.sql
@@ -36,10 +36,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -48,10 +48,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -60,10 +60,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -73,10 +73,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -85,10 +85,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -97,10 +97,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -130,10 +130,10 @@ LEFT OUTER JOIN (
       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -142,10 +142,10 @@ LEFT OUTER JOIN (
       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -157,10 +157,10 @@ LEFT OUTER JOIN (
       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -169,10 +169,10 @@ LEFT OUTER JOIN (
       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
@@ -204,10 +204,10 @@ LEFT OUTER JOIN (
       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -216,10 +216,10 @@ LEFT OUTER JOIN (
       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -231,10 +231,10 @@ LEFT OUTER JOIN (
       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -243,10 +243,10 @@ LEFT OUTER JOIN (
       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
index 7e7b3ab4ea..59e26e6b2d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multihop_node__plan0.sql
@@ -107,10 +107,10 @@ FROM (
               , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM account_month_txns_src_10010.ds_partitioned) AS ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS ds__day
               , DATE_TRUNC(account_month_txns_src_10010.ds, isoweek) AS ds__week
               , DATE_TRUNC(account_month_txns_src_10010.ds, month) AS ds__month
@@ -119,10 +119,10 @@ FROM (
               , EXTRACT(year FROM account_month_txns_src_10010.ds) AS ds__extract_year
               , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS ds__extract_quarter
               , EXTRACT(month FROM account_month_txns_src_10010.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM account_month_txns_src_10010.ds) AS ds__extract_week
               , EXTRACT(day FROM account_month_txns_src_10010.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM account_month_txns_src_10010.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM account_month_txns_src_10010.ds) AS ds__extract_doy
               , account_month_txns_src_10010.account_month
               , account_month_txns_src_10010.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC(account_month_txns_src_10010.ds_partitioned, isoweek) AS account_id__ds_partitioned__week
@@ -132,10 +132,10 @@ FROM (
               , EXTRACT(year FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_year
               , EXTRACT(quarter FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
               , EXTRACT(month FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_week
               , EXTRACT(day FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM account_month_txns_src_10010.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , account_month_txns_src_10010.ds AS account_id__ds__day
               , DATE_TRUNC(account_month_txns_src_10010.ds, isoweek) AS account_id__ds__week
               , DATE_TRUNC(account_month_txns_src_10010.ds, month) AS account_id__ds__month
@@ -144,10 +144,10 @@ FROM (
               , EXTRACT(year FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_year
               , EXTRACT(quarter FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_quarter
               , EXTRACT(month FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_month
-              , EXTRACT(ISOWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
+              , EXTRACT(isoweek FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_week
               , EXTRACT(day FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_doy
+              , EXTRACT(dayofweek FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_dow
+              , EXTRACT(dayofyear FROM account_month_txns_src_10010.ds) AS account_id__ds__extract_doy
               , account_month_txns_src_10010.account_month AS account_id__account_month
               , account_month_txns_src_10010.account_id
             FROM ***************************.account_month_txns account_month_txns_src_10010
@@ -219,10 +219,10 @@ FROM (
               , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bridge_table_src_10011.ds_partitioned) AS ds_partitioned__extract_doy
               , bridge_table_src_10011.extra_dim AS account_id__extra_dim
               , bridge_table_src_10011.ds_partitioned AS account_id__ds_partitioned__day
               , DATE_TRUNC(bridge_table_src_10011.ds_partitioned, isoweek) AS account_id__ds_partitioned__week
@@ -232,10 +232,10 @@ FROM (
               , EXTRACT(year FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_week
               , EXTRACT(day FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bridge_table_src_10011.ds_partitioned) AS account_id__ds_partitioned__extract_doy
               , bridge_table_src_10011.account_id
               , bridge_table_src_10011.customer_id
               , bridge_table_src_10011.customer_id AS account_id__customer_id
@@ -252,25 +252,25 @@ FROM (
             --    'ds_partitioned__month',
             --    'ds_partitioned__quarter',
             --    'ds_partitioned__year',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
+            --    'ds_partitioned__extract_year',
+            --    'ds_partitioned__extract_quarter',
+            --    'ds_partitioned__extract_month',
+            --    'ds_partitioned__extract_week',
+            --    'ds_partitioned__extract_day',
+            --    'ds_partitioned__extract_dow',
+            --    'ds_partitioned__extract_doy',
             --    'customer_id__ds_partitioned__day',
             --    'customer_id__ds_partitioned__week',
             --    'customer_id__ds_partitioned__month',
             --    'customer_id__ds_partitioned__quarter',
             --    'customer_id__ds_partitioned__year',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__extract_year',
+            --    'customer_id__ds_partitioned__extract_quarter',
+            --    'customer_id__ds_partitioned__extract_month',
+            --    'customer_id__ds_partitioned__extract_week',
+            --    'customer_id__ds_partitioned__extract_day',
+            --    'customer_id__ds_partitioned__extract_dow',
+            --    'customer_id__ds_partitioned__extract_doy',
             --    'customer_id']
             SELECT
               subq_4.ds_partitioned__day
@@ -315,10 +315,10 @@ FROM (
                 , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_year
                 , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_quarter
                 , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_week
                 , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM customer_table_src_10013.ds_partitioned) AS ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_name AS customer_id__customer_name
                 , customer_table_src_10013.customer_atomic_weight AS customer_id__customer_atomic_weight
                 , customer_table_src_10013.ds_partitioned AS customer_id__ds_partitioned__day
@@ -329,10 +329,10 @@ FROM (
                 , EXTRACT(year FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_year
                 , EXTRACT(quarter FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_quarter
                 , EXTRACT(month FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_month
-                , EXTRACT(ISOWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
+                , EXTRACT(isoweek FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_week
                 , EXTRACT(day FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_day
-                , EXTRACT(DAYOFWEEK FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dow
-                , EXTRACT(DAYOFYEAR FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_doy
+                , EXTRACT(dayofweek FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM customer_table_src_10013.ds_partitioned) AS customer_id__ds_partitioned__extract_doy
                 , customer_table_src_10013.customer_id
               FROM ***************************.customer_table customer_table_src_10013
             ) subq_4
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
index 83d7b73587..a6f0b3d5fc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_multiple_metrics_no_dimensions__plan0.sql
@@ -257,10 +257,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -269,10 +269,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -281,10 +281,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -294,10 +294,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -306,10 +306,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -318,10 +318,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -513,10 +513,10 @@ CROSS JOIN (
               , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
               , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
               , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+              , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
               , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
               , listings_latest_src_10004.created_at AS created_at__day
               , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -525,10 +525,10 @@ CROSS JOIN (
               , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
               , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
               , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+              , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
               , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+              , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+              , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
               , listings_latest_src_10004.country AS country_latest
               , listings_latest_src_10004.is_lux AS is_lux_latest
               , listings_latest_src_10004.capacity AS capacity_latest
@@ -540,10 +540,10 @@ CROSS JOIN (
               , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
               , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
               , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+              , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
               , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+              , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+              , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
               , listings_latest_src_10004.created_at AS listing__created_at__day
               , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
               , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -552,10 +552,10 @@ CROSS JOIN (
               , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
               , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
               , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-              , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+              , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
               , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+              , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+              , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
               , listings_latest_src_10004.country AS listing__country_latest
               , listings_latest_src_10004.is_lux AS listing__is_lux_latest
               , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
index 9037a9f0bb..189d129aa7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_nested_derived_metric__plan0.sql
@@ -170,10 +170,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -182,10 +182,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -194,10 +194,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -207,10 +207,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -219,10 +219,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -231,10 +231,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -399,10 +399,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -411,10 +411,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -423,10 +423,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
                   , bookings_source_src_10001.is_instant AS booking__is_instant
                   , bookings_source_src_10001.ds AS booking__ds__day
                   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -436,10 +436,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
                   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
                   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -448,10 +448,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
                   , bookings_source_src_10001.paid_at AS booking__paid_at__day
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
                   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -460,10 +460,10 @@ FROM (
                   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
                   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
                   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-                  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
                   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-                  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-                  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
                   , bookings_source_src_10001.listing_id AS listing
                   , bookings_source_src_10001.guest_id AS guest
                   , bookings_source_src_10001.host_id AS host
@@ -640,10 +640,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -652,10 +652,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -664,10 +664,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -677,10 +677,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -689,10 +689,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -701,10 +701,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
@@ -879,10 +879,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -891,10 +891,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -903,10 +903,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
               , bookings_source_src_10001.is_instant AS booking__is_instant
               , bookings_source_src_10001.ds AS booking__ds__day
               , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -916,10 +916,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
               , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
               , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -928,10 +928,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
               , bookings_source_src_10001.paid_at AS booking__paid_at__day
               , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
               , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -940,10 +940,10 @@ FROM (
               , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
               , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
               , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-              , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
               , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-              , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-              , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
               , bookings_source_src_10001.listing_id AS listing
               , bookings_source_src_10001.guest_id AS guest
               , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0.sql
new file mode 100644
index 0000000000..f5af97ec20
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0.sql
@@ -0,0 +1,585 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_13.metric_time__extract_dow
+  , bookings - bookings_2_weeks_ago AS bookings_growth_2_weeks
+FROM (
+  -- Combine Metrics
+  SELECT
+    COALESCE(subq_4.metric_time__extract_dow, subq_12.metric_time__extract_dow) AS metric_time__extract_dow
+    , subq_4.bookings AS bookings
+    , subq_12.bookings_2_weeks_ago AS bookings_2_weeks_ago
+  FROM (
+    -- Compute Metrics via Expressions
+    SELECT
+      subq_3.metric_time__extract_dow
+      , subq_3.bookings
+    FROM (
+      -- Aggregate Measures
+      SELECT
+        subq_2.metric_time__extract_dow
+        , SUM(subq_2.bookings) AS bookings
+      FROM (
+        -- Pass Only Elements:
+        --   ['bookings', 'metric_time__extract_dow']
+        SELECT
+          subq_1.metric_time__extract_dow
+          , subq_1.bookings
+        FROM (
+          -- Metric Time Dimension 'ds'
+          SELECT
+            subq_0.ds__day
+            , subq_0.ds__week
+            , subq_0.ds__month
+            , subq_0.ds__quarter
+            , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
+            , subq_0.ds_partitioned__day
+            , subq_0.ds_partitioned__week
+            , subq_0.ds_partitioned__month
+            , subq_0.ds_partitioned__quarter
+            , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
+            , subq_0.paid_at__day
+            , subq_0.paid_at__week
+            , subq_0.paid_at__month
+            , subq_0.paid_at__quarter
+            , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
+            , subq_0.booking__ds__day
+            , subq_0.booking__ds__week
+            , subq_0.booking__ds__month
+            , subq_0.booking__ds__quarter
+            , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
+            , subq_0.booking__ds_partitioned__day
+            , subq_0.booking__ds_partitioned__week
+            , subq_0.booking__ds_partitioned__month
+            , subq_0.booking__ds_partitioned__quarter
+            , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
+            , subq_0.booking__paid_at__day
+            , subq_0.booking__paid_at__week
+            , subq_0.booking__paid_at__month
+            , subq_0.booking__paid_at__quarter
+            , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
+            , subq_0.ds__day AS metric_time__day
+            , subq_0.ds__week AS metric_time__week
+            , subq_0.ds__month AS metric_time__month
+            , subq_0.ds__quarter AS metric_time__quarter
+            , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
+            , subq_0.listing
+            , subq_0.guest
+            , subq_0.host
+            , subq_0.booking__listing
+            , subq_0.booking__guest
+            , subq_0.booking__host
+            , subq_0.is_instant
+            , subq_0.booking__is_instant
+            , subq_0.bookings
+            , subq_0.instant_bookings
+            , subq_0.booking_value
+            , subq_0.max_booking_value
+            , subq_0.min_booking_value
+            , subq_0.bookers
+            , subq_0.average_booking_value
+            , subq_0.referred_bookings
+            , subq_0.median_booking_value
+            , subq_0.booking_value_p99
+            , subq_0.discrete_booking_value_p99
+            , subq_0.approximate_continuous_booking_value_p99
+            , subq_0.approximate_discrete_booking_value_p99
+          FROM (
+            -- Read Elements From Semantic Model 'bookings_source'
+            SELECT
+              1 AS bookings
+              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+              , bookings_source_src_10001.booking_value
+              , bookings_source_src_10001.booking_value AS max_booking_value
+              , bookings_source_src_10001.booking_value AS min_booking_value
+              , bookings_source_src_10001.guest_id AS bookers
+              , bookings_source_src_10001.booking_value AS average_booking_value
+              , bookings_source_src_10001.booking_value AS booking_payments
+              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+              , bookings_source_src_10001.booking_value AS median_booking_value
+              , bookings_source_src_10001.booking_value AS booking_value_p99
+              , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+              , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+              , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+              , bookings_source_src_10001.is_instant
+              , bookings_source_src_10001.ds AS ds__day
+              , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS ds__week
+              , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
+              , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
+              , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+              , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
+              , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
+              , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
+              , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , bookings_source_src_10001.paid_at AS paid_at__day
+              , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
+              , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
+              , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
+              , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , bookings_source_src_10001.is_instant AS booking__is_instant
+              , bookings_source_src_10001.ds AS booking__ds__day
+              , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
+              , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
+              , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
+              , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+              , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
+              , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
+              , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
+              , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , bookings_source_src_10001.paid_at AS booking__paid_at__day
+              , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
+              , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
+              , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
+              , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , bookings_source_src_10001.listing_id AS listing
+              , bookings_source_src_10001.guest_id AS guest
+              , bookings_source_src_10001.host_id AS host
+              , bookings_source_src_10001.listing_id AS booking__listing
+              , bookings_source_src_10001.guest_id AS booking__guest
+              , bookings_source_src_10001.host_id AS booking__host
+            FROM ***************************.fct_bookings bookings_source_src_10001
+          ) subq_0
+        ) subq_1
+      ) subq_2
+      GROUP BY
+        metric_time__extract_dow
+    ) subq_3
+  ) subq_4
+  INNER JOIN (
+    -- Compute Metrics via Expressions
+    SELECT
+      subq_11.metric_time__extract_dow
+      , subq_11.bookings AS bookings_2_weeks_ago
+    FROM (
+      -- Aggregate Measures
+      SELECT
+        subq_10.metric_time__extract_dow
+        , SUM(subq_10.bookings) AS bookings
+      FROM (
+        -- Pass Only Elements:
+        --   ['bookings', 'metric_time__extract_dow']
+        SELECT
+          subq_9.metric_time__extract_dow
+          , subq_9.bookings
+        FROM (
+          -- Join to Time Spine Dataset
+          SELECT
+            EXTRACT(dayofweek FROM subq_7.metric_time__day) AS metric_time__extract_dow
+            , subq_6.ds__day AS ds__day
+            , subq_6.ds__week AS ds__week
+            , subq_6.ds__month AS ds__month
+            , subq_6.ds__quarter AS ds__quarter
+            , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
+            , subq_6.ds_partitioned__day AS ds_partitioned__day
+            , subq_6.ds_partitioned__week AS ds_partitioned__week
+            , subq_6.ds_partitioned__month AS ds_partitioned__month
+            , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
+            , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
+            , subq_6.paid_at__day AS paid_at__day
+            , subq_6.paid_at__week AS paid_at__week
+            , subq_6.paid_at__month AS paid_at__month
+            , subq_6.paid_at__quarter AS paid_at__quarter
+            , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
+            , subq_6.booking__ds__day AS booking__ds__day
+            , subq_6.booking__ds__week AS booking__ds__week
+            , subq_6.booking__ds__month AS booking__ds__month
+            , subq_6.booking__ds__quarter AS booking__ds__quarter
+            , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
+            , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
+            , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
+            , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
+            , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
+            , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
+            , subq_6.booking__paid_at__day AS booking__paid_at__day
+            , subq_6.booking__paid_at__week AS booking__paid_at__week
+            , subq_6.booking__paid_at__month AS booking__paid_at__month
+            , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
+            , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
+            , subq_6.listing AS listing
+            , subq_6.guest AS guest
+            , subq_6.host AS host
+            , subq_6.booking__listing AS booking__listing
+            , subq_6.booking__guest AS booking__guest
+            , subq_6.booking__host AS booking__host
+            , subq_6.is_instant AS is_instant
+            , subq_6.booking__is_instant AS booking__is_instant
+            , subq_6.bookings AS bookings
+            , subq_6.instant_bookings AS instant_bookings
+            , subq_6.booking_value AS booking_value
+            , subq_6.max_booking_value AS max_booking_value
+            , subq_6.min_booking_value AS min_booking_value
+            , subq_6.bookers AS bookers
+            , subq_6.average_booking_value AS average_booking_value
+            , subq_6.referred_bookings AS referred_bookings
+            , subq_6.median_booking_value AS median_booking_value
+            , subq_6.booking_value_p99 AS booking_value_p99
+            , subq_6.discrete_booking_value_p99 AS discrete_booking_value_p99
+            , subq_6.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
+            , subq_6.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
+          FROM (
+            -- Date Spine
+            SELECT
+              subq_8.ds AS metric_time__day
+            FROM ***************************.mf_time_spine subq_8
+          ) subq_7
+          INNER JOIN (
+            -- Metric Time Dimension 'ds'
+            SELECT
+              subq_5.ds__day
+              , subq_5.ds__week
+              , subq_5.ds__month
+              , subq_5.ds__quarter
+              , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
+              , subq_5.ds_partitioned__day
+              , subq_5.ds_partitioned__week
+              , subq_5.ds_partitioned__month
+              , subq_5.ds_partitioned__quarter
+              , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
+              , subq_5.paid_at__day
+              , subq_5.paid_at__week
+              , subq_5.paid_at__month
+              , subq_5.paid_at__quarter
+              , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
+              , subq_5.booking__ds__day
+              , subq_5.booking__ds__week
+              , subq_5.booking__ds__month
+              , subq_5.booking__ds__quarter
+              , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
+              , subq_5.booking__ds_partitioned__day
+              , subq_5.booking__ds_partitioned__week
+              , subq_5.booking__ds_partitioned__month
+              , subq_5.booking__ds_partitioned__quarter
+              , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
+              , subq_5.booking__paid_at__day
+              , subq_5.booking__paid_at__week
+              , subq_5.booking__paid_at__month
+              , subq_5.booking__paid_at__quarter
+              , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
+              , subq_5.ds__day AS metric_time__day
+              , subq_5.ds__week AS metric_time__week
+              , subq_5.ds__month AS metric_time__month
+              , subq_5.ds__quarter AS metric_time__quarter
+              , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
+              , subq_5.listing
+              , subq_5.guest
+              , subq_5.host
+              , subq_5.booking__listing
+              , subq_5.booking__guest
+              , subq_5.booking__host
+              , subq_5.is_instant
+              , subq_5.booking__is_instant
+              , subq_5.bookings
+              , subq_5.instant_bookings
+              , subq_5.booking_value
+              , subq_5.max_booking_value
+              , subq_5.min_booking_value
+              , subq_5.bookers
+              , subq_5.average_booking_value
+              , subq_5.referred_bookings
+              , subq_5.median_booking_value
+              , subq_5.booking_value_p99
+              , subq_5.discrete_booking_value_p99
+              , subq_5.approximate_continuous_booking_value_p99
+              , subq_5.approximate_discrete_booking_value_p99
+            FROM (
+              -- Read Elements From Semantic Model 'bookings_source'
+              SELECT
+                1 AS bookings
+                , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+                , bookings_source_src_10001.booking_value
+                , bookings_source_src_10001.booking_value AS max_booking_value
+                , bookings_source_src_10001.booking_value AS min_booking_value
+                , bookings_source_src_10001.guest_id AS bookers
+                , bookings_source_src_10001.booking_value AS average_booking_value
+                , bookings_source_src_10001.booking_value AS booking_payments
+                , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+                , bookings_source_src_10001.booking_value AS median_booking_value
+                , bookings_source_src_10001.booking_value AS booking_value_p99
+                , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+                , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+                , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+                , bookings_source_src_10001.is_instant
+                , bookings_source_src_10001.ds AS ds__day
+                , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS ds__week
+                , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
+                , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
+                , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+                , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
+                , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
+                , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
+                , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , bookings_source_src_10001.paid_at AS paid_at__day
+                , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
+                , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
+                , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
+                , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , bookings_source_src_10001.is_instant AS booking__is_instant
+                , bookings_source_src_10001.ds AS booking__ds__day
+                , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
+                , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
+                , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
+                , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+                , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
+                , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
+                , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
+                , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , bookings_source_src_10001.paid_at AS booking__paid_at__day
+                , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
+                , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
+                , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
+                , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , bookings_source_src_10001.listing_id AS listing
+                , bookings_source_src_10001.guest_id AS guest
+                , bookings_source_src_10001.host_id AS host
+                , bookings_source_src_10001.listing_id AS booking__listing
+                , bookings_source_src_10001.guest_id AS booking__guest
+                , bookings_source_src_10001.host_id AS booking__host
+              FROM ***************************.fct_bookings bookings_source_src_10001
+            ) subq_5
+          ) subq_6
+          ON
+            DATE_SUB(CAST(subq_7.metric_time__day AS DATETIME), INTERVAL 14 day) = subq_6.metric_time__day
+        ) subq_9
+      ) subq_10
+      GROUP BY
+        metric_time__extract_dow
+    ) subq_11
+  ) subq_12
+  ON
+    (
+      subq_4.metric_time__extract_dow = subq_12.metric_time__extract_dow
+    ) OR (
+      (
+        subq_4.metric_time__extract_dow IS NULL
+      ) AND (
+        subq_12.metric_time__extract_dow IS NULL
+      )
+    )
+) subq_13
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0_optimized.sql
new file mode 100644
index 0000000000..3281174961
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_offset_window_with_date_part__plan0_optimized.sql
@@ -0,0 +1,63 @@
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_dow
+  , bookings - bookings_2_weeks_ago AS bookings_growth_2_weeks
+FROM (
+  -- Combine Metrics
+  SELECT
+    COALESCE(subq_18.metric_time__extract_dow, subq_26.metric_time__extract_dow) AS metric_time__extract_dow
+    , subq_18.bookings AS bookings
+    , subq_26.bookings_2_weeks_ago AS bookings_2_weeks_ago
+  FROM (
+    -- Aggregate Measures
+    -- Compute Metrics via Expressions
+    SELECT
+      metric_time__extract_dow
+      , SUM(bookings) AS bookings
+    FROM (
+      -- Read Elements From Semantic Model 'bookings_source'
+      -- Metric Time Dimension 'ds'
+      -- Pass Only Elements:
+      --   ['bookings', 'metric_time__extract_dow']
+      SELECT
+        EXTRACT(dayofweek FROM ds) AS metric_time__extract_dow
+        , 1 AS bookings
+      FROM ***************************.fct_bookings bookings_source_src_10001
+    ) subq_16
+    GROUP BY
+      metric_time__extract_dow
+  ) subq_18
+  INNER JOIN (
+    -- Join to Time Spine Dataset
+    -- Pass Only Elements:
+    --   ['bookings', 'metric_time__extract_dow']
+    -- Aggregate Measures
+    -- Compute Metrics via Expressions
+    SELECT
+      EXTRACT(dayofweek FROM subq_22.ds) AS metric_time__extract_dow
+      , SUM(subq_20.bookings) AS bookings_2_weeks_ago
+    FROM ***************************.mf_time_spine subq_22
+    INNER JOIN (
+      -- Read Elements From Semantic Model 'bookings_source'
+      -- Metric Time Dimension 'ds'
+      SELECT
+        ds AS metric_time__day
+        , 1 AS bookings
+      FROM ***************************.fct_bookings bookings_source_src_10001
+    ) subq_20
+    ON
+      DATE_SUB(CAST(subq_22.ds AS DATETIME), INTERVAL 14 day) = subq_20.metric_time__day
+    GROUP BY
+      metric_time__extract_dow
+  ) subq_26
+  ON
+    (
+      subq_18.metric_time__extract_dow = subq_26.metric_time__extract_dow
+    ) OR (
+      (
+        subq_18.metric_time__extract_dow IS NULL
+      ) AND (
+        subq_26.metric_time__extract_dow IS NULL
+      )
+    )
+) subq_27
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql
index 61c29db82f..34b763eb68 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_order_by_node__plan0.sql
@@ -48,10 +48,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -60,10 +60,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -72,10 +72,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
           , bookings_source_src_10001.is_instant AS booking__is_instant
           , bookings_source_src_10001.ds AS booking__ds__day
           , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -85,10 +85,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
           , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
           , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -97,10 +97,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
           , bookings_source_src_10001.paid_at AS booking__paid_at__day
           , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
           , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -109,10 +109,10 @@ FROM (
           , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
           , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
           , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-          , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
           , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-          , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-          , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
           , bookings_source_src_10001.listing_id AS listing
           , bookings_source_src_10001.guest_id AS guest
           , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
index 2fff30c78d..edb417b214 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_partitioned_join__plan0.sql
@@ -109,10 +109,10 @@ FROM (
               , EXTRACT(year FROM id_verifications_src_10003.ds) AS ds__extract_year
               , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS ds__extract_quarter
               , EXTRACT(month FROM id_verifications_src_10003.ds) AS ds__extract_month
-              , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds) AS ds__extract_week
+              , EXTRACT(isoweek FROM id_verifications_src_10003.ds) AS ds__extract_week
               , EXTRACT(day FROM id_verifications_src_10003.ds) AS ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS ds__extract_doy
+              , EXTRACT(dayofweek FROM id_verifications_src_10003.ds) AS ds__extract_dow
+              , EXTRACT(dayofyear FROM id_verifications_src_10003.ds) AS ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS ds_partitioned__day
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, isoweek) AS ds_partitioned__week
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, month) AS ds_partitioned__month
@@ -121,10 +121,10 @@ FROM (
               , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_year
               , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_quarter
               , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_week
               , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM id_verifications_src_10003.ds_partitioned) AS ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type
               , id_verifications_src_10003.ds AS verification__ds__day
               , DATE_TRUNC(id_verifications_src_10003.ds, isoweek) AS verification__ds__week
@@ -134,10 +134,10 @@ FROM (
               , EXTRACT(year FROM id_verifications_src_10003.ds) AS verification__ds__extract_year
               , EXTRACT(quarter FROM id_verifications_src_10003.ds) AS verification__ds__extract_quarter
               , EXTRACT(month FROM id_verifications_src_10003.ds) AS verification__ds__extract_month
-              , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
+              , EXTRACT(isoweek FROM id_verifications_src_10003.ds) AS verification__ds__extract_week
               , EXTRACT(day FROM id_verifications_src_10003.ds) AS verification__ds__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
+              , EXTRACT(dayofweek FROM id_verifications_src_10003.ds) AS verification__ds__extract_dow
+              , EXTRACT(dayofyear FROM id_verifications_src_10003.ds) AS verification__ds__extract_doy
               , id_verifications_src_10003.ds_partitioned AS verification__ds_partitioned__day
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, isoweek) AS verification__ds_partitioned__week
               , DATE_TRUNC(id_verifications_src_10003.ds_partitioned, month) AS verification__ds_partitioned__month
@@ -146,10 +146,10 @@ FROM (
               , EXTRACT(year FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_year
               , EXTRACT(quarter FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_quarter
               , EXTRACT(month FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_month
-              , EXTRACT(ISOWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
+              , EXTRACT(isoweek FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_week
               , EXTRACT(day FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_day
-              , EXTRACT(DAYOFWEEK FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
-              , EXTRACT(DAYOFYEAR FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
+              , EXTRACT(dayofweek FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_dow
+              , EXTRACT(dayofyear FROM id_verifications_src_10003.ds_partitioned) AS verification__ds_partitioned__extract_doy
               , id_verifications_src_10003.verification_type AS verification__verification_type
               , id_verifications_src_10003.verification_id AS verification
               , id_verifications_src_10003.user_id AS user
@@ -176,10 +176,10 @@ FROM (
             , EXTRACT(year FROM users_ds_source_src_10007.ds) AS ds__extract_year
             , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS ds__extract_quarter
             , EXTRACT(month FROM users_ds_source_src_10007.ds) AS ds__extract_month
-            , EXTRACT(ISOWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_week
+            , EXTRACT(isoweek FROM users_ds_source_src_10007.ds) AS ds__extract_week
             , EXTRACT(day FROM users_ds_source_src_10007.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS ds__extract_doy
+            , EXTRACT(dayofweek FROM users_ds_source_src_10007.ds) AS ds__extract_dow
+            , EXTRACT(dayofyear FROM users_ds_source_src_10007.ds) AS ds__extract_doy
             , users_ds_source_src_10007.created_at AS created_at__day
             , DATE_TRUNC(users_ds_source_src_10007.created_at, isoweek) AS created_at__week
             , DATE_TRUNC(users_ds_source_src_10007.created_at, month) AS created_at__month
@@ -188,10 +188,10 @@ FROM (
             , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS created_at__extract_year
             , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS created_at__extract_quarter
             , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS created_at__extract_month
-            , EXTRACT(ISOWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
+            , EXTRACT(isoweek FROM users_ds_source_src_10007.created_at) AS created_at__extract_week
             , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS created_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS created_at__extract_doy
+            , EXTRACT(dayofweek FROM users_ds_source_src_10007.created_at) AS created_at__extract_dow
+            , EXTRACT(dayofyear FROM users_ds_source_src_10007.created_at) AS created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, month) AS ds_partitioned__month
@@ -200,10 +200,10 @@ FROM (
             , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_year
             , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_quarter
             , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM users_ds_source_src_10007.ds_partitioned) AS ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state
             , users_ds_source_src_10007.ds AS user__ds__day
             , DATE_TRUNC(users_ds_source_src_10007.ds, isoweek) AS user__ds__week
@@ -213,10 +213,10 @@ FROM (
             , EXTRACT(year FROM users_ds_source_src_10007.ds) AS user__ds__extract_year
             , EXTRACT(quarter FROM users_ds_source_src_10007.ds) AS user__ds__extract_quarter
             , EXTRACT(month FROM users_ds_source_src_10007.ds) AS user__ds__extract_month
-            , EXTRACT(ISOWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
+            , EXTRACT(isoweek FROM users_ds_source_src_10007.ds) AS user__ds__extract_week
             , EXTRACT(day FROM users_ds_source_src_10007.ds) AS user__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds) AS user__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds) AS user__ds__extract_doy
+            , EXTRACT(dayofweek FROM users_ds_source_src_10007.ds) AS user__ds__extract_dow
+            , EXTRACT(dayofyear FROM users_ds_source_src_10007.ds) AS user__ds__extract_doy
             , users_ds_source_src_10007.created_at AS user__created_at__day
             , DATE_TRUNC(users_ds_source_src_10007.created_at, isoweek) AS user__created_at__week
             , DATE_TRUNC(users_ds_source_src_10007.created_at, month) AS user__created_at__month
@@ -225,10 +225,10 @@ FROM (
             , EXTRACT(year FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_year
             , EXTRACT(quarter FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_quarter
             , EXTRACT(month FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_month
-            , EXTRACT(ISOWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
+            , EXTRACT(isoweek FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_week
             , EXTRACT(day FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_doy
+            , EXTRACT(dayofweek FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_dow
+            , EXTRACT(dayofyear FROM users_ds_source_src_10007.created_at) AS user__created_at__extract_doy
             , users_ds_source_src_10007.ds_partitioned AS user__ds_partitioned__day
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, isoweek) AS user__ds_partitioned__week
             , DATE_TRUNC(users_ds_source_src_10007.ds_partitioned, month) AS user__ds_partitioned__month
@@ -237,10 +237,10 @@ FROM (
             , EXTRACT(year FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_year
             , EXTRACT(quarter FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_quarter
             , EXTRACT(month FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_week
             , EXTRACT(day FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM users_ds_source_src_10007.ds_partitioned) AS user__ds_partitioned__extract_doy
             , users_ds_source_src_10007.home_state AS user__home_state
             , users_ds_source_src_10007.user_id AS user
           FROM ***************************.dim_users users_ds_source_src_10007
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql
index 791d0d4049..07e622e748 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0.sql
@@ -45,10 +45,10 @@ FROM (
     , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
     , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
     , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(isoweek FROM accounts_source_src_10000.ds) AS ds__extract_week
     , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
+    , EXTRACT(dayofweek FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(dayofyear FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
@@ -58,10 +58,10 @@ FROM (
     , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
     , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
     , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(isoweek FROM accounts_source_src_10000.ds) AS account__ds__extract_week
     , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
+    , EXTRACT(dayofweek FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(dayofyear FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -85,10 +85,10 @@ INNER JOIN (
       , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
       , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
       , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(isoweek FROM accounts_source_src_10000.ds) AS ds__extract_week
       , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
+      , EXTRACT(dayofweek FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(dayofyear FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
@@ -98,10 +98,10 @@ INNER JOIN (
       , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
       , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
       , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(isoweek FROM accounts_source_src_10000.ds) AS account__ds__extract_week
       , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
+      , EXTRACT(dayofweek FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(dayofyear FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
index 0f94ea6726..060f3efacd 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node__plan0_optimized.sql
@@ -45,10 +45,10 @@ FROM (
     , EXTRACT(year FROM ds) AS ds__extract_year
     , EXTRACT(quarter FROM ds) AS ds__extract_quarter
     , EXTRACT(month FROM ds) AS ds__extract_month
-    , EXTRACT(ISOWEEK FROM ds) AS ds__extract_week
+    , EXTRACT(isoweek FROM ds) AS ds__extract_week
     , EXTRACT(day FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
+    , EXTRACT(dayofweek FROM ds) AS ds__extract_dow
+    , EXTRACT(dayofyear FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC(ds, isoweek) AS account__ds__week
@@ -58,10 +58,10 @@ FROM (
     , EXTRACT(year FROM ds) AS account__ds__extract_year
     , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
     , EXTRACT(month FROM ds) AS account__ds__extract_month
-    , EXTRACT(ISOWEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(isoweek FROM ds) AS account__ds__extract_week
     , EXTRACT(day FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_doy
+    , EXTRACT(dayofweek FROM ds) AS account__ds__extract_dow
+    , EXTRACT(dayofyear FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
index 1e815dd2dc..f13236380c 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0.sql
@@ -45,10 +45,10 @@ FROM (
     , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
     , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
     , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(isoweek FROM accounts_source_src_10000.ds) AS ds__extract_week
     , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
+    , EXTRACT(dayofweek FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(dayofyear FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
@@ -58,10 +58,10 @@ FROM (
     , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
     , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
     , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(isoweek FROM accounts_source_src_10000.ds) AS account__ds__extract_week
     , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
+    , EXTRACT(dayofweek FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(dayofyear FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -86,10 +86,10 @@ INNER JOIN (
       , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
       , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
       , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(isoweek FROM accounts_source_src_10000.ds) AS ds__extract_week
       , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
+      , EXTRACT(dayofweek FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(dayofyear FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
@@ -99,10 +99,10 @@ INNER JOIN (
       , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
       , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
       , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(isoweek FROM accounts_source_src_10000.ds) AS account__ds__extract_week
       , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
+      , EXTRACT(dayofweek FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(dayofyear FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
index a25638e888..8a36408f84 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_grouping__plan0_optimized.sql
@@ -45,10 +45,10 @@ FROM (
     , EXTRACT(year FROM ds) AS ds__extract_year
     , EXTRACT(quarter FROM ds) AS ds__extract_quarter
     , EXTRACT(month FROM ds) AS ds__extract_month
-    , EXTRACT(ISOWEEK FROM ds) AS ds__extract_week
+    , EXTRACT(isoweek FROM ds) AS ds__extract_week
     , EXTRACT(day FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
+    , EXTRACT(dayofweek FROM ds) AS ds__extract_dow
+    , EXTRACT(dayofyear FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC(ds, isoweek) AS account__ds__week
@@ -58,10 +58,10 @@ FROM (
     , EXTRACT(year FROM ds) AS account__ds__extract_year
     , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
     , EXTRACT(month FROM ds) AS account__ds__extract_month
-    , EXTRACT(ISOWEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(isoweek FROM ds) AS account__ds__extract_week
     , EXTRACT(day FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_doy
+    , EXTRACT(dayofweek FROM ds) AS account__ds__extract_dow
+    , EXTRACT(dayofyear FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
index de371ca618..eff1adbdb9 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0.sql
@@ -45,10 +45,10 @@ FROM (
     , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
     , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
     , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
-    , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+    , EXTRACT(isoweek FROM accounts_source_src_10000.ds) AS ds__extract_week
     , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
+    , EXTRACT(dayofweek FROM accounts_source_src_10000.ds) AS ds__extract_dow
+    , EXTRACT(dayofyear FROM accounts_source_src_10000.ds) AS ds__extract_doy
     , accounts_source_src_10000.account_type
     , accounts_source_src_10000.ds AS account__ds__day
     , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
@@ -58,10 +58,10 @@ FROM (
     , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
     , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
     , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-    , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+    , EXTRACT(isoweek FROM accounts_source_src_10000.ds) AS account__ds__extract_week
     , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
+    , EXTRACT(dayofweek FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+    , EXTRACT(dayofyear FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
     , accounts_source_src_10000.account_type AS account__account_type
     , accounts_source_src_10000.user_id AS user
     , accounts_source_src_10000.user_id AS account__user
@@ -86,10 +86,10 @@ INNER JOIN (
       , EXTRACT(year FROM accounts_source_src_10000.ds) AS ds__extract_year
       , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS ds__extract_quarter
       , EXTRACT(month FROM accounts_source_src_10000.ds) AS ds__extract_month
-      , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS ds__extract_week
+      , EXTRACT(isoweek FROM accounts_source_src_10000.ds) AS ds__extract_week
       , EXTRACT(day FROM accounts_source_src_10000.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS ds__extract_doy
+      , EXTRACT(dayofweek FROM accounts_source_src_10000.ds) AS ds__extract_dow
+      , EXTRACT(dayofyear FROM accounts_source_src_10000.ds) AS ds__extract_doy
       , accounts_source_src_10000.account_type
       , accounts_source_src_10000.ds AS account__ds__day
       , DATE_TRUNC(accounts_source_src_10000.ds, isoweek) AS account__ds__week
@@ -99,10 +99,10 @@ INNER JOIN (
       , EXTRACT(year FROM accounts_source_src_10000.ds) AS account__ds__extract_year
       , EXTRACT(quarter FROM accounts_source_src_10000.ds) AS account__ds__extract_quarter
       , EXTRACT(month FROM accounts_source_src_10000.ds) AS account__ds__extract_month
-      , EXTRACT(ISOWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_week
+      , EXTRACT(isoweek FROM accounts_source_src_10000.ds) AS account__ds__extract_week
       , EXTRACT(day FROM accounts_source_src_10000.ds) AS account__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
+      , EXTRACT(dayofweek FROM accounts_source_src_10000.ds) AS account__ds__extract_dow
+      , EXTRACT(dayofyear FROM accounts_source_src_10000.ds) AS account__ds__extract_doy
       , accounts_source_src_10000.account_type AS account__account_type
       , accounts_source_src_10000.user_id AS user
       , accounts_source_src_10000.user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
index 35af81c4d7..025caeebfc 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_semi_additive_join_node_with_queried_group_by__plan0_optimized.sql
@@ -45,10 +45,10 @@ FROM (
     , EXTRACT(year FROM ds) AS ds__extract_year
     , EXTRACT(quarter FROM ds) AS ds__extract_quarter
     , EXTRACT(month FROM ds) AS ds__extract_month
-    , EXTRACT(ISOWEEK FROM ds) AS ds__extract_week
+    , EXTRACT(isoweek FROM ds) AS ds__extract_week
     , EXTRACT(day FROM ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
+    , EXTRACT(dayofweek FROM ds) AS ds__extract_dow
+    , EXTRACT(dayofyear FROM ds) AS ds__extract_doy
     , account_type
     , ds AS account__ds__day
     , DATE_TRUNC(ds, isoweek) AS account__ds__week
@@ -58,10 +58,10 @@ FROM (
     , EXTRACT(year FROM ds) AS account__ds__extract_year
     , EXTRACT(quarter FROM ds) AS account__ds__extract_quarter
     , EXTRACT(month FROM ds) AS account__ds__extract_month
-    , EXTRACT(ISOWEEK FROM ds) AS account__ds__extract_week
+    , EXTRACT(isoweek FROM ds) AS account__ds__extract_week
     , EXTRACT(day FROM ds) AS account__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM ds) AS account__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM ds) AS account__ds__extract_doy
+    , EXTRACT(dayofweek FROM ds) AS account__ds__extract_dow
+    , EXTRACT(dayofyear FROM ds) AS account__ds__extract_doy
     , account_type AS account__account_type
     , user_id AS user
     , user_id AS account__user
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0.sql
new file mode 100644
index 0000000000..031517a99c
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0.sql
@@ -0,0 +1,227 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_3.metric_time__extract_dow
+  , subq_3.bookings
+FROM (
+  -- Aggregate Measures
+  SELECT
+    subq_2.metric_time__extract_dow
+    , SUM(subq_2.bookings) AS bookings
+  FROM (
+    -- Pass Only Elements:
+    --   ['bookings', 'metric_time__extract_dow']
+    SELECT
+      subq_1.metric_time__extract_dow
+      , subq_1.bookings
+    FROM (
+      -- Metric Time Dimension 'ds'
+      SELECT
+        subq_0.ds__day
+        , subq_0.ds__week
+        , subq_0.ds__month
+        , subq_0.ds__quarter
+        , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
+        , subq_0.ds_partitioned__day
+        , subq_0.ds_partitioned__week
+        , subq_0.ds_partitioned__month
+        , subq_0.ds_partitioned__quarter
+        , subq_0.ds_partitioned__year
+        , subq_0.ds_partitioned__extract_year
+        , subq_0.ds_partitioned__extract_quarter
+        , subq_0.ds_partitioned__extract_month
+        , subq_0.ds_partitioned__extract_week
+        , subq_0.ds_partitioned__extract_day
+        , subq_0.ds_partitioned__extract_dow
+        , subq_0.ds_partitioned__extract_doy
+        , subq_0.paid_at__day
+        , subq_0.paid_at__week
+        , subq_0.paid_at__month
+        , subq_0.paid_at__quarter
+        , subq_0.paid_at__year
+        , subq_0.paid_at__extract_year
+        , subq_0.paid_at__extract_quarter
+        , subq_0.paid_at__extract_month
+        , subq_0.paid_at__extract_week
+        , subq_0.paid_at__extract_day
+        , subq_0.paid_at__extract_dow
+        , subq_0.paid_at__extract_doy
+        , subq_0.booking__ds__day
+        , subq_0.booking__ds__week
+        , subq_0.booking__ds__month
+        , subq_0.booking__ds__quarter
+        , subq_0.booking__ds__year
+        , subq_0.booking__ds__extract_year
+        , subq_0.booking__ds__extract_quarter
+        , subq_0.booking__ds__extract_month
+        , subq_0.booking__ds__extract_week
+        , subq_0.booking__ds__extract_day
+        , subq_0.booking__ds__extract_dow
+        , subq_0.booking__ds__extract_doy
+        , subq_0.booking__ds_partitioned__day
+        , subq_0.booking__ds_partitioned__week
+        , subq_0.booking__ds_partitioned__month
+        , subq_0.booking__ds_partitioned__quarter
+        , subq_0.booking__ds_partitioned__year
+        , subq_0.booking__ds_partitioned__extract_year
+        , subq_0.booking__ds_partitioned__extract_quarter
+        , subq_0.booking__ds_partitioned__extract_month
+        , subq_0.booking__ds_partitioned__extract_week
+        , subq_0.booking__ds_partitioned__extract_day
+        , subq_0.booking__ds_partitioned__extract_dow
+        , subq_0.booking__ds_partitioned__extract_doy
+        , subq_0.booking__paid_at__day
+        , subq_0.booking__paid_at__week
+        , subq_0.booking__paid_at__month
+        , subq_0.booking__paid_at__quarter
+        , subq_0.booking__paid_at__year
+        , subq_0.booking__paid_at__extract_year
+        , subq_0.booking__paid_at__extract_quarter
+        , subq_0.booking__paid_at__extract_month
+        , subq_0.booking__paid_at__extract_week
+        , subq_0.booking__paid_at__extract_day
+        , subq_0.booking__paid_at__extract_dow
+        , subq_0.booking__paid_at__extract_doy
+        , subq_0.ds__day AS metric_time__day
+        , subq_0.ds__week AS metric_time__week
+        , subq_0.ds__month AS metric_time__month
+        , subq_0.ds__quarter AS metric_time__quarter
+        , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
+        , subq_0.listing
+        , subq_0.guest
+        , subq_0.host
+        , subq_0.booking__listing
+        , subq_0.booking__guest
+        , subq_0.booking__host
+        , subq_0.is_instant
+        , subq_0.booking__is_instant
+        , subq_0.bookings
+        , subq_0.instant_bookings
+        , subq_0.booking_value
+        , subq_0.max_booking_value
+        , subq_0.min_booking_value
+        , subq_0.bookers
+        , subq_0.average_booking_value
+        , subq_0.referred_bookings
+        , subq_0.median_booking_value
+        , subq_0.booking_value_p99
+        , subq_0.discrete_booking_value_p99
+        , subq_0.approximate_continuous_booking_value_p99
+        , subq_0.approximate_discrete_booking_value_p99
+      FROM (
+        -- Read Elements From Semantic Model 'bookings_source'
+        SELECT
+          1 AS bookings
+          , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+          , bookings_source_src_10001.booking_value
+          , bookings_source_src_10001.booking_value AS max_booking_value
+          , bookings_source_src_10001.booking_value AS min_booking_value
+          , bookings_source_src_10001.guest_id AS bookers
+          , bookings_source_src_10001.booking_value AS average_booking_value
+          , bookings_source_src_10001.booking_value AS booking_payments
+          , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+          , bookings_source_src_10001.booking_value AS median_booking_value
+          , bookings_source_src_10001.booking_value AS booking_value_p99
+          , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+          , bookings_source_src_10001.is_instant
+          , bookings_source_src_10001.ds AS ds__day
+          , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS ds__week
+          , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
+          , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
+          , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS paid_at__day
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , bookings_source_src_10001.is_instant AS booking__is_instant
+          , bookings_source_src_10001.ds AS booking__ds__day
+          , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
+          , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
+          , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
+          , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS booking__paid_at__day
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , bookings_source_src_10001.listing_id AS listing
+          , bookings_source_src_10001.guest_id AS guest
+          , bookings_source_src_10001.host_id AS host
+          , bookings_source_src_10001.listing_id AS booking__listing
+          , bookings_source_src_10001.guest_id AS booking__guest
+          , bookings_source_src_10001.host_id AS booking__host
+        FROM ***************************.fct_bookings bookings_source_src_10001
+      ) subq_0
+    ) subq_1
+  ) subq_2
+  GROUP BY
+    metric_time__extract_dow
+) subq_3
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0_optimized.sql
new file mode 100644
index 0000000000..9ccede846b
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_date_part__plan0_optimized.sql
@@ -0,0 +1,17 @@
+-- Aggregate Measures
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_dow
+  , SUM(bookings) AS bookings
+FROM (
+  -- Read Elements From Semantic Model 'bookings_source'
+  -- Metric Time Dimension 'ds'
+  -- Pass Only Elements:
+  --   ['bookings', 'metric_time__extract_dow']
+  SELECT
+    EXTRACT(dayofweek FROM ds) AS metric_time__extract_dow
+    , 1 AS bookings
+  FROM ***************************.fct_bookings bookings_source_src_10001
+) subq_6
+GROUP BY
+  metric_time__extract_dow
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0.sql
new file mode 100644
index 0000000000..ec4e2ef1e8
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0.sql
@@ -0,0 +1,258 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_3.metric_time__extract_year
+  , subq_3.metric_time__extract_quarter
+  , subq_3.metric_time__extract_month
+  , subq_3.metric_time__extract_week
+  , subq_3.metric_time__extract_day
+  , subq_3.metric_time__extract_dow
+  , subq_3.metric_time__extract_doy
+  , subq_3.bookings
+FROM (
+  -- Aggregate Measures
+  SELECT
+    subq_2.metric_time__extract_year
+    , subq_2.metric_time__extract_quarter
+    , subq_2.metric_time__extract_month
+    , subq_2.metric_time__extract_week
+    , subq_2.metric_time__extract_day
+    , subq_2.metric_time__extract_dow
+    , subq_2.metric_time__extract_doy
+    , SUM(subq_2.bookings) AS bookings
+  FROM (
+    -- Pass Only Elements:
+    --   ['bookings',
+    --    'metric_time__extract_day',
+    --    'metric_time__extract_dow',
+    --    'metric_time__extract_doy',
+    --    'metric_time__extract_week',
+    --    'metric_time__extract_month',
+    --    'metric_time__extract_quarter',
+    --    'metric_time__extract_year']
+    SELECT
+      subq_1.metric_time__extract_year
+      , subq_1.metric_time__extract_quarter
+      , subq_1.metric_time__extract_month
+      , subq_1.metric_time__extract_week
+      , subq_1.metric_time__extract_day
+      , subq_1.metric_time__extract_dow
+      , subq_1.metric_time__extract_doy
+      , subq_1.bookings
+    FROM (
+      -- Metric Time Dimension 'ds'
+      SELECT
+        subq_0.ds__day
+        , subq_0.ds__week
+        , subq_0.ds__month
+        , subq_0.ds__quarter
+        , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
+        , subq_0.ds_partitioned__day
+        , subq_0.ds_partitioned__week
+        , subq_0.ds_partitioned__month
+        , subq_0.ds_partitioned__quarter
+        , subq_0.ds_partitioned__year
+        , subq_0.ds_partitioned__extract_year
+        , subq_0.ds_partitioned__extract_quarter
+        , subq_0.ds_partitioned__extract_month
+        , subq_0.ds_partitioned__extract_week
+        , subq_0.ds_partitioned__extract_day
+        , subq_0.ds_partitioned__extract_dow
+        , subq_0.ds_partitioned__extract_doy
+        , subq_0.paid_at__day
+        , subq_0.paid_at__week
+        , subq_0.paid_at__month
+        , subq_0.paid_at__quarter
+        , subq_0.paid_at__year
+        , subq_0.paid_at__extract_year
+        , subq_0.paid_at__extract_quarter
+        , subq_0.paid_at__extract_month
+        , subq_0.paid_at__extract_week
+        , subq_0.paid_at__extract_day
+        , subq_0.paid_at__extract_dow
+        , subq_0.paid_at__extract_doy
+        , subq_0.booking__ds__day
+        , subq_0.booking__ds__week
+        , subq_0.booking__ds__month
+        , subq_0.booking__ds__quarter
+        , subq_0.booking__ds__year
+        , subq_0.booking__ds__extract_year
+        , subq_0.booking__ds__extract_quarter
+        , subq_0.booking__ds__extract_month
+        , subq_0.booking__ds__extract_week
+        , subq_0.booking__ds__extract_day
+        , subq_0.booking__ds__extract_dow
+        , subq_0.booking__ds__extract_doy
+        , subq_0.booking__ds_partitioned__day
+        , subq_0.booking__ds_partitioned__week
+        , subq_0.booking__ds_partitioned__month
+        , subq_0.booking__ds_partitioned__quarter
+        , subq_0.booking__ds_partitioned__year
+        , subq_0.booking__ds_partitioned__extract_year
+        , subq_0.booking__ds_partitioned__extract_quarter
+        , subq_0.booking__ds_partitioned__extract_month
+        , subq_0.booking__ds_partitioned__extract_week
+        , subq_0.booking__ds_partitioned__extract_day
+        , subq_0.booking__ds_partitioned__extract_dow
+        , subq_0.booking__ds_partitioned__extract_doy
+        , subq_0.booking__paid_at__day
+        , subq_0.booking__paid_at__week
+        , subq_0.booking__paid_at__month
+        , subq_0.booking__paid_at__quarter
+        , subq_0.booking__paid_at__year
+        , subq_0.booking__paid_at__extract_year
+        , subq_0.booking__paid_at__extract_quarter
+        , subq_0.booking__paid_at__extract_month
+        , subq_0.booking__paid_at__extract_week
+        , subq_0.booking__paid_at__extract_day
+        , subq_0.booking__paid_at__extract_dow
+        , subq_0.booking__paid_at__extract_doy
+        , subq_0.ds__day AS metric_time__day
+        , subq_0.ds__week AS metric_time__week
+        , subq_0.ds__month AS metric_time__month
+        , subq_0.ds__quarter AS metric_time__quarter
+        , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
+        , subq_0.listing
+        , subq_0.guest
+        , subq_0.host
+        , subq_0.booking__listing
+        , subq_0.booking__guest
+        , subq_0.booking__host
+        , subq_0.is_instant
+        , subq_0.booking__is_instant
+        , subq_0.bookings
+        , subq_0.instant_bookings
+        , subq_0.booking_value
+        , subq_0.max_booking_value
+        , subq_0.min_booking_value
+        , subq_0.bookers
+        , subq_0.average_booking_value
+        , subq_0.referred_bookings
+        , subq_0.median_booking_value
+        , subq_0.booking_value_p99
+        , subq_0.discrete_booking_value_p99
+        , subq_0.approximate_continuous_booking_value_p99
+        , subq_0.approximate_discrete_booking_value_p99
+      FROM (
+        -- Read Elements From Semantic Model 'bookings_source'
+        SELECT
+          1 AS bookings
+          , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+          , bookings_source_src_10001.booking_value
+          , bookings_source_src_10001.booking_value AS max_booking_value
+          , bookings_source_src_10001.booking_value AS min_booking_value
+          , bookings_source_src_10001.guest_id AS bookers
+          , bookings_source_src_10001.booking_value AS average_booking_value
+          , bookings_source_src_10001.booking_value AS booking_payments
+          , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+          , bookings_source_src_10001.booking_value AS median_booking_value
+          , bookings_source_src_10001.booking_value AS booking_value_p99
+          , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+          , bookings_source_src_10001.is_instant
+          , bookings_source_src_10001.ds AS ds__day
+          , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS ds__week
+          , DATE_TRUNC(bookings_source_src_10001.ds, month) AS ds__month
+          , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS ds__quarter
+          , DATE_TRUNC(bookings_source_src_10001.ds, year) AS ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS ds_partitioned__quarter
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS paid_at__day
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS paid_at__quarter
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , bookings_source_src_10001.is_instant AS booking__is_instant
+          , bookings_source_src_10001.ds AS booking__ds__day
+          , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
+          , DATE_TRUNC(bookings_source_src_10001.ds, month) AS booking__ds__month
+          , DATE_TRUNC(bookings_source_src_10001.ds, quarter) AS booking__ds__quarter
+          , DATE_TRUNC(bookings_source_src_10001.ds, year) AS booking__ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, quarter) AS booking__ds_partitioned__quarter
+          , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, year) AS booking__ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS booking__paid_at__day
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, quarter) AS booking__paid_at__quarter
+          , DATE_TRUNC(bookings_source_src_10001.paid_at, year) AS booking__paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , bookings_source_src_10001.listing_id AS listing
+          , bookings_source_src_10001.guest_id AS guest
+          , bookings_source_src_10001.host_id AS host
+          , bookings_source_src_10001.listing_id AS booking__listing
+          , bookings_source_src_10001.guest_id AS booking__guest
+          , bookings_source_src_10001.host_id AS booking__host
+        FROM ***************************.fct_bookings bookings_source_src_10001
+      ) subq_0
+    ) subq_1
+  ) subq_2
+  GROUP BY
+    metric_time__extract_year
+    , metric_time__extract_quarter
+    , metric_time__extract_month
+    , metric_time__extract_week
+    , metric_time__extract_day
+    , metric_time__extract_dow
+    , metric_time__extract_doy
+) subq_3
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
new file mode 100644
index 0000000000..1d96b88869
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
@@ -0,0 +1,42 @@
+-- Aggregate Measures
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_year
+  , metric_time__extract_quarter
+  , metric_time__extract_month
+  , metric_time__extract_week
+  , metric_time__extract_day
+  , metric_time__extract_dow
+  , metric_time__extract_doy
+  , SUM(bookings) AS bookings
+FROM (
+  -- Read Elements From Semantic Model 'bookings_source'
+  -- Metric Time Dimension 'ds'
+  -- Pass Only Elements:
+  --   ['bookings',
+  --    'metric_time__extract_day',
+  --    'metric_time__extract_dow',
+  --    'metric_time__extract_doy',
+  --    'metric_time__extract_week',
+  --    'metric_time__extract_month',
+  --    'metric_time__extract_quarter',
+  --    'metric_time__extract_year']
+  SELECT
+    EXTRACT(year FROM ds) AS metric_time__extract_year
+    , EXTRACT(quarter FROM ds) AS metric_time__extract_quarter
+    , EXTRACT(month FROM ds) AS metric_time__extract_month
+    , EXTRACT(isoweek FROM ds) AS metric_time__extract_week
+    , EXTRACT(day FROM ds) AS metric_time__extract_day
+    , EXTRACT(dayofweek FROM ds) AS metric_time__extract_dow
+    , EXTRACT(dayofyear FROM ds) AS metric_time__extract_doy
+    , 1 AS bookings
+  FROM ***************************.fct_bookings bookings_source_src_10001
+) subq_6
+GROUP BY
+  metric_time__extract_year
+  , metric_time__extract_quarter
+  , metric_time__extract_month
+  , metric_time__extract_week
+  , metric_time__extract_day
+  , metric_time__extract_dow
+  , metric_time__extract_doy
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql
index 794337f673..e01a0418ff 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_single_join_node__plan0.sql
@@ -34,10 +34,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -46,10 +46,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -58,10 +58,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
       , bookings_source_src_10001.is_instant AS booking__is_instant
       , bookings_source_src_10001.ds AS booking__ds__day
       , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -71,10 +71,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
       , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
       , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -83,10 +83,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
       , bookings_source_src_10001.paid_at AS booking__paid_at__day
       , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
       , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -95,10 +95,10 @@ FROM (
       , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
       , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
       , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-      , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+      , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
       , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+      , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+      , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
       , bookings_source_src_10001.listing_id AS listing
       , bookings_source_src_10001.guest_id AS guest
       , bookings_source_src_10001.host_id AS host
@@ -128,10 +128,10 @@ LEFT OUTER JOIN (
       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS ds__extract_year
       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS ds__extract_quarter
       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS ds__extract_month
-      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_week
+      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS ds__extract_week
       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS ds__extract_doy
+      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS ds__extract_dow
+      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS ds__extract_doy
       , listings_latest_src_10004.created_at AS created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS created_at__month
@@ -140,10 +140,10 @@ LEFT OUTER JOIN (
       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS created_at__extract_year
       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS created_at__extract_quarter
       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS created_at__extract_month
-      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_week
+      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS created_at__extract_week
       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
+      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS created_at__extract_dow
+      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS created_at__extract_doy
       , listings_latest_src_10004.country AS country_latest
       , listings_latest_src_10004.is_lux AS is_lux_latest
       , listings_latest_src_10004.capacity AS capacity_latest
@@ -155,10 +155,10 @@ LEFT OUTER JOIN (
       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__ds__extract_year
       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__ds__extract_quarter
       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__ds__extract_month
-      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
+      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_week
       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__ds__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
+      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__ds__extract_dow
+      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__ds__extract_doy
       , listings_latest_src_10004.created_at AS listing__created_at__day
       , DATE_TRUNC(listings_latest_src_10004.created_at, isoweek) AS listing__created_at__week
       , DATE_TRUNC(listings_latest_src_10004.created_at, month) AS listing__created_at__month
@@ -167,10 +167,10 @@ LEFT OUTER JOIN (
       , EXTRACT(year FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_year
       , EXTRACT(quarter FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_quarter
       , EXTRACT(month FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_month
-      , EXTRACT(ISOWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
+      , EXTRACT(isoweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_week
       , EXTRACT(day FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_day
-      , EXTRACT(DAYOFWEEK FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
-      , EXTRACT(DAYOFYEAR FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
+      , EXTRACT(dayofweek FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_dow
+      , EXTRACT(dayofyear FROM listings_latest_src_10004.created_at) AS listing__created_at__extract_doy
       , listings_latest_src_10004.country AS listing__country_latest
       , listings_latest_src_10004.is_lux AS listing__is_lux_latest
       , listings_latest_src_10004.capacity AS listing__capacity_latest
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql
index 28daacf7ef..0ba3c40334 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0.sql
@@ -23,10 +23,10 @@ SELECT
   , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
   , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
   , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -35,10 +35,10 @@ SELECT
   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS paid_at__day
   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -47,10 +47,10 @@ SELECT
   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
   , bookings_source_src_10001.is_instant AS booking__is_instant
   , bookings_source_src_10001.ds AS booking__ds__day
   , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -60,10 +60,10 @@ SELECT
   , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
   , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
   , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+  , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
   , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
   , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
   , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -72,10 +72,10 @@ SELECT
   , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
   , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
   , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
   , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+  , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
   , bookings_source_src_10001.paid_at AS booking__paid_at__day
   , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
   , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -84,10 +84,10 @@ SELECT
   , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
   , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
   , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
   , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+  , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
   , bookings_source_src_10001.listing_id AS listing
   , bookings_source_src_10001.guest_id AS guest
   , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql
index b6c163b9eb..3e49f05f72 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/BigQuery/test_source_node__plan0_optimized.sql
@@ -23,10 +23,10 @@ SELECT
   , EXTRACT(year FROM ds) AS ds__extract_year
   , EXTRACT(quarter FROM ds) AS ds__extract_quarter
   , EXTRACT(month FROM ds) AS ds__extract_month
-  , EXTRACT(ISOWEEK FROM ds) AS ds__extract_week
+  , EXTRACT(isoweek FROM ds) AS ds__extract_week
   , EXTRACT(day FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
+  , EXTRACT(dayofweek FROM ds) AS ds__extract_dow
+  , EXTRACT(dayofyear FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS ds_partitioned__month
@@ -35,10 +35,10 @@ SELECT
   , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
   , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
   , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(ISOWEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(isoweek FROM ds_partitioned) AS ds_partitioned__extract_week
   , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_doy
+  , EXTRACT(dayofweek FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(dayofyear FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS paid_at__week
   , DATE_TRUNC(paid_at, month) AS paid_at__month
@@ -47,10 +47,10 @@ SELECT
   , EXTRACT(year FROM paid_at) AS paid_at__extract_year
   , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
   , EXTRACT(month FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(ISOWEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(isoweek FROM paid_at) AS paid_at__extract_week
   , EXTRACT(day FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_doy
+  , EXTRACT(dayofweek FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(dayofyear FROM paid_at) AS paid_at__extract_doy
   , is_instant AS booking__is_instant
   , ds AS booking__ds__day
   , DATE_TRUNC(ds, isoweek) AS booking__ds__week
@@ -60,10 +60,10 @@ SELECT
   , EXTRACT(year FROM ds) AS booking__ds__extract_year
   , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
   , EXTRACT(month FROM ds) AS booking__ds__extract_month
-  , EXTRACT(ISOWEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(isoweek FROM ds) AS booking__ds__extract_week
   , EXTRACT(day FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_doy
+  , EXTRACT(dayofweek FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(dayofyear FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS booking__ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS booking__ds_partitioned__month
@@ -72,10 +72,10 @@ SELECT
   , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
   , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
   , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(ISOWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(isoweek FROM ds_partitioned) AS booking__ds_partitioned__extract_week
   , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
+  , EXTRACT(dayofweek FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(dayofyear FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS booking__paid_at__week
   , DATE_TRUNC(paid_at, month) AS booking__paid_at__month
@@ -84,10 +84,10 @@ SELECT
   , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
   , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
   , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(ISOWEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(isoweek FROM paid_at) AS booking__paid_at__extract_week
   , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_doy
+  , EXTRACT(dayofweek FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(dayofyear FROM paid_at) AS booking__paid_at__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
index d1740a6a39..79946c1bc1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_through_scd_dimension__plan0.sql
@@ -381,25 +381,25 @@ FROM (
             --    'ds__month',
             --    'ds__quarter',
             --    'ds__year',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
+            --    'ds__extract_year',
+            --    'ds__extract_quarter',
+            --    'ds__extract_month',
+            --    'ds__extract_week',
+            --    'ds__extract_day',
+            --    'ds__extract_dow',
+            --    'ds__extract_doy',
             --    'user__ds__day',
             --    'user__ds__week',
             --    'user__ds__month',
             --    'user__ds__quarter',
             --    'user__ds__year',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
+            --    'user__ds__extract_year',
+            --    'user__ds__extract_quarter',
+            --    'user__ds__extract_month',
+            --    'user__ds__extract_week',
+            --    'user__ds__extract_day',
+            --    'user__ds__extract_dow',
+            --    'user__ds__extract_doy',
             --    'user']
             SELECT
               subq_4.ds__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
index 8abc633b9a..1cfb7780a7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multi_hop_to_scd_dimension__plan0.sql
@@ -288,49 +288,49 @@ FROM (
             --    'window_start__month',
             --    'window_start__quarter',
             --    'window_start__year',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
+            --    'window_start__extract_year',
+            --    'window_start__extract_quarter',
+            --    'window_start__extract_month',
+            --    'window_start__extract_week',
+            --    'window_start__extract_day',
+            --    'window_start__extract_dow',
+            --    'window_start__extract_doy',
             --    'window_end__day',
             --    'window_end__week',
             --    'window_end__month',
             --    'window_end__quarter',
             --    'window_end__year',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
+            --    'window_end__extract_year',
+            --    'window_end__extract_quarter',
+            --    'window_end__extract_month',
+            --    'window_end__extract_week',
+            --    'window_end__extract_day',
+            --    'window_end__extract_dow',
+            --    'window_end__extract_doy',
             --    'lux_listing__window_start__day',
             --    'lux_listing__window_start__week',
             --    'lux_listing__window_start__month',
             --    'lux_listing__window_start__quarter',
             --    'lux_listing__window_start__year',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__extract_year',
+            --    'lux_listing__window_start__extract_quarter',
+            --    'lux_listing__window_start__extract_month',
+            --    'lux_listing__window_start__extract_week',
+            --    'lux_listing__window_start__extract_day',
+            --    'lux_listing__window_start__extract_dow',
+            --    'lux_listing__window_start__extract_doy',
             --    'lux_listing__window_end__day',
             --    'lux_listing__window_end__week',
             --    'lux_listing__window_end__month',
             --    'lux_listing__window_end__quarter',
             --    'lux_listing__window_end__year',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__extract_year',
+            --    'lux_listing__window_end__extract_quarter',
+            --    'lux_listing__window_end__extract_month',
+            --    'lux_listing__window_end__extract_week',
+            --    'lux_listing__window_end__extract_day',
+            --    'lux_listing__window_end__extract_dow',
+            --    'lux_listing__window_end__extract_doy',
             --    'lux_listing']
             SELECT
               subq_4.window_start__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
index 99d4dba7cb..0d1825bde4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_multihop_node__plan0.sql
@@ -252,25 +252,25 @@ FROM (
             --    'ds_partitioned__month',
             --    'ds_partitioned__quarter',
             --    'ds_partitioned__year',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
+            --    'ds_partitioned__extract_year',
+            --    'ds_partitioned__extract_quarter',
+            --    'ds_partitioned__extract_month',
+            --    'ds_partitioned__extract_week',
+            --    'ds_partitioned__extract_day',
+            --    'ds_partitioned__extract_dow',
+            --    'ds_partitioned__extract_doy',
             --    'customer_id__ds_partitioned__day',
             --    'customer_id__ds_partitioned__week',
             --    'customer_id__ds_partitioned__month',
             --    'customer_id__ds_partitioned__quarter',
             --    'customer_id__ds_partitioned__year',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__extract_year',
+            --    'customer_id__ds_partitioned__extract_quarter',
+            --    'customer_id__ds_partitioned__extract_month',
+            --    'customer_id__ds_partitioned__extract_week',
+            --    'customer_id__ds_partitioned__extract_day',
+            --    'customer_id__ds_partitioned__extract_dow',
+            --    'customer_id__ds_partitioned__extract_doy',
             --    'customer_id']
             SELECT
               subq_4.ds_partitioned__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0.sql
new file mode 100644
index 0000000000..68e1d3302c
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0.sql
@@ -0,0 +1,585 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_13.metric_time__extract_dow
+  , bookings - bookings_2_weeks_ago AS bookings_growth_2_weeks
+FROM (
+  -- Combine Metrics
+  SELECT
+    COALESCE(subq_4.metric_time__extract_dow, subq_12.metric_time__extract_dow) AS metric_time__extract_dow
+    , subq_4.bookings AS bookings
+    , subq_12.bookings_2_weeks_ago AS bookings_2_weeks_ago
+  FROM (
+    -- Compute Metrics via Expressions
+    SELECT
+      subq_3.metric_time__extract_dow
+      , subq_3.bookings
+    FROM (
+      -- Aggregate Measures
+      SELECT
+        subq_2.metric_time__extract_dow
+        , SUM(subq_2.bookings) AS bookings
+      FROM (
+        -- Pass Only Elements:
+        --   ['bookings', 'metric_time__extract_dow']
+        SELECT
+          subq_1.metric_time__extract_dow
+          , subq_1.bookings
+        FROM (
+          -- Metric Time Dimension 'ds'
+          SELECT
+            subq_0.ds__day
+            , subq_0.ds__week
+            , subq_0.ds__month
+            , subq_0.ds__quarter
+            , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
+            , subq_0.ds_partitioned__day
+            , subq_0.ds_partitioned__week
+            , subq_0.ds_partitioned__month
+            , subq_0.ds_partitioned__quarter
+            , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
+            , subq_0.paid_at__day
+            , subq_0.paid_at__week
+            , subq_0.paid_at__month
+            , subq_0.paid_at__quarter
+            , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
+            , subq_0.booking__ds__day
+            , subq_0.booking__ds__week
+            , subq_0.booking__ds__month
+            , subq_0.booking__ds__quarter
+            , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
+            , subq_0.booking__ds_partitioned__day
+            , subq_0.booking__ds_partitioned__week
+            , subq_0.booking__ds_partitioned__month
+            , subq_0.booking__ds_partitioned__quarter
+            , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
+            , subq_0.booking__paid_at__day
+            , subq_0.booking__paid_at__week
+            , subq_0.booking__paid_at__month
+            , subq_0.booking__paid_at__quarter
+            , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
+            , subq_0.ds__day AS metric_time__day
+            , subq_0.ds__week AS metric_time__week
+            , subq_0.ds__month AS metric_time__month
+            , subq_0.ds__quarter AS metric_time__quarter
+            , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
+            , subq_0.listing
+            , subq_0.guest
+            , subq_0.host
+            , subq_0.booking__listing
+            , subq_0.booking__guest
+            , subq_0.booking__host
+            , subq_0.is_instant
+            , subq_0.booking__is_instant
+            , subq_0.bookings
+            , subq_0.instant_bookings
+            , subq_0.booking_value
+            , subq_0.max_booking_value
+            , subq_0.min_booking_value
+            , subq_0.bookers
+            , subq_0.average_booking_value
+            , subq_0.referred_bookings
+            , subq_0.median_booking_value
+            , subq_0.booking_value_p99
+            , subq_0.discrete_booking_value_p99
+            , subq_0.approximate_continuous_booking_value_p99
+            , subq_0.approximate_discrete_booking_value_p99
+          FROM (
+            -- Read Elements From Semantic Model 'bookings_source'
+            SELECT
+              1 AS bookings
+              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+              , bookings_source_src_10001.booking_value
+              , bookings_source_src_10001.booking_value AS max_booking_value
+              , bookings_source_src_10001.booking_value AS min_booking_value
+              , bookings_source_src_10001.guest_id AS bookers
+              , bookings_source_src_10001.booking_value AS average_booking_value
+              , bookings_source_src_10001.booking_value AS booking_payments
+              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+              , bookings_source_src_10001.booking_value AS median_booking_value
+              , bookings_source_src_10001.booking_value AS booking_value_p99
+              , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+              , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+              , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+              , bookings_source_src_10001.is_instant
+              , bookings_source_src_10001.ds AS ds__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , bookings_source_src_10001.paid_at AS paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , bookings_source_src_10001.is_instant AS booking__is_instant
+              , bookings_source_src_10001.ds AS booking__ds__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , bookings_source_src_10001.paid_at AS booking__paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , bookings_source_src_10001.listing_id AS listing
+              , bookings_source_src_10001.guest_id AS guest
+              , bookings_source_src_10001.host_id AS host
+              , bookings_source_src_10001.listing_id AS booking__listing
+              , bookings_source_src_10001.guest_id AS booking__guest
+              , bookings_source_src_10001.host_id AS booking__host
+            FROM ***************************.fct_bookings bookings_source_src_10001
+          ) subq_0
+        ) subq_1
+      ) subq_2
+      GROUP BY
+        subq_2.metric_time__extract_dow
+    ) subq_3
+  ) subq_4
+  INNER JOIN (
+    -- Compute Metrics via Expressions
+    SELECT
+      subq_11.metric_time__extract_dow
+      , subq_11.bookings AS bookings_2_weeks_ago
+    FROM (
+      -- Aggregate Measures
+      SELECT
+        subq_10.metric_time__extract_dow
+        , SUM(subq_10.bookings) AS bookings
+      FROM (
+        -- Pass Only Elements:
+        --   ['bookings', 'metric_time__extract_dow']
+        SELECT
+          subq_9.metric_time__extract_dow
+          , subq_9.bookings
+        FROM (
+          -- Join to Time Spine Dataset
+          SELECT
+            EXTRACT(dow FROM subq_7.metric_time__day) AS metric_time__extract_dow
+            , subq_6.ds__day AS ds__day
+            , subq_6.ds__week AS ds__week
+            , subq_6.ds__month AS ds__month
+            , subq_6.ds__quarter AS ds__quarter
+            , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
+            , subq_6.ds_partitioned__day AS ds_partitioned__day
+            , subq_6.ds_partitioned__week AS ds_partitioned__week
+            , subq_6.ds_partitioned__month AS ds_partitioned__month
+            , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
+            , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
+            , subq_6.paid_at__day AS paid_at__day
+            , subq_6.paid_at__week AS paid_at__week
+            , subq_6.paid_at__month AS paid_at__month
+            , subq_6.paid_at__quarter AS paid_at__quarter
+            , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
+            , subq_6.booking__ds__day AS booking__ds__day
+            , subq_6.booking__ds__week AS booking__ds__week
+            , subq_6.booking__ds__month AS booking__ds__month
+            , subq_6.booking__ds__quarter AS booking__ds__quarter
+            , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
+            , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
+            , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
+            , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
+            , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
+            , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
+            , subq_6.booking__paid_at__day AS booking__paid_at__day
+            , subq_6.booking__paid_at__week AS booking__paid_at__week
+            , subq_6.booking__paid_at__month AS booking__paid_at__month
+            , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
+            , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
+            , subq_6.listing AS listing
+            , subq_6.guest AS guest
+            , subq_6.host AS host
+            , subq_6.booking__listing AS booking__listing
+            , subq_6.booking__guest AS booking__guest
+            , subq_6.booking__host AS booking__host
+            , subq_6.is_instant AS is_instant
+            , subq_6.booking__is_instant AS booking__is_instant
+            , subq_6.bookings AS bookings
+            , subq_6.instant_bookings AS instant_bookings
+            , subq_6.booking_value AS booking_value
+            , subq_6.max_booking_value AS max_booking_value
+            , subq_6.min_booking_value AS min_booking_value
+            , subq_6.bookers AS bookers
+            , subq_6.average_booking_value AS average_booking_value
+            , subq_6.referred_bookings AS referred_bookings
+            , subq_6.median_booking_value AS median_booking_value
+            , subq_6.booking_value_p99 AS booking_value_p99
+            , subq_6.discrete_booking_value_p99 AS discrete_booking_value_p99
+            , subq_6.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
+            , subq_6.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
+          FROM (
+            -- Date Spine
+            SELECT
+              subq_8.ds AS metric_time__day
+            FROM ***************************.mf_time_spine subq_8
+          ) subq_7
+          INNER JOIN (
+            -- Metric Time Dimension 'ds'
+            SELECT
+              subq_5.ds__day
+              , subq_5.ds__week
+              , subq_5.ds__month
+              , subq_5.ds__quarter
+              , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
+              , subq_5.ds_partitioned__day
+              , subq_5.ds_partitioned__week
+              , subq_5.ds_partitioned__month
+              , subq_5.ds_partitioned__quarter
+              , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
+              , subq_5.paid_at__day
+              , subq_5.paid_at__week
+              , subq_5.paid_at__month
+              , subq_5.paid_at__quarter
+              , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
+              , subq_5.booking__ds__day
+              , subq_5.booking__ds__week
+              , subq_5.booking__ds__month
+              , subq_5.booking__ds__quarter
+              , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
+              , subq_5.booking__ds_partitioned__day
+              , subq_5.booking__ds_partitioned__week
+              , subq_5.booking__ds_partitioned__month
+              , subq_5.booking__ds_partitioned__quarter
+              , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
+              , subq_5.booking__paid_at__day
+              , subq_5.booking__paid_at__week
+              , subq_5.booking__paid_at__month
+              , subq_5.booking__paid_at__quarter
+              , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
+              , subq_5.ds__day AS metric_time__day
+              , subq_5.ds__week AS metric_time__week
+              , subq_5.ds__month AS metric_time__month
+              , subq_5.ds__quarter AS metric_time__quarter
+              , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
+              , subq_5.listing
+              , subq_5.guest
+              , subq_5.host
+              , subq_5.booking__listing
+              , subq_5.booking__guest
+              , subq_5.booking__host
+              , subq_5.is_instant
+              , subq_5.booking__is_instant
+              , subq_5.bookings
+              , subq_5.instant_bookings
+              , subq_5.booking_value
+              , subq_5.max_booking_value
+              , subq_5.min_booking_value
+              , subq_5.bookers
+              , subq_5.average_booking_value
+              , subq_5.referred_bookings
+              , subq_5.median_booking_value
+              , subq_5.booking_value_p99
+              , subq_5.discrete_booking_value_p99
+              , subq_5.approximate_continuous_booking_value_p99
+              , subq_5.approximate_discrete_booking_value_p99
+            FROM (
+              -- Read Elements From Semantic Model 'bookings_source'
+              SELECT
+                1 AS bookings
+                , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+                , bookings_source_src_10001.booking_value
+                , bookings_source_src_10001.booking_value AS max_booking_value
+                , bookings_source_src_10001.booking_value AS min_booking_value
+                , bookings_source_src_10001.guest_id AS bookers
+                , bookings_source_src_10001.booking_value AS average_booking_value
+                , bookings_source_src_10001.booking_value AS booking_payments
+                , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+                , bookings_source_src_10001.booking_value AS median_booking_value
+                , bookings_source_src_10001.booking_value AS booking_value_p99
+                , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+                , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+                , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+                , bookings_source_src_10001.is_instant
+                , bookings_source_src_10001.ds AS ds__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , bookings_source_src_10001.paid_at AS paid_at__day
+                , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+                , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , bookings_source_src_10001.is_instant AS booking__is_instant
+                , bookings_source_src_10001.ds AS booking__ds__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , bookings_source_src_10001.paid_at AS booking__paid_at__day
+                , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+                , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , bookings_source_src_10001.listing_id AS listing
+                , bookings_source_src_10001.guest_id AS guest
+                , bookings_source_src_10001.host_id AS host
+                , bookings_source_src_10001.listing_id AS booking__listing
+                , bookings_source_src_10001.guest_id AS booking__guest
+                , bookings_source_src_10001.host_id AS booking__host
+              FROM ***************************.fct_bookings bookings_source_src_10001
+            ) subq_5
+          ) subq_6
+          ON
+            DATEADD(day, -14, subq_7.metric_time__day) = subq_6.metric_time__day
+        ) subq_9
+      ) subq_10
+      GROUP BY
+        subq_10.metric_time__extract_dow
+    ) subq_11
+  ) subq_12
+  ON
+    (
+      subq_4.metric_time__extract_dow = subq_12.metric_time__extract_dow
+    ) OR (
+      (
+        subq_4.metric_time__extract_dow IS NULL
+      ) AND (
+        subq_12.metric_time__extract_dow IS NULL
+      )
+    )
+) subq_13
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0_optimized.sql
new file mode 100644
index 0000000000..d1a408e031
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_offset_window_with_date_part__plan0_optimized.sql
@@ -0,0 +1,63 @@
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_dow
+  , bookings - bookings_2_weeks_ago AS bookings_growth_2_weeks
+FROM (
+  -- Combine Metrics
+  SELECT
+    COALESCE(subq_18.metric_time__extract_dow, subq_26.metric_time__extract_dow) AS metric_time__extract_dow
+    , subq_18.bookings AS bookings
+    , subq_26.bookings_2_weeks_ago AS bookings_2_weeks_ago
+  FROM (
+    -- Aggregate Measures
+    -- Compute Metrics via Expressions
+    SELECT
+      metric_time__extract_dow
+      , SUM(bookings) AS bookings
+    FROM (
+      -- Read Elements From Semantic Model 'bookings_source'
+      -- Metric Time Dimension 'ds'
+      -- Pass Only Elements:
+      --   ['bookings', 'metric_time__extract_dow']
+      SELECT
+        EXTRACT(dow FROM ds) AS metric_time__extract_dow
+        , 1 AS bookings
+      FROM ***************************.fct_bookings bookings_source_src_10001
+    ) subq_16
+    GROUP BY
+      metric_time__extract_dow
+  ) subq_18
+  INNER JOIN (
+    -- Join to Time Spine Dataset
+    -- Pass Only Elements:
+    --   ['bookings', 'metric_time__extract_dow']
+    -- Aggregate Measures
+    -- Compute Metrics via Expressions
+    SELECT
+      EXTRACT(dow FROM subq_22.ds) AS metric_time__extract_dow
+      , SUM(subq_20.bookings) AS bookings_2_weeks_ago
+    FROM ***************************.mf_time_spine subq_22
+    INNER JOIN (
+      -- Read Elements From Semantic Model 'bookings_source'
+      -- Metric Time Dimension 'ds'
+      SELECT
+        ds AS metric_time__day
+        , 1 AS bookings
+      FROM ***************************.fct_bookings bookings_source_src_10001
+    ) subq_20
+    ON
+      DATEADD(day, -14, subq_22.ds) = subq_20.metric_time__day
+    GROUP BY
+      EXTRACT(dow FROM subq_22.ds)
+  ) subq_26
+  ON
+    (
+      subq_18.metric_time__extract_dow = subq_26.metric_time__extract_dow
+    ) OR (
+      (
+        subq_18.metric_time__extract_dow IS NULL
+      ) AND (
+        subq_26.metric_time__extract_dow IS NULL
+      )
+    )
+) subq_27
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0.sql
new file mode 100644
index 0000000000..3869c341c5
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0.sql
@@ -0,0 +1,227 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_3.metric_time__extract_dow
+  , subq_3.bookings
+FROM (
+  -- Aggregate Measures
+  SELECT
+    subq_2.metric_time__extract_dow
+    , SUM(subq_2.bookings) AS bookings
+  FROM (
+    -- Pass Only Elements:
+    --   ['bookings', 'metric_time__extract_dow']
+    SELECT
+      subq_1.metric_time__extract_dow
+      , subq_1.bookings
+    FROM (
+      -- Metric Time Dimension 'ds'
+      SELECT
+        subq_0.ds__day
+        , subq_0.ds__week
+        , subq_0.ds__month
+        , subq_0.ds__quarter
+        , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
+        , subq_0.ds_partitioned__day
+        , subq_0.ds_partitioned__week
+        , subq_0.ds_partitioned__month
+        , subq_0.ds_partitioned__quarter
+        , subq_0.ds_partitioned__year
+        , subq_0.ds_partitioned__extract_year
+        , subq_0.ds_partitioned__extract_quarter
+        , subq_0.ds_partitioned__extract_month
+        , subq_0.ds_partitioned__extract_week
+        , subq_0.ds_partitioned__extract_day
+        , subq_0.ds_partitioned__extract_dow
+        , subq_0.ds_partitioned__extract_doy
+        , subq_0.paid_at__day
+        , subq_0.paid_at__week
+        , subq_0.paid_at__month
+        , subq_0.paid_at__quarter
+        , subq_0.paid_at__year
+        , subq_0.paid_at__extract_year
+        , subq_0.paid_at__extract_quarter
+        , subq_0.paid_at__extract_month
+        , subq_0.paid_at__extract_week
+        , subq_0.paid_at__extract_day
+        , subq_0.paid_at__extract_dow
+        , subq_0.paid_at__extract_doy
+        , subq_0.booking__ds__day
+        , subq_0.booking__ds__week
+        , subq_0.booking__ds__month
+        , subq_0.booking__ds__quarter
+        , subq_0.booking__ds__year
+        , subq_0.booking__ds__extract_year
+        , subq_0.booking__ds__extract_quarter
+        , subq_0.booking__ds__extract_month
+        , subq_0.booking__ds__extract_week
+        , subq_0.booking__ds__extract_day
+        , subq_0.booking__ds__extract_dow
+        , subq_0.booking__ds__extract_doy
+        , subq_0.booking__ds_partitioned__day
+        , subq_0.booking__ds_partitioned__week
+        , subq_0.booking__ds_partitioned__month
+        , subq_0.booking__ds_partitioned__quarter
+        , subq_0.booking__ds_partitioned__year
+        , subq_0.booking__ds_partitioned__extract_year
+        , subq_0.booking__ds_partitioned__extract_quarter
+        , subq_0.booking__ds_partitioned__extract_month
+        , subq_0.booking__ds_partitioned__extract_week
+        , subq_0.booking__ds_partitioned__extract_day
+        , subq_0.booking__ds_partitioned__extract_dow
+        , subq_0.booking__ds_partitioned__extract_doy
+        , subq_0.booking__paid_at__day
+        , subq_0.booking__paid_at__week
+        , subq_0.booking__paid_at__month
+        , subq_0.booking__paid_at__quarter
+        , subq_0.booking__paid_at__year
+        , subq_0.booking__paid_at__extract_year
+        , subq_0.booking__paid_at__extract_quarter
+        , subq_0.booking__paid_at__extract_month
+        , subq_0.booking__paid_at__extract_week
+        , subq_0.booking__paid_at__extract_day
+        , subq_0.booking__paid_at__extract_dow
+        , subq_0.booking__paid_at__extract_doy
+        , subq_0.ds__day AS metric_time__day
+        , subq_0.ds__week AS metric_time__week
+        , subq_0.ds__month AS metric_time__month
+        , subq_0.ds__quarter AS metric_time__quarter
+        , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
+        , subq_0.listing
+        , subq_0.guest
+        , subq_0.host
+        , subq_0.booking__listing
+        , subq_0.booking__guest
+        , subq_0.booking__host
+        , subq_0.is_instant
+        , subq_0.booking__is_instant
+        , subq_0.bookings
+        , subq_0.instant_bookings
+        , subq_0.booking_value
+        , subq_0.max_booking_value
+        , subq_0.min_booking_value
+        , subq_0.bookers
+        , subq_0.average_booking_value
+        , subq_0.referred_bookings
+        , subq_0.median_booking_value
+        , subq_0.booking_value_p99
+        , subq_0.discrete_booking_value_p99
+        , subq_0.approximate_continuous_booking_value_p99
+        , subq_0.approximate_discrete_booking_value_p99
+      FROM (
+        -- Read Elements From Semantic Model 'bookings_source'
+        SELECT
+          1 AS bookings
+          , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+          , bookings_source_src_10001.booking_value
+          , bookings_source_src_10001.booking_value AS max_booking_value
+          , bookings_source_src_10001.booking_value AS min_booking_value
+          , bookings_source_src_10001.guest_id AS bookers
+          , bookings_source_src_10001.booking_value AS average_booking_value
+          , bookings_source_src_10001.booking_value AS booking_payments
+          , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+          , bookings_source_src_10001.booking_value AS median_booking_value
+          , bookings_source_src_10001.booking_value AS booking_value_p99
+          , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+          , bookings_source_src_10001.is_instant
+          , bookings_source_src_10001.ds AS ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , bookings_source_src_10001.is_instant AS booking__is_instant
+          , bookings_source_src_10001.ds AS booking__ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS booking__paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , bookings_source_src_10001.listing_id AS listing
+          , bookings_source_src_10001.guest_id AS guest
+          , bookings_source_src_10001.host_id AS host
+          , bookings_source_src_10001.listing_id AS booking__listing
+          , bookings_source_src_10001.guest_id AS booking__guest
+          , bookings_source_src_10001.host_id AS booking__host
+        FROM ***************************.fct_bookings bookings_source_src_10001
+      ) subq_0
+    ) subq_1
+  ) subq_2
+  GROUP BY
+    subq_2.metric_time__extract_dow
+) subq_3
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0_optimized.sql
new file mode 100644
index 0000000000..33b25a725c
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_date_part__plan0_optimized.sql
@@ -0,0 +1,17 @@
+-- Aggregate Measures
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_dow
+  , SUM(bookings) AS bookings
+FROM (
+  -- Read Elements From Semantic Model 'bookings_source'
+  -- Metric Time Dimension 'ds'
+  -- Pass Only Elements:
+  --   ['bookings', 'metric_time__extract_dow']
+  SELECT
+    EXTRACT(dow FROM ds) AS metric_time__extract_dow
+    , 1 AS bookings
+  FROM ***************************.fct_bookings bookings_source_src_10001
+) subq_6
+GROUP BY
+  metric_time__extract_dow
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0.sql
new file mode 100644
index 0000000000..b1321ec748
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0.sql
@@ -0,0 +1,258 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_3.metric_time__extract_year
+  , subq_3.metric_time__extract_quarter
+  , subq_3.metric_time__extract_month
+  , subq_3.metric_time__extract_week
+  , subq_3.metric_time__extract_day
+  , subq_3.metric_time__extract_dow
+  , subq_3.metric_time__extract_doy
+  , subq_3.bookings
+FROM (
+  -- Aggregate Measures
+  SELECT
+    subq_2.metric_time__extract_year
+    , subq_2.metric_time__extract_quarter
+    , subq_2.metric_time__extract_month
+    , subq_2.metric_time__extract_week
+    , subq_2.metric_time__extract_day
+    , subq_2.metric_time__extract_dow
+    , subq_2.metric_time__extract_doy
+    , SUM(subq_2.bookings) AS bookings
+  FROM (
+    -- Pass Only Elements:
+    --   ['bookings',
+    --    'metric_time__extract_day',
+    --    'metric_time__extract_dow',
+    --    'metric_time__extract_doy',
+    --    'metric_time__extract_week',
+    --    'metric_time__extract_month',
+    --    'metric_time__extract_quarter',
+    --    'metric_time__extract_year']
+    SELECT
+      subq_1.metric_time__extract_year
+      , subq_1.metric_time__extract_quarter
+      , subq_1.metric_time__extract_month
+      , subq_1.metric_time__extract_week
+      , subq_1.metric_time__extract_day
+      , subq_1.metric_time__extract_dow
+      , subq_1.metric_time__extract_doy
+      , subq_1.bookings
+    FROM (
+      -- Metric Time Dimension 'ds'
+      SELECT
+        subq_0.ds__day
+        , subq_0.ds__week
+        , subq_0.ds__month
+        , subq_0.ds__quarter
+        , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
+        , subq_0.ds_partitioned__day
+        , subq_0.ds_partitioned__week
+        , subq_0.ds_partitioned__month
+        , subq_0.ds_partitioned__quarter
+        , subq_0.ds_partitioned__year
+        , subq_0.ds_partitioned__extract_year
+        , subq_0.ds_partitioned__extract_quarter
+        , subq_0.ds_partitioned__extract_month
+        , subq_0.ds_partitioned__extract_week
+        , subq_0.ds_partitioned__extract_day
+        , subq_0.ds_partitioned__extract_dow
+        , subq_0.ds_partitioned__extract_doy
+        , subq_0.paid_at__day
+        , subq_0.paid_at__week
+        , subq_0.paid_at__month
+        , subq_0.paid_at__quarter
+        , subq_0.paid_at__year
+        , subq_0.paid_at__extract_year
+        , subq_0.paid_at__extract_quarter
+        , subq_0.paid_at__extract_month
+        , subq_0.paid_at__extract_week
+        , subq_0.paid_at__extract_day
+        , subq_0.paid_at__extract_dow
+        , subq_0.paid_at__extract_doy
+        , subq_0.booking__ds__day
+        , subq_0.booking__ds__week
+        , subq_0.booking__ds__month
+        , subq_0.booking__ds__quarter
+        , subq_0.booking__ds__year
+        , subq_0.booking__ds__extract_year
+        , subq_0.booking__ds__extract_quarter
+        , subq_0.booking__ds__extract_month
+        , subq_0.booking__ds__extract_week
+        , subq_0.booking__ds__extract_day
+        , subq_0.booking__ds__extract_dow
+        , subq_0.booking__ds__extract_doy
+        , subq_0.booking__ds_partitioned__day
+        , subq_0.booking__ds_partitioned__week
+        , subq_0.booking__ds_partitioned__month
+        , subq_0.booking__ds_partitioned__quarter
+        , subq_0.booking__ds_partitioned__year
+        , subq_0.booking__ds_partitioned__extract_year
+        , subq_0.booking__ds_partitioned__extract_quarter
+        , subq_0.booking__ds_partitioned__extract_month
+        , subq_0.booking__ds_partitioned__extract_week
+        , subq_0.booking__ds_partitioned__extract_day
+        , subq_0.booking__ds_partitioned__extract_dow
+        , subq_0.booking__ds_partitioned__extract_doy
+        , subq_0.booking__paid_at__day
+        , subq_0.booking__paid_at__week
+        , subq_0.booking__paid_at__month
+        , subq_0.booking__paid_at__quarter
+        , subq_0.booking__paid_at__year
+        , subq_0.booking__paid_at__extract_year
+        , subq_0.booking__paid_at__extract_quarter
+        , subq_0.booking__paid_at__extract_month
+        , subq_0.booking__paid_at__extract_week
+        , subq_0.booking__paid_at__extract_day
+        , subq_0.booking__paid_at__extract_dow
+        , subq_0.booking__paid_at__extract_doy
+        , subq_0.ds__day AS metric_time__day
+        , subq_0.ds__week AS metric_time__week
+        , subq_0.ds__month AS metric_time__month
+        , subq_0.ds__quarter AS metric_time__quarter
+        , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
+        , subq_0.listing
+        , subq_0.guest
+        , subq_0.host
+        , subq_0.booking__listing
+        , subq_0.booking__guest
+        , subq_0.booking__host
+        , subq_0.is_instant
+        , subq_0.booking__is_instant
+        , subq_0.bookings
+        , subq_0.instant_bookings
+        , subq_0.booking_value
+        , subq_0.max_booking_value
+        , subq_0.min_booking_value
+        , subq_0.bookers
+        , subq_0.average_booking_value
+        , subq_0.referred_bookings
+        , subq_0.median_booking_value
+        , subq_0.booking_value_p99
+        , subq_0.discrete_booking_value_p99
+        , subq_0.approximate_continuous_booking_value_p99
+        , subq_0.approximate_discrete_booking_value_p99
+      FROM (
+        -- Read Elements From Semantic Model 'bookings_source'
+        SELECT
+          1 AS bookings
+          , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+          , bookings_source_src_10001.booking_value
+          , bookings_source_src_10001.booking_value AS max_booking_value
+          , bookings_source_src_10001.booking_value AS min_booking_value
+          , bookings_source_src_10001.guest_id AS bookers
+          , bookings_source_src_10001.booking_value AS average_booking_value
+          , bookings_source_src_10001.booking_value AS booking_payments
+          , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+          , bookings_source_src_10001.booking_value AS median_booking_value
+          , bookings_source_src_10001.booking_value AS booking_value_p99
+          , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+          , bookings_source_src_10001.is_instant
+          , bookings_source_src_10001.ds AS ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , bookings_source_src_10001.is_instant AS booking__is_instant
+          , bookings_source_src_10001.ds AS booking__ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS booking__paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , bookings_source_src_10001.listing_id AS listing
+          , bookings_source_src_10001.guest_id AS guest
+          , bookings_source_src_10001.host_id AS host
+          , bookings_source_src_10001.listing_id AS booking__listing
+          , bookings_source_src_10001.guest_id AS booking__guest
+          , bookings_source_src_10001.host_id AS booking__host
+        FROM ***************************.fct_bookings bookings_source_src_10001
+      ) subq_0
+    ) subq_1
+  ) subq_2
+  GROUP BY
+    subq_2.metric_time__extract_year
+    , subq_2.metric_time__extract_quarter
+    , subq_2.metric_time__extract_month
+    , subq_2.metric_time__extract_week
+    , subq_2.metric_time__extract_day
+    , subq_2.metric_time__extract_dow
+    , subq_2.metric_time__extract_doy
+) subq_3
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
new file mode 100644
index 0000000000..402fb4f517
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Databricks/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
@@ -0,0 +1,42 @@
+-- Aggregate Measures
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_year
+  , metric_time__extract_quarter
+  , metric_time__extract_month
+  , metric_time__extract_week
+  , metric_time__extract_day
+  , metric_time__extract_dow
+  , metric_time__extract_doy
+  , SUM(bookings) AS bookings
+FROM (
+  -- Read Elements From Semantic Model 'bookings_source'
+  -- Metric Time Dimension 'ds'
+  -- Pass Only Elements:
+  --   ['bookings',
+  --    'metric_time__extract_day',
+  --    'metric_time__extract_dow',
+  --    'metric_time__extract_doy',
+  --    'metric_time__extract_week',
+  --    'metric_time__extract_month',
+  --    'metric_time__extract_quarter',
+  --    'metric_time__extract_year']
+  SELECT
+    EXTRACT(year FROM ds) AS metric_time__extract_year
+    , EXTRACT(quarter FROM ds) AS metric_time__extract_quarter
+    , EXTRACT(month FROM ds) AS metric_time__extract_month
+    , EXTRACT(week FROM ds) AS metric_time__extract_week
+    , EXTRACT(day FROM ds) AS metric_time__extract_day
+    , EXTRACT(dow FROM ds) AS metric_time__extract_dow
+    , EXTRACT(doy FROM ds) AS metric_time__extract_doy
+    , 1 AS bookings
+  FROM ***************************.fct_bookings bookings_source_src_10001
+) subq_6
+GROUP BY
+  metric_time__extract_year
+  , metric_time__extract_quarter
+  , metric_time__extract_month
+  , metric_time__extract_week
+  , metric_time__extract_day
+  , metric_time__extract_dow
+  , metric_time__extract_doy
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
index d1740a6a39..79946c1bc1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_through_scd_dimension__plan0.sql
@@ -381,25 +381,25 @@ FROM (
             --    'ds__month',
             --    'ds__quarter',
             --    'ds__year',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
+            --    'ds__extract_year',
+            --    'ds__extract_quarter',
+            --    'ds__extract_month',
+            --    'ds__extract_week',
+            --    'ds__extract_day',
+            --    'ds__extract_dow',
+            --    'ds__extract_doy',
             --    'user__ds__day',
             --    'user__ds__week',
             --    'user__ds__month',
             --    'user__ds__quarter',
             --    'user__ds__year',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
+            --    'user__ds__extract_year',
+            --    'user__ds__extract_quarter',
+            --    'user__ds__extract_month',
+            --    'user__ds__extract_week',
+            --    'user__ds__extract_day',
+            --    'user__ds__extract_dow',
+            --    'user__ds__extract_doy',
             --    'user']
             SELECT
               subq_4.ds__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
index 8abc633b9a..1cfb7780a7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multi_hop_to_scd_dimension__plan0.sql
@@ -288,49 +288,49 @@ FROM (
             --    'window_start__month',
             --    'window_start__quarter',
             --    'window_start__year',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
+            --    'window_start__extract_year',
+            --    'window_start__extract_quarter',
+            --    'window_start__extract_month',
+            --    'window_start__extract_week',
+            --    'window_start__extract_day',
+            --    'window_start__extract_dow',
+            --    'window_start__extract_doy',
             --    'window_end__day',
             --    'window_end__week',
             --    'window_end__month',
             --    'window_end__quarter',
             --    'window_end__year',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
+            --    'window_end__extract_year',
+            --    'window_end__extract_quarter',
+            --    'window_end__extract_month',
+            --    'window_end__extract_week',
+            --    'window_end__extract_day',
+            --    'window_end__extract_dow',
+            --    'window_end__extract_doy',
             --    'lux_listing__window_start__day',
             --    'lux_listing__window_start__week',
             --    'lux_listing__window_start__month',
             --    'lux_listing__window_start__quarter',
             --    'lux_listing__window_start__year',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__extract_year',
+            --    'lux_listing__window_start__extract_quarter',
+            --    'lux_listing__window_start__extract_month',
+            --    'lux_listing__window_start__extract_week',
+            --    'lux_listing__window_start__extract_day',
+            --    'lux_listing__window_start__extract_dow',
+            --    'lux_listing__window_start__extract_doy',
             --    'lux_listing__window_end__day',
             --    'lux_listing__window_end__week',
             --    'lux_listing__window_end__month',
             --    'lux_listing__window_end__quarter',
             --    'lux_listing__window_end__year',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__extract_year',
+            --    'lux_listing__window_end__extract_quarter',
+            --    'lux_listing__window_end__extract_month',
+            --    'lux_listing__window_end__extract_week',
+            --    'lux_listing__window_end__extract_day',
+            --    'lux_listing__window_end__extract_dow',
+            --    'lux_listing__window_end__extract_doy',
             --    'lux_listing']
             SELECT
               subq_4.window_start__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
index 99d4dba7cb..0d1825bde4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_multihop_node__plan0.sql
@@ -252,25 +252,25 @@ FROM (
             --    'ds_partitioned__month',
             --    'ds_partitioned__quarter',
             --    'ds_partitioned__year',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
+            --    'ds_partitioned__extract_year',
+            --    'ds_partitioned__extract_quarter',
+            --    'ds_partitioned__extract_month',
+            --    'ds_partitioned__extract_week',
+            --    'ds_partitioned__extract_day',
+            --    'ds_partitioned__extract_dow',
+            --    'ds_partitioned__extract_doy',
             --    'customer_id__ds_partitioned__day',
             --    'customer_id__ds_partitioned__week',
             --    'customer_id__ds_partitioned__month',
             --    'customer_id__ds_partitioned__quarter',
             --    'customer_id__ds_partitioned__year',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__extract_year',
+            --    'customer_id__ds_partitioned__extract_quarter',
+            --    'customer_id__ds_partitioned__extract_month',
+            --    'customer_id__ds_partitioned__extract_week',
+            --    'customer_id__ds_partitioned__extract_day',
+            --    'customer_id__ds_partitioned__extract_dow',
+            --    'customer_id__ds_partitioned__extract_doy',
             --    'customer_id']
             SELECT
               subq_4.ds_partitioned__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0.sql
new file mode 100644
index 0000000000..a65895e8b1
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0.sql
@@ -0,0 +1,585 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_13.metric_time__extract_dow
+  , bookings - bookings_2_weeks_ago AS bookings_growth_2_weeks
+FROM (
+  -- Combine Metrics
+  SELECT
+    COALESCE(subq_4.metric_time__extract_dow, subq_12.metric_time__extract_dow) AS metric_time__extract_dow
+    , subq_4.bookings AS bookings
+    , subq_12.bookings_2_weeks_ago AS bookings_2_weeks_ago
+  FROM (
+    -- Compute Metrics via Expressions
+    SELECT
+      subq_3.metric_time__extract_dow
+      , subq_3.bookings
+    FROM (
+      -- Aggregate Measures
+      SELECT
+        subq_2.metric_time__extract_dow
+        , SUM(subq_2.bookings) AS bookings
+      FROM (
+        -- Pass Only Elements:
+        --   ['bookings', 'metric_time__extract_dow']
+        SELECT
+          subq_1.metric_time__extract_dow
+          , subq_1.bookings
+        FROM (
+          -- Metric Time Dimension 'ds'
+          SELECT
+            subq_0.ds__day
+            , subq_0.ds__week
+            , subq_0.ds__month
+            , subq_0.ds__quarter
+            , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
+            , subq_0.ds_partitioned__day
+            , subq_0.ds_partitioned__week
+            , subq_0.ds_partitioned__month
+            , subq_0.ds_partitioned__quarter
+            , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
+            , subq_0.paid_at__day
+            , subq_0.paid_at__week
+            , subq_0.paid_at__month
+            , subq_0.paid_at__quarter
+            , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
+            , subq_0.booking__ds__day
+            , subq_0.booking__ds__week
+            , subq_0.booking__ds__month
+            , subq_0.booking__ds__quarter
+            , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
+            , subq_0.booking__ds_partitioned__day
+            , subq_0.booking__ds_partitioned__week
+            , subq_0.booking__ds_partitioned__month
+            , subq_0.booking__ds_partitioned__quarter
+            , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
+            , subq_0.booking__paid_at__day
+            , subq_0.booking__paid_at__week
+            , subq_0.booking__paid_at__month
+            , subq_0.booking__paid_at__quarter
+            , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
+            , subq_0.ds__day AS metric_time__day
+            , subq_0.ds__week AS metric_time__week
+            , subq_0.ds__month AS metric_time__month
+            , subq_0.ds__quarter AS metric_time__quarter
+            , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
+            , subq_0.listing
+            , subq_0.guest
+            , subq_0.host
+            , subq_0.booking__listing
+            , subq_0.booking__guest
+            , subq_0.booking__host
+            , subq_0.is_instant
+            , subq_0.booking__is_instant
+            , subq_0.bookings
+            , subq_0.instant_bookings
+            , subq_0.booking_value
+            , subq_0.max_booking_value
+            , subq_0.min_booking_value
+            , subq_0.bookers
+            , subq_0.average_booking_value
+            , subq_0.referred_bookings
+            , subq_0.median_booking_value
+            , subq_0.booking_value_p99
+            , subq_0.discrete_booking_value_p99
+            , subq_0.approximate_continuous_booking_value_p99
+            , subq_0.approximate_discrete_booking_value_p99
+          FROM (
+            -- Read Elements From Semantic Model 'bookings_source'
+            SELECT
+              1 AS bookings
+              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+              , bookings_source_src_10001.booking_value
+              , bookings_source_src_10001.booking_value AS max_booking_value
+              , bookings_source_src_10001.booking_value AS min_booking_value
+              , bookings_source_src_10001.guest_id AS bookers
+              , bookings_source_src_10001.booking_value AS average_booking_value
+              , bookings_source_src_10001.booking_value AS booking_payments
+              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+              , bookings_source_src_10001.booking_value AS median_booking_value
+              , bookings_source_src_10001.booking_value AS booking_value_p99
+              , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+              , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+              , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+              , bookings_source_src_10001.is_instant
+              , bookings_source_src_10001.ds AS ds__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , bookings_source_src_10001.paid_at AS paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , bookings_source_src_10001.is_instant AS booking__is_instant
+              , bookings_source_src_10001.ds AS booking__ds__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , bookings_source_src_10001.paid_at AS booking__paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , bookings_source_src_10001.listing_id AS listing
+              , bookings_source_src_10001.guest_id AS guest
+              , bookings_source_src_10001.host_id AS host
+              , bookings_source_src_10001.listing_id AS booking__listing
+              , bookings_source_src_10001.guest_id AS booking__guest
+              , bookings_source_src_10001.host_id AS booking__host
+            FROM ***************************.fct_bookings bookings_source_src_10001
+          ) subq_0
+        ) subq_1
+      ) subq_2
+      GROUP BY
+        subq_2.metric_time__extract_dow
+    ) subq_3
+  ) subq_4
+  INNER JOIN (
+    -- Compute Metrics via Expressions
+    SELECT
+      subq_11.metric_time__extract_dow
+      , subq_11.bookings AS bookings_2_weeks_ago
+    FROM (
+      -- Aggregate Measures
+      SELECT
+        subq_10.metric_time__extract_dow
+        , SUM(subq_10.bookings) AS bookings
+      FROM (
+        -- Pass Only Elements:
+        --   ['bookings', 'metric_time__extract_dow']
+        SELECT
+          subq_9.metric_time__extract_dow
+          , subq_9.bookings
+        FROM (
+          -- Join to Time Spine Dataset
+          SELECT
+            EXTRACT(dow FROM subq_7.metric_time__day) AS metric_time__extract_dow
+            , subq_6.ds__day AS ds__day
+            , subq_6.ds__week AS ds__week
+            , subq_6.ds__month AS ds__month
+            , subq_6.ds__quarter AS ds__quarter
+            , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
+            , subq_6.ds_partitioned__day AS ds_partitioned__day
+            , subq_6.ds_partitioned__week AS ds_partitioned__week
+            , subq_6.ds_partitioned__month AS ds_partitioned__month
+            , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
+            , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
+            , subq_6.paid_at__day AS paid_at__day
+            , subq_6.paid_at__week AS paid_at__week
+            , subq_6.paid_at__month AS paid_at__month
+            , subq_6.paid_at__quarter AS paid_at__quarter
+            , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
+            , subq_6.booking__ds__day AS booking__ds__day
+            , subq_6.booking__ds__week AS booking__ds__week
+            , subq_6.booking__ds__month AS booking__ds__month
+            , subq_6.booking__ds__quarter AS booking__ds__quarter
+            , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
+            , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
+            , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
+            , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
+            , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
+            , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
+            , subq_6.booking__paid_at__day AS booking__paid_at__day
+            , subq_6.booking__paid_at__week AS booking__paid_at__week
+            , subq_6.booking__paid_at__month AS booking__paid_at__month
+            , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
+            , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
+            , subq_6.listing AS listing
+            , subq_6.guest AS guest
+            , subq_6.host AS host
+            , subq_6.booking__listing AS booking__listing
+            , subq_6.booking__guest AS booking__guest
+            , subq_6.booking__host AS booking__host
+            , subq_6.is_instant AS is_instant
+            , subq_6.booking__is_instant AS booking__is_instant
+            , subq_6.bookings AS bookings
+            , subq_6.instant_bookings AS instant_bookings
+            , subq_6.booking_value AS booking_value
+            , subq_6.max_booking_value AS max_booking_value
+            , subq_6.min_booking_value AS min_booking_value
+            , subq_6.bookers AS bookers
+            , subq_6.average_booking_value AS average_booking_value
+            , subq_6.referred_bookings AS referred_bookings
+            , subq_6.median_booking_value AS median_booking_value
+            , subq_6.booking_value_p99 AS booking_value_p99
+            , subq_6.discrete_booking_value_p99 AS discrete_booking_value_p99
+            , subq_6.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
+            , subq_6.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
+          FROM (
+            -- Date Spine
+            SELECT
+              subq_8.ds AS metric_time__day
+            FROM ***************************.mf_time_spine subq_8
+          ) subq_7
+          INNER JOIN (
+            -- Metric Time Dimension 'ds'
+            SELECT
+              subq_5.ds__day
+              , subq_5.ds__week
+              , subq_5.ds__month
+              , subq_5.ds__quarter
+              , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
+              , subq_5.ds_partitioned__day
+              , subq_5.ds_partitioned__week
+              , subq_5.ds_partitioned__month
+              , subq_5.ds_partitioned__quarter
+              , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
+              , subq_5.paid_at__day
+              , subq_5.paid_at__week
+              , subq_5.paid_at__month
+              , subq_5.paid_at__quarter
+              , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
+              , subq_5.booking__ds__day
+              , subq_5.booking__ds__week
+              , subq_5.booking__ds__month
+              , subq_5.booking__ds__quarter
+              , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
+              , subq_5.booking__ds_partitioned__day
+              , subq_5.booking__ds_partitioned__week
+              , subq_5.booking__ds_partitioned__month
+              , subq_5.booking__ds_partitioned__quarter
+              , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
+              , subq_5.booking__paid_at__day
+              , subq_5.booking__paid_at__week
+              , subq_5.booking__paid_at__month
+              , subq_5.booking__paid_at__quarter
+              , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
+              , subq_5.ds__day AS metric_time__day
+              , subq_5.ds__week AS metric_time__week
+              , subq_5.ds__month AS metric_time__month
+              , subq_5.ds__quarter AS metric_time__quarter
+              , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
+              , subq_5.listing
+              , subq_5.guest
+              , subq_5.host
+              , subq_5.booking__listing
+              , subq_5.booking__guest
+              , subq_5.booking__host
+              , subq_5.is_instant
+              , subq_5.booking__is_instant
+              , subq_5.bookings
+              , subq_5.instant_bookings
+              , subq_5.booking_value
+              , subq_5.max_booking_value
+              , subq_5.min_booking_value
+              , subq_5.bookers
+              , subq_5.average_booking_value
+              , subq_5.referred_bookings
+              , subq_5.median_booking_value
+              , subq_5.booking_value_p99
+              , subq_5.discrete_booking_value_p99
+              , subq_5.approximate_continuous_booking_value_p99
+              , subq_5.approximate_discrete_booking_value_p99
+            FROM (
+              -- Read Elements From Semantic Model 'bookings_source'
+              SELECT
+                1 AS bookings
+                , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+                , bookings_source_src_10001.booking_value
+                , bookings_source_src_10001.booking_value AS max_booking_value
+                , bookings_source_src_10001.booking_value AS min_booking_value
+                , bookings_source_src_10001.guest_id AS bookers
+                , bookings_source_src_10001.booking_value AS average_booking_value
+                , bookings_source_src_10001.booking_value AS booking_payments
+                , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+                , bookings_source_src_10001.booking_value AS median_booking_value
+                , bookings_source_src_10001.booking_value AS booking_value_p99
+                , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+                , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+                , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+                , bookings_source_src_10001.is_instant
+                , bookings_source_src_10001.ds AS ds__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , bookings_source_src_10001.paid_at AS paid_at__day
+                , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+                , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , bookings_source_src_10001.is_instant AS booking__is_instant
+                , bookings_source_src_10001.ds AS booking__ds__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , bookings_source_src_10001.paid_at AS booking__paid_at__day
+                , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+                , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , bookings_source_src_10001.listing_id AS listing
+                , bookings_source_src_10001.guest_id AS guest
+                , bookings_source_src_10001.host_id AS host
+                , bookings_source_src_10001.listing_id AS booking__listing
+                , bookings_source_src_10001.guest_id AS booking__guest
+                , bookings_source_src_10001.host_id AS booking__host
+              FROM ***************************.fct_bookings bookings_source_src_10001
+            ) subq_5
+          ) subq_6
+          ON
+            subq_7.metric_time__day - INTERVAL 14 day = subq_6.metric_time__day
+        ) subq_9
+      ) subq_10
+      GROUP BY
+        subq_10.metric_time__extract_dow
+    ) subq_11
+  ) subq_12
+  ON
+    (
+      subq_4.metric_time__extract_dow = subq_12.metric_time__extract_dow
+    ) OR (
+      (
+        subq_4.metric_time__extract_dow IS NULL
+      ) AND (
+        subq_12.metric_time__extract_dow IS NULL
+      )
+    )
+) subq_13
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0_optimized.sql
new file mode 100644
index 0000000000..5f6ec1ee79
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_offset_window_with_date_part__plan0_optimized.sql
@@ -0,0 +1,63 @@
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_dow
+  , bookings - bookings_2_weeks_ago AS bookings_growth_2_weeks
+FROM (
+  -- Combine Metrics
+  SELECT
+    COALESCE(subq_18.metric_time__extract_dow, subq_26.metric_time__extract_dow) AS metric_time__extract_dow
+    , subq_18.bookings AS bookings
+    , subq_26.bookings_2_weeks_ago AS bookings_2_weeks_ago
+  FROM (
+    -- Aggregate Measures
+    -- Compute Metrics via Expressions
+    SELECT
+      metric_time__extract_dow
+      , SUM(bookings) AS bookings
+    FROM (
+      -- Read Elements From Semantic Model 'bookings_source'
+      -- Metric Time Dimension 'ds'
+      -- Pass Only Elements:
+      --   ['bookings', 'metric_time__extract_dow']
+      SELECT
+        EXTRACT(dow FROM ds) AS metric_time__extract_dow
+        , 1 AS bookings
+      FROM ***************************.fct_bookings bookings_source_src_10001
+    ) subq_16
+    GROUP BY
+      metric_time__extract_dow
+  ) subq_18
+  INNER JOIN (
+    -- Join to Time Spine Dataset
+    -- Pass Only Elements:
+    --   ['bookings', 'metric_time__extract_dow']
+    -- Aggregate Measures
+    -- Compute Metrics via Expressions
+    SELECT
+      EXTRACT(dow FROM subq_22.ds) AS metric_time__extract_dow
+      , SUM(subq_20.bookings) AS bookings_2_weeks_ago
+    FROM ***************************.mf_time_spine subq_22
+    INNER JOIN (
+      -- Read Elements From Semantic Model 'bookings_source'
+      -- Metric Time Dimension 'ds'
+      SELECT
+        ds AS metric_time__day
+        , 1 AS bookings
+      FROM ***************************.fct_bookings bookings_source_src_10001
+    ) subq_20
+    ON
+      subq_22.ds - INTERVAL 14 day = subq_20.metric_time__day
+    GROUP BY
+      EXTRACT(dow FROM subq_22.ds)
+  ) subq_26
+  ON
+    (
+      subq_18.metric_time__extract_dow = subq_26.metric_time__extract_dow
+    ) OR (
+      (
+        subq_18.metric_time__extract_dow IS NULL
+      ) AND (
+        subq_26.metric_time__extract_dow IS NULL
+      )
+    )
+) subq_27
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0.sql
new file mode 100644
index 0000000000..3869c341c5
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0.sql
@@ -0,0 +1,227 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_3.metric_time__extract_dow
+  , subq_3.bookings
+FROM (
+  -- Aggregate Measures
+  SELECT
+    subq_2.metric_time__extract_dow
+    , SUM(subq_2.bookings) AS bookings
+  FROM (
+    -- Pass Only Elements:
+    --   ['bookings', 'metric_time__extract_dow']
+    SELECT
+      subq_1.metric_time__extract_dow
+      , subq_1.bookings
+    FROM (
+      -- Metric Time Dimension 'ds'
+      SELECT
+        subq_0.ds__day
+        , subq_0.ds__week
+        , subq_0.ds__month
+        , subq_0.ds__quarter
+        , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
+        , subq_0.ds_partitioned__day
+        , subq_0.ds_partitioned__week
+        , subq_0.ds_partitioned__month
+        , subq_0.ds_partitioned__quarter
+        , subq_0.ds_partitioned__year
+        , subq_0.ds_partitioned__extract_year
+        , subq_0.ds_partitioned__extract_quarter
+        , subq_0.ds_partitioned__extract_month
+        , subq_0.ds_partitioned__extract_week
+        , subq_0.ds_partitioned__extract_day
+        , subq_0.ds_partitioned__extract_dow
+        , subq_0.ds_partitioned__extract_doy
+        , subq_0.paid_at__day
+        , subq_0.paid_at__week
+        , subq_0.paid_at__month
+        , subq_0.paid_at__quarter
+        , subq_0.paid_at__year
+        , subq_0.paid_at__extract_year
+        , subq_0.paid_at__extract_quarter
+        , subq_0.paid_at__extract_month
+        , subq_0.paid_at__extract_week
+        , subq_0.paid_at__extract_day
+        , subq_0.paid_at__extract_dow
+        , subq_0.paid_at__extract_doy
+        , subq_0.booking__ds__day
+        , subq_0.booking__ds__week
+        , subq_0.booking__ds__month
+        , subq_0.booking__ds__quarter
+        , subq_0.booking__ds__year
+        , subq_0.booking__ds__extract_year
+        , subq_0.booking__ds__extract_quarter
+        , subq_0.booking__ds__extract_month
+        , subq_0.booking__ds__extract_week
+        , subq_0.booking__ds__extract_day
+        , subq_0.booking__ds__extract_dow
+        , subq_0.booking__ds__extract_doy
+        , subq_0.booking__ds_partitioned__day
+        , subq_0.booking__ds_partitioned__week
+        , subq_0.booking__ds_partitioned__month
+        , subq_0.booking__ds_partitioned__quarter
+        , subq_0.booking__ds_partitioned__year
+        , subq_0.booking__ds_partitioned__extract_year
+        , subq_0.booking__ds_partitioned__extract_quarter
+        , subq_0.booking__ds_partitioned__extract_month
+        , subq_0.booking__ds_partitioned__extract_week
+        , subq_0.booking__ds_partitioned__extract_day
+        , subq_0.booking__ds_partitioned__extract_dow
+        , subq_0.booking__ds_partitioned__extract_doy
+        , subq_0.booking__paid_at__day
+        , subq_0.booking__paid_at__week
+        , subq_0.booking__paid_at__month
+        , subq_0.booking__paid_at__quarter
+        , subq_0.booking__paid_at__year
+        , subq_0.booking__paid_at__extract_year
+        , subq_0.booking__paid_at__extract_quarter
+        , subq_0.booking__paid_at__extract_month
+        , subq_0.booking__paid_at__extract_week
+        , subq_0.booking__paid_at__extract_day
+        , subq_0.booking__paid_at__extract_dow
+        , subq_0.booking__paid_at__extract_doy
+        , subq_0.ds__day AS metric_time__day
+        , subq_0.ds__week AS metric_time__week
+        , subq_0.ds__month AS metric_time__month
+        , subq_0.ds__quarter AS metric_time__quarter
+        , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
+        , subq_0.listing
+        , subq_0.guest
+        , subq_0.host
+        , subq_0.booking__listing
+        , subq_0.booking__guest
+        , subq_0.booking__host
+        , subq_0.is_instant
+        , subq_0.booking__is_instant
+        , subq_0.bookings
+        , subq_0.instant_bookings
+        , subq_0.booking_value
+        , subq_0.max_booking_value
+        , subq_0.min_booking_value
+        , subq_0.bookers
+        , subq_0.average_booking_value
+        , subq_0.referred_bookings
+        , subq_0.median_booking_value
+        , subq_0.booking_value_p99
+        , subq_0.discrete_booking_value_p99
+        , subq_0.approximate_continuous_booking_value_p99
+        , subq_0.approximate_discrete_booking_value_p99
+      FROM (
+        -- Read Elements From Semantic Model 'bookings_source'
+        SELECT
+          1 AS bookings
+          , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+          , bookings_source_src_10001.booking_value
+          , bookings_source_src_10001.booking_value AS max_booking_value
+          , bookings_source_src_10001.booking_value AS min_booking_value
+          , bookings_source_src_10001.guest_id AS bookers
+          , bookings_source_src_10001.booking_value AS average_booking_value
+          , bookings_source_src_10001.booking_value AS booking_payments
+          , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+          , bookings_source_src_10001.booking_value AS median_booking_value
+          , bookings_source_src_10001.booking_value AS booking_value_p99
+          , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+          , bookings_source_src_10001.is_instant
+          , bookings_source_src_10001.ds AS ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , bookings_source_src_10001.is_instant AS booking__is_instant
+          , bookings_source_src_10001.ds AS booking__ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS booking__paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , bookings_source_src_10001.listing_id AS listing
+          , bookings_source_src_10001.guest_id AS guest
+          , bookings_source_src_10001.host_id AS host
+          , bookings_source_src_10001.listing_id AS booking__listing
+          , bookings_source_src_10001.guest_id AS booking__guest
+          , bookings_source_src_10001.host_id AS booking__host
+        FROM ***************************.fct_bookings bookings_source_src_10001
+      ) subq_0
+    ) subq_1
+  ) subq_2
+  GROUP BY
+    subq_2.metric_time__extract_dow
+) subq_3
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0_optimized.sql
new file mode 100644
index 0000000000..33b25a725c
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_date_part__plan0_optimized.sql
@@ -0,0 +1,17 @@
+-- Aggregate Measures
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_dow
+  , SUM(bookings) AS bookings
+FROM (
+  -- Read Elements From Semantic Model 'bookings_source'
+  -- Metric Time Dimension 'ds'
+  -- Pass Only Elements:
+  --   ['bookings', 'metric_time__extract_dow']
+  SELECT
+    EXTRACT(dow FROM ds) AS metric_time__extract_dow
+    , 1 AS bookings
+  FROM ***************************.fct_bookings bookings_source_src_10001
+) subq_6
+GROUP BY
+  metric_time__extract_dow
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0.sql
new file mode 100644
index 0000000000..b1321ec748
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0.sql
@@ -0,0 +1,258 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_3.metric_time__extract_year
+  , subq_3.metric_time__extract_quarter
+  , subq_3.metric_time__extract_month
+  , subq_3.metric_time__extract_week
+  , subq_3.metric_time__extract_day
+  , subq_3.metric_time__extract_dow
+  , subq_3.metric_time__extract_doy
+  , subq_3.bookings
+FROM (
+  -- Aggregate Measures
+  SELECT
+    subq_2.metric_time__extract_year
+    , subq_2.metric_time__extract_quarter
+    , subq_2.metric_time__extract_month
+    , subq_2.metric_time__extract_week
+    , subq_2.metric_time__extract_day
+    , subq_2.metric_time__extract_dow
+    , subq_2.metric_time__extract_doy
+    , SUM(subq_2.bookings) AS bookings
+  FROM (
+    -- Pass Only Elements:
+    --   ['bookings',
+    --    'metric_time__extract_day',
+    --    'metric_time__extract_dow',
+    --    'metric_time__extract_doy',
+    --    'metric_time__extract_week',
+    --    'metric_time__extract_month',
+    --    'metric_time__extract_quarter',
+    --    'metric_time__extract_year']
+    SELECT
+      subq_1.metric_time__extract_year
+      , subq_1.metric_time__extract_quarter
+      , subq_1.metric_time__extract_month
+      , subq_1.metric_time__extract_week
+      , subq_1.metric_time__extract_day
+      , subq_1.metric_time__extract_dow
+      , subq_1.metric_time__extract_doy
+      , subq_1.bookings
+    FROM (
+      -- Metric Time Dimension 'ds'
+      SELECT
+        subq_0.ds__day
+        , subq_0.ds__week
+        , subq_0.ds__month
+        , subq_0.ds__quarter
+        , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
+        , subq_0.ds_partitioned__day
+        , subq_0.ds_partitioned__week
+        , subq_0.ds_partitioned__month
+        , subq_0.ds_partitioned__quarter
+        , subq_0.ds_partitioned__year
+        , subq_0.ds_partitioned__extract_year
+        , subq_0.ds_partitioned__extract_quarter
+        , subq_0.ds_partitioned__extract_month
+        , subq_0.ds_partitioned__extract_week
+        , subq_0.ds_partitioned__extract_day
+        , subq_0.ds_partitioned__extract_dow
+        , subq_0.ds_partitioned__extract_doy
+        , subq_0.paid_at__day
+        , subq_0.paid_at__week
+        , subq_0.paid_at__month
+        , subq_0.paid_at__quarter
+        , subq_0.paid_at__year
+        , subq_0.paid_at__extract_year
+        , subq_0.paid_at__extract_quarter
+        , subq_0.paid_at__extract_month
+        , subq_0.paid_at__extract_week
+        , subq_0.paid_at__extract_day
+        , subq_0.paid_at__extract_dow
+        , subq_0.paid_at__extract_doy
+        , subq_0.booking__ds__day
+        , subq_0.booking__ds__week
+        , subq_0.booking__ds__month
+        , subq_0.booking__ds__quarter
+        , subq_0.booking__ds__year
+        , subq_0.booking__ds__extract_year
+        , subq_0.booking__ds__extract_quarter
+        , subq_0.booking__ds__extract_month
+        , subq_0.booking__ds__extract_week
+        , subq_0.booking__ds__extract_day
+        , subq_0.booking__ds__extract_dow
+        , subq_0.booking__ds__extract_doy
+        , subq_0.booking__ds_partitioned__day
+        , subq_0.booking__ds_partitioned__week
+        , subq_0.booking__ds_partitioned__month
+        , subq_0.booking__ds_partitioned__quarter
+        , subq_0.booking__ds_partitioned__year
+        , subq_0.booking__ds_partitioned__extract_year
+        , subq_0.booking__ds_partitioned__extract_quarter
+        , subq_0.booking__ds_partitioned__extract_month
+        , subq_0.booking__ds_partitioned__extract_week
+        , subq_0.booking__ds_partitioned__extract_day
+        , subq_0.booking__ds_partitioned__extract_dow
+        , subq_0.booking__ds_partitioned__extract_doy
+        , subq_0.booking__paid_at__day
+        , subq_0.booking__paid_at__week
+        , subq_0.booking__paid_at__month
+        , subq_0.booking__paid_at__quarter
+        , subq_0.booking__paid_at__year
+        , subq_0.booking__paid_at__extract_year
+        , subq_0.booking__paid_at__extract_quarter
+        , subq_0.booking__paid_at__extract_month
+        , subq_0.booking__paid_at__extract_week
+        , subq_0.booking__paid_at__extract_day
+        , subq_0.booking__paid_at__extract_dow
+        , subq_0.booking__paid_at__extract_doy
+        , subq_0.ds__day AS metric_time__day
+        , subq_0.ds__week AS metric_time__week
+        , subq_0.ds__month AS metric_time__month
+        , subq_0.ds__quarter AS metric_time__quarter
+        , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
+        , subq_0.listing
+        , subq_0.guest
+        , subq_0.host
+        , subq_0.booking__listing
+        , subq_0.booking__guest
+        , subq_0.booking__host
+        , subq_0.is_instant
+        , subq_0.booking__is_instant
+        , subq_0.bookings
+        , subq_0.instant_bookings
+        , subq_0.booking_value
+        , subq_0.max_booking_value
+        , subq_0.min_booking_value
+        , subq_0.bookers
+        , subq_0.average_booking_value
+        , subq_0.referred_bookings
+        , subq_0.median_booking_value
+        , subq_0.booking_value_p99
+        , subq_0.discrete_booking_value_p99
+        , subq_0.approximate_continuous_booking_value_p99
+        , subq_0.approximate_discrete_booking_value_p99
+      FROM (
+        -- Read Elements From Semantic Model 'bookings_source'
+        SELECT
+          1 AS bookings
+          , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+          , bookings_source_src_10001.booking_value
+          , bookings_source_src_10001.booking_value AS max_booking_value
+          , bookings_source_src_10001.booking_value AS min_booking_value
+          , bookings_source_src_10001.guest_id AS bookers
+          , bookings_source_src_10001.booking_value AS average_booking_value
+          , bookings_source_src_10001.booking_value AS booking_payments
+          , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+          , bookings_source_src_10001.booking_value AS median_booking_value
+          , bookings_source_src_10001.booking_value AS booking_value_p99
+          , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+          , bookings_source_src_10001.is_instant
+          , bookings_source_src_10001.ds AS ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , bookings_source_src_10001.is_instant AS booking__is_instant
+          , bookings_source_src_10001.ds AS booking__ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS booking__paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , bookings_source_src_10001.listing_id AS listing
+          , bookings_source_src_10001.guest_id AS guest
+          , bookings_source_src_10001.host_id AS host
+          , bookings_source_src_10001.listing_id AS booking__listing
+          , bookings_source_src_10001.guest_id AS booking__guest
+          , bookings_source_src_10001.host_id AS booking__host
+        FROM ***************************.fct_bookings bookings_source_src_10001
+      ) subq_0
+    ) subq_1
+  ) subq_2
+  GROUP BY
+    subq_2.metric_time__extract_year
+    , subq_2.metric_time__extract_quarter
+    , subq_2.metric_time__extract_month
+    , subq_2.metric_time__extract_week
+    , subq_2.metric_time__extract_day
+    , subq_2.metric_time__extract_dow
+    , subq_2.metric_time__extract_doy
+) subq_3
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
new file mode 100644
index 0000000000..402fb4f517
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/DuckDB/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
@@ -0,0 +1,42 @@
+-- Aggregate Measures
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_year
+  , metric_time__extract_quarter
+  , metric_time__extract_month
+  , metric_time__extract_week
+  , metric_time__extract_day
+  , metric_time__extract_dow
+  , metric_time__extract_doy
+  , SUM(bookings) AS bookings
+FROM (
+  -- Read Elements From Semantic Model 'bookings_source'
+  -- Metric Time Dimension 'ds'
+  -- Pass Only Elements:
+  --   ['bookings',
+  --    'metric_time__extract_day',
+  --    'metric_time__extract_dow',
+  --    'metric_time__extract_doy',
+  --    'metric_time__extract_week',
+  --    'metric_time__extract_month',
+  --    'metric_time__extract_quarter',
+  --    'metric_time__extract_year']
+  SELECT
+    EXTRACT(year FROM ds) AS metric_time__extract_year
+    , EXTRACT(quarter FROM ds) AS metric_time__extract_quarter
+    , EXTRACT(month FROM ds) AS metric_time__extract_month
+    , EXTRACT(week FROM ds) AS metric_time__extract_week
+    , EXTRACT(day FROM ds) AS metric_time__extract_day
+    , EXTRACT(dow FROM ds) AS metric_time__extract_dow
+    , EXTRACT(doy FROM ds) AS metric_time__extract_doy
+    , 1 AS bookings
+  FROM ***************************.fct_bookings bookings_source_src_10001
+) subq_6
+GROUP BY
+  metric_time__extract_year
+  , metric_time__extract_quarter
+  , metric_time__extract_month
+  , metric_time__extract_week
+  , metric_time__extract_day
+  , metric_time__extract_dow
+  , metric_time__extract_doy
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
index d1740a6a39..79946c1bc1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_through_scd_dimension__plan0.sql
@@ -381,25 +381,25 @@ FROM (
             --    'ds__month',
             --    'ds__quarter',
             --    'ds__year',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
+            --    'ds__extract_year',
+            --    'ds__extract_quarter',
+            --    'ds__extract_month',
+            --    'ds__extract_week',
+            --    'ds__extract_day',
+            --    'ds__extract_dow',
+            --    'ds__extract_doy',
             --    'user__ds__day',
             --    'user__ds__week',
             --    'user__ds__month',
             --    'user__ds__quarter',
             --    'user__ds__year',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
+            --    'user__ds__extract_year',
+            --    'user__ds__extract_quarter',
+            --    'user__ds__extract_month',
+            --    'user__ds__extract_week',
+            --    'user__ds__extract_day',
+            --    'user__ds__extract_dow',
+            --    'user__ds__extract_doy',
             --    'user']
             SELECT
               subq_4.ds__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
index 8abc633b9a..1cfb7780a7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multi_hop_to_scd_dimension__plan0.sql
@@ -288,49 +288,49 @@ FROM (
             --    'window_start__month',
             --    'window_start__quarter',
             --    'window_start__year',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
+            --    'window_start__extract_year',
+            --    'window_start__extract_quarter',
+            --    'window_start__extract_month',
+            --    'window_start__extract_week',
+            --    'window_start__extract_day',
+            --    'window_start__extract_dow',
+            --    'window_start__extract_doy',
             --    'window_end__day',
             --    'window_end__week',
             --    'window_end__month',
             --    'window_end__quarter',
             --    'window_end__year',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
+            --    'window_end__extract_year',
+            --    'window_end__extract_quarter',
+            --    'window_end__extract_month',
+            --    'window_end__extract_week',
+            --    'window_end__extract_day',
+            --    'window_end__extract_dow',
+            --    'window_end__extract_doy',
             --    'lux_listing__window_start__day',
             --    'lux_listing__window_start__week',
             --    'lux_listing__window_start__month',
             --    'lux_listing__window_start__quarter',
             --    'lux_listing__window_start__year',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__extract_year',
+            --    'lux_listing__window_start__extract_quarter',
+            --    'lux_listing__window_start__extract_month',
+            --    'lux_listing__window_start__extract_week',
+            --    'lux_listing__window_start__extract_day',
+            --    'lux_listing__window_start__extract_dow',
+            --    'lux_listing__window_start__extract_doy',
             --    'lux_listing__window_end__day',
             --    'lux_listing__window_end__week',
             --    'lux_listing__window_end__month',
             --    'lux_listing__window_end__quarter',
             --    'lux_listing__window_end__year',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__extract_year',
+            --    'lux_listing__window_end__extract_quarter',
+            --    'lux_listing__window_end__extract_month',
+            --    'lux_listing__window_end__extract_week',
+            --    'lux_listing__window_end__extract_day',
+            --    'lux_listing__window_end__extract_dow',
+            --    'lux_listing__window_end__extract_doy',
             --    'lux_listing']
             SELECT
               subq_4.window_start__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
index 99d4dba7cb..0d1825bde4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_multihop_node__plan0.sql
@@ -252,25 +252,25 @@ FROM (
             --    'ds_partitioned__month',
             --    'ds_partitioned__quarter',
             --    'ds_partitioned__year',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
+            --    'ds_partitioned__extract_year',
+            --    'ds_partitioned__extract_quarter',
+            --    'ds_partitioned__extract_month',
+            --    'ds_partitioned__extract_week',
+            --    'ds_partitioned__extract_day',
+            --    'ds_partitioned__extract_dow',
+            --    'ds_partitioned__extract_doy',
             --    'customer_id__ds_partitioned__day',
             --    'customer_id__ds_partitioned__week',
             --    'customer_id__ds_partitioned__month',
             --    'customer_id__ds_partitioned__quarter',
             --    'customer_id__ds_partitioned__year',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__extract_year',
+            --    'customer_id__ds_partitioned__extract_quarter',
+            --    'customer_id__ds_partitioned__extract_month',
+            --    'customer_id__ds_partitioned__extract_week',
+            --    'customer_id__ds_partitioned__extract_day',
+            --    'customer_id__ds_partitioned__extract_dow',
+            --    'customer_id__ds_partitioned__extract_doy',
             --    'customer_id']
             SELECT
               subq_4.ds_partitioned__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0.sql
new file mode 100644
index 0000000000..17b1104b28
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0.sql
@@ -0,0 +1,585 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_13.metric_time__extract_dow
+  , bookings - bookings_2_weeks_ago AS bookings_growth_2_weeks
+FROM (
+  -- Combine Metrics
+  SELECT
+    COALESCE(subq_4.metric_time__extract_dow, subq_12.metric_time__extract_dow) AS metric_time__extract_dow
+    , subq_4.bookings AS bookings
+    , subq_12.bookings_2_weeks_ago AS bookings_2_weeks_ago
+  FROM (
+    -- Compute Metrics via Expressions
+    SELECT
+      subq_3.metric_time__extract_dow
+      , subq_3.bookings
+    FROM (
+      -- Aggregate Measures
+      SELECT
+        subq_2.metric_time__extract_dow
+        , SUM(subq_2.bookings) AS bookings
+      FROM (
+        -- Pass Only Elements:
+        --   ['bookings', 'metric_time__extract_dow']
+        SELECT
+          subq_1.metric_time__extract_dow
+          , subq_1.bookings
+        FROM (
+          -- Metric Time Dimension 'ds'
+          SELECT
+            subq_0.ds__day
+            , subq_0.ds__week
+            , subq_0.ds__month
+            , subq_0.ds__quarter
+            , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
+            , subq_0.ds_partitioned__day
+            , subq_0.ds_partitioned__week
+            , subq_0.ds_partitioned__month
+            , subq_0.ds_partitioned__quarter
+            , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
+            , subq_0.paid_at__day
+            , subq_0.paid_at__week
+            , subq_0.paid_at__month
+            , subq_0.paid_at__quarter
+            , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
+            , subq_0.booking__ds__day
+            , subq_0.booking__ds__week
+            , subq_0.booking__ds__month
+            , subq_0.booking__ds__quarter
+            , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
+            , subq_0.booking__ds_partitioned__day
+            , subq_0.booking__ds_partitioned__week
+            , subq_0.booking__ds_partitioned__month
+            , subq_0.booking__ds_partitioned__quarter
+            , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
+            , subq_0.booking__paid_at__day
+            , subq_0.booking__paid_at__week
+            , subq_0.booking__paid_at__month
+            , subq_0.booking__paid_at__quarter
+            , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
+            , subq_0.ds__day AS metric_time__day
+            , subq_0.ds__week AS metric_time__week
+            , subq_0.ds__month AS metric_time__month
+            , subq_0.ds__quarter AS metric_time__quarter
+            , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
+            , subq_0.listing
+            , subq_0.guest
+            , subq_0.host
+            , subq_0.booking__listing
+            , subq_0.booking__guest
+            , subq_0.booking__host
+            , subq_0.is_instant
+            , subq_0.booking__is_instant
+            , subq_0.bookings
+            , subq_0.instant_bookings
+            , subq_0.booking_value
+            , subq_0.max_booking_value
+            , subq_0.min_booking_value
+            , subq_0.bookers
+            , subq_0.average_booking_value
+            , subq_0.referred_bookings
+            , subq_0.median_booking_value
+            , subq_0.booking_value_p99
+            , subq_0.discrete_booking_value_p99
+            , subq_0.approximate_continuous_booking_value_p99
+            , subq_0.approximate_discrete_booking_value_p99
+          FROM (
+            -- Read Elements From Semantic Model 'bookings_source'
+            SELECT
+              1 AS bookings
+              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+              , bookings_source_src_10001.booking_value
+              , bookings_source_src_10001.booking_value AS max_booking_value
+              , bookings_source_src_10001.booking_value AS min_booking_value
+              , bookings_source_src_10001.guest_id AS bookers
+              , bookings_source_src_10001.booking_value AS average_booking_value
+              , bookings_source_src_10001.booking_value AS booking_payments
+              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+              , bookings_source_src_10001.booking_value AS median_booking_value
+              , bookings_source_src_10001.booking_value AS booking_value_p99
+              , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+              , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+              , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+              , bookings_source_src_10001.is_instant
+              , bookings_source_src_10001.ds AS ds__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , bookings_source_src_10001.paid_at AS paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , bookings_source_src_10001.is_instant AS booking__is_instant
+              , bookings_source_src_10001.ds AS booking__ds__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , bookings_source_src_10001.paid_at AS booking__paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , bookings_source_src_10001.listing_id AS listing
+              , bookings_source_src_10001.guest_id AS guest
+              , bookings_source_src_10001.host_id AS host
+              , bookings_source_src_10001.listing_id AS booking__listing
+              , bookings_source_src_10001.guest_id AS booking__guest
+              , bookings_source_src_10001.host_id AS booking__host
+            FROM ***************************.fct_bookings bookings_source_src_10001
+          ) subq_0
+        ) subq_1
+      ) subq_2
+      GROUP BY
+        subq_2.metric_time__extract_dow
+    ) subq_3
+  ) subq_4
+  INNER JOIN (
+    -- Compute Metrics via Expressions
+    SELECT
+      subq_11.metric_time__extract_dow
+      , subq_11.bookings AS bookings_2_weeks_ago
+    FROM (
+      -- Aggregate Measures
+      SELECT
+        subq_10.metric_time__extract_dow
+        , SUM(subq_10.bookings) AS bookings
+      FROM (
+        -- Pass Only Elements:
+        --   ['bookings', 'metric_time__extract_dow']
+        SELECT
+          subq_9.metric_time__extract_dow
+          , subq_9.bookings
+        FROM (
+          -- Join to Time Spine Dataset
+          SELECT
+            EXTRACT(dow FROM subq_7.metric_time__day) AS metric_time__extract_dow
+            , subq_6.ds__day AS ds__day
+            , subq_6.ds__week AS ds__week
+            , subq_6.ds__month AS ds__month
+            , subq_6.ds__quarter AS ds__quarter
+            , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
+            , subq_6.ds_partitioned__day AS ds_partitioned__day
+            , subq_6.ds_partitioned__week AS ds_partitioned__week
+            , subq_6.ds_partitioned__month AS ds_partitioned__month
+            , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
+            , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
+            , subq_6.paid_at__day AS paid_at__day
+            , subq_6.paid_at__week AS paid_at__week
+            , subq_6.paid_at__month AS paid_at__month
+            , subq_6.paid_at__quarter AS paid_at__quarter
+            , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
+            , subq_6.booking__ds__day AS booking__ds__day
+            , subq_6.booking__ds__week AS booking__ds__week
+            , subq_6.booking__ds__month AS booking__ds__month
+            , subq_6.booking__ds__quarter AS booking__ds__quarter
+            , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
+            , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
+            , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
+            , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
+            , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
+            , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
+            , subq_6.booking__paid_at__day AS booking__paid_at__day
+            , subq_6.booking__paid_at__week AS booking__paid_at__week
+            , subq_6.booking__paid_at__month AS booking__paid_at__month
+            , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
+            , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
+            , subq_6.listing AS listing
+            , subq_6.guest AS guest
+            , subq_6.host AS host
+            , subq_6.booking__listing AS booking__listing
+            , subq_6.booking__guest AS booking__guest
+            , subq_6.booking__host AS booking__host
+            , subq_6.is_instant AS is_instant
+            , subq_6.booking__is_instant AS booking__is_instant
+            , subq_6.bookings AS bookings
+            , subq_6.instant_bookings AS instant_bookings
+            , subq_6.booking_value AS booking_value
+            , subq_6.max_booking_value AS max_booking_value
+            , subq_6.min_booking_value AS min_booking_value
+            , subq_6.bookers AS bookers
+            , subq_6.average_booking_value AS average_booking_value
+            , subq_6.referred_bookings AS referred_bookings
+            , subq_6.median_booking_value AS median_booking_value
+            , subq_6.booking_value_p99 AS booking_value_p99
+            , subq_6.discrete_booking_value_p99 AS discrete_booking_value_p99
+            , subq_6.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
+            , subq_6.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
+          FROM (
+            -- Date Spine
+            SELECT
+              subq_8.ds AS metric_time__day
+            FROM ***************************.mf_time_spine subq_8
+          ) subq_7
+          INNER JOIN (
+            -- Metric Time Dimension 'ds'
+            SELECT
+              subq_5.ds__day
+              , subq_5.ds__week
+              , subq_5.ds__month
+              , subq_5.ds__quarter
+              , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
+              , subq_5.ds_partitioned__day
+              , subq_5.ds_partitioned__week
+              , subq_5.ds_partitioned__month
+              , subq_5.ds_partitioned__quarter
+              , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
+              , subq_5.paid_at__day
+              , subq_5.paid_at__week
+              , subq_5.paid_at__month
+              , subq_5.paid_at__quarter
+              , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
+              , subq_5.booking__ds__day
+              , subq_5.booking__ds__week
+              , subq_5.booking__ds__month
+              , subq_5.booking__ds__quarter
+              , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
+              , subq_5.booking__ds_partitioned__day
+              , subq_5.booking__ds_partitioned__week
+              , subq_5.booking__ds_partitioned__month
+              , subq_5.booking__ds_partitioned__quarter
+              , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
+              , subq_5.booking__paid_at__day
+              , subq_5.booking__paid_at__week
+              , subq_5.booking__paid_at__month
+              , subq_5.booking__paid_at__quarter
+              , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
+              , subq_5.ds__day AS metric_time__day
+              , subq_5.ds__week AS metric_time__week
+              , subq_5.ds__month AS metric_time__month
+              , subq_5.ds__quarter AS metric_time__quarter
+              , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
+              , subq_5.listing
+              , subq_5.guest
+              , subq_5.host
+              , subq_5.booking__listing
+              , subq_5.booking__guest
+              , subq_5.booking__host
+              , subq_5.is_instant
+              , subq_5.booking__is_instant
+              , subq_5.bookings
+              , subq_5.instant_bookings
+              , subq_5.booking_value
+              , subq_5.max_booking_value
+              , subq_5.min_booking_value
+              , subq_5.bookers
+              , subq_5.average_booking_value
+              , subq_5.referred_bookings
+              , subq_5.median_booking_value
+              , subq_5.booking_value_p99
+              , subq_5.discrete_booking_value_p99
+              , subq_5.approximate_continuous_booking_value_p99
+              , subq_5.approximate_discrete_booking_value_p99
+            FROM (
+              -- Read Elements From Semantic Model 'bookings_source'
+              SELECT
+                1 AS bookings
+                , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+                , bookings_source_src_10001.booking_value
+                , bookings_source_src_10001.booking_value AS max_booking_value
+                , bookings_source_src_10001.booking_value AS min_booking_value
+                , bookings_source_src_10001.guest_id AS bookers
+                , bookings_source_src_10001.booking_value AS average_booking_value
+                , bookings_source_src_10001.booking_value AS booking_payments
+                , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+                , bookings_source_src_10001.booking_value AS median_booking_value
+                , bookings_source_src_10001.booking_value AS booking_value_p99
+                , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+                , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+                , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+                , bookings_source_src_10001.is_instant
+                , bookings_source_src_10001.ds AS ds__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , bookings_source_src_10001.paid_at AS paid_at__day
+                , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+                , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , bookings_source_src_10001.is_instant AS booking__is_instant
+                , bookings_source_src_10001.ds AS booking__ds__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , bookings_source_src_10001.paid_at AS booking__paid_at__day
+                , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+                , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , bookings_source_src_10001.listing_id AS listing
+                , bookings_source_src_10001.guest_id AS guest
+                , bookings_source_src_10001.host_id AS host
+                , bookings_source_src_10001.listing_id AS booking__listing
+                , bookings_source_src_10001.guest_id AS booking__guest
+                , bookings_source_src_10001.host_id AS booking__host
+              FROM ***************************.fct_bookings bookings_source_src_10001
+            ) subq_5
+          ) subq_6
+          ON
+            subq_7.metric_time__day - MAKE_INTERVAL(days => 14) = subq_6.metric_time__day
+        ) subq_9
+      ) subq_10
+      GROUP BY
+        subq_10.metric_time__extract_dow
+    ) subq_11
+  ) subq_12
+  ON
+    (
+      subq_4.metric_time__extract_dow = subq_12.metric_time__extract_dow
+    ) OR (
+      (
+        subq_4.metric_time__extract_dow IS NULL
+      ) AND (
+        subq_12.metric_time__extract_dow IS NULL
+      )
+    )
+) subq_13
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0_optimized.sql
new file mode 100644
index 0000000000..0ddba9f210
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_offset_window_with_date_part__plan0_optimized.sql
@@ -0,0 +1,63 @@
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_dow
+  , bookings - bookings_2_weeks_ago AS bookings_growth_2_weeks
+FROM (
+  -- Combine Metrics
+  SELECT
+    COALESCE(subq_18.metric_time__extract_dow, subq_26.metric_time__extract_dow) AS metric_time__extract_dow
+    , subq_18.bookings AS bookings
+    , subq_26.bookings_2_weeks_ago AS bookings_2_weeks_ago
+  FROM (
+    -- Aggregate Measures
+    -- Compute Metrics via Expressions
+    SELECT
+      metric_time__extract_dow
+      , SUM(bookings) AS bookings
+    FROM (
+      -- Read Elements From Semantic Model 'bookings_source'
+      -- Metric Time Dimension 'ds'
+      -- Pass Only Elements:
+      --   ['bookings', 'metric_time__extract_dow']
+      SELECT
+        EXTRACT(dow FROM ds) AS metric_time__extract_dow
+        , 1 AS bookings
+      FROM ***************************.fct_bookings bookings_source_src_10001
+    ) subq_16
+    GROUP BY
+      metric_time__extract_dow
+  ) subq_18
+  INNER JOIN (
+    -- Join to Time Spine Dataset
+    -- Pass Only Elements:
+    --   ['bookings', 'metric_time__extract_dow']
+    -- Aggregate Measures
+    -- Compute Metrics via Expressions
+    SELECT
+      EXTRACT(dow FROM subq_22.ds) AS metric_time__extract_dow
+      , SUM(subq_20.bookings) AS bookings_2_weeks_ago
+    FROM ***************************.mf_time_spine subq_22
+    INNER JOIN (
+      -- Read Elements From Semantic Model 'bookings_source'
+      -- Metric Time Dimension 'ds'
+      SELECT
+        ds AS metric_time__day
+        , 1 AS bookings
+      FROM ***************************.fct_bookings bookings_source_src_10001
+    ) subq_20
+    ON
+      subq_22.ds - MAKE_INTERVAL(days => 14) = subq_20.metric_time__day
+    GROUP BY
+      EXTRACT(dow FROM subq_22.ds)
+  ) subq_26
+  ON
+    (
+      subq_18.metric_time__extract_dow = subq_26.metric_time__extract_dow
+    ) OR (
+      (
+        subq_18.metric_time__extract_dow IS NULL
+      ) AND (
+        subq_26.metric_time__extract_dow IS NULL
+      )
+    )
+) subq_27
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0.sql
new file mode 100644
index 0000000000..3869c341c5
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0.sql
@@ -0,0 +1,227 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_3.metric_time__extract_dow
+  , subq_3.bookings
+FROM (
+  -- Aggregate Measures
+  SELECT
+    subq_2.metric_time__extract_dow
+    , SUM(subq_2.bookings) AS bookings
+  FROM (
+    -- Pass Only Elements:
+    --   ['bookings', 'metric_time__extract_dow']
+    SELECT
+      subq_1.metric_time__extract_dow
+      , subq_1.bookings
+    FROM (
+      -- Metric Time Dimension 'ds'
+      SELECT
+        subq_0.ds__day
+        , subq_0.ds__week
+        , subq_0.ds__month
+        , subq_0.ds__quarter
+        , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
+        , subq_0.ds_partitioned__day
+        , subq_0.ds_partitioned__week
+        , subq_0.ds_partitioned__month
+        , subq_0.ds_partitioned__quarter
+        , subq_0.ds_partitioned__year
+        , subq_0.ds_partitioned__extract_year
+        , subq_0.ds_partitioned__extract_quarter
+        , subq_0.ds_partitioned__extract_month
+        , subq_0.ds_partitioned__extract_week
+        , subq_0.ds_partitioned__extract_day
+        , subq_0.ds_partitioned__extract_dow
+        , subq_0.ds_partitioned__extract_doy
+        , subq_0.paid_at__day
+        , subq_0.paid_at__week
+        , subq_0.paid_at__month
+        , subq_0.paid_at__quarter
+        , subq_0.paid_at__year
+        , subq_0.paid_at__extract_year
+        , subq_0.paid_at__extract_quarter
+        , subq_0.paid_at__extract_month
+        , subq_0.paid_at__extract_week
+        , subq_0.paid_at__extract_day
+        , subq_0.paid_at__extract_dow
+        , subq_0.paid_at__extract_doy
+        , subq_0.booking__ds__day
+        , subq_0.booking__ds__week
+        , subq_0.booking__ds__month
+        , subq_0.booking__ds__quarter
+        , subq_0.booking__ds__year
+        , subq_0.booking__ds__extract_year
+        , subq_0.booking__ds__extract_quarter
+        , subq_0.booking__ds__extract_month
+        , subq_0.booking__ds__extract_week
+        , subq_0.booking__ds__extract_day
+        , subq_0.booking__ds__extract_dow
+        , subq_0.booking__ds__extract_doy
+        , subq_0.booking__ds_partitioned__day
+        , subq_0.booking__ds_partitioned__week
+        , subq_0.booking__ds_partitioned__month
+        , subq_0.booking__ds_partitioned__quarter
+        , subq_0.booking__ds_partitioned__year
+        , subq_0.booking__ds_partitioned__extract_year
+        , subq_0.booking__ds_partitioned__extract_quarter
+        , subq_0.booking__ds_partitioned__extract_month
+        , subq_0.booking__ds_partitioned__extract_week
+        , subq_0.booking__ds_partitioned__extract_day
+        , subq_0.booking__ds_partitioned__extract_dow
+        , subq_0.booking__ds_partitioned__extract_doy
+        , subq_0.booking__paid_at__day
+        , subq_0.booking__paid_at__week
+        , subq_0.booking__paid_at__month
+        , subq_0.booking__paid_at__quarter
+        , subq_0.booking__paid_at__year
+        , subq_0.booking__paid_at__extract_year
+        , subq_0.booking__paid_at__extract_quarter
+        , subq_0.booking__paid_at__extract_month
+        , subq_0.booking__paid_at__extract_week
+        , subq_0.booking__paid_at__extract_day
+        , subq_0.booking__paid_at__extract_dow
+        , subq_0.booking__paid_at__extract_doy
+        , subq_0.ds__day AS metric_time__day
+        , subq_0.ds__week AS metric_time__week
+        , subq_0.ds__month AS metric_time__month
+        , subq_0.ds__quarter AS metric_time__quarter
+        , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
+        , subq_0.listing
+        , subq_0.guest
+        , subq_0.host
+        , subq_0.booking__listing
+        , subq_0.booking__guest
+        , subq_0.booking__host
+        , subq_0.is_instant
+        , subq_0.booking__is_instant
+        , subq_0.bookings
+        , subq_0.instant_bookings
+        , subq_0.booking_value
+        , subq_0.max_booking_value
+        , subq_0.min_booking_value
+        , subq_0.bookers
+        , subq_0.average_booking_value
+        , subq_0.referred_bookings
+        , subq_0.median_booking_value
+        , subq_0.booking_value_p99
+        , subq_0.discrete_booking_value_p99
+        , subq_0.approximate_continuous_booking_value_p99
+        , subq_0.approximate_discrete_booking_value_p99
+      FROM (
+        -- Read Elements From Semantic Model 'bookings_source'
+        SELECT
+          1 AS bookings
+          , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+          , bookings_source_src_10001.booking_value
+          , bookings_source_src_10001.booking_value AS max_booking_value
+          , bookings_source_src_10001.booking_value AS min_booking_value
+          , bookings_source_src_10001.guest_id AS bookers
+          , bookings_source_src_10001.booking_value AS average_booking_value
+          , bookings_source_src_10001.booking_value AS booking_payments
+          , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+          , bookings_source_src_10001.booking_value AS median_booking_value
+          , bookings_source_src_10001.booking_value AS booking_value_p99
+          , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+          , bookings_source_src_10001.is_instant
+          , bookings_source_src_10001.ds AS ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , bookings_source_src_10001.is_instant AS booking__is_instant
+          , bookings_source_src_10001.ds AS booking__ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS booking__paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , bookings_source_src_10001.listing_id AS listing
+          , bookings_source_src_10001.guest_id AS guest
+          , bookings_source_src_10001.host_id AS host
+          , bookings_source_src_10001.listing_id AS booking__listing
+          , bookings_source_src_10001.guest_id AS booking__guest
+          , bookings_source_src_10001.host_id AS booking__host
+        FROM ***************************.fct_bookings bookings_source_src_10001
+      ) subq_0
+    ) subq_1
+  ) subq_2
+  GROUP BY
+    subq_2.metric_time__extract_dow
+) subq_3
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0_optimized.sql
new file mode 100644
index 0000000000..33b25a725c
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_date_part__plan0_optimized.sql
@@ -0,0 +1,17 @@
+-- Aggregate Measures
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_dow
+  , SUM(bookings) AS bookings
+FROM (
+  -- Read Elements From Semantic Model 'bookings_source'
+  -- Metric Time Dimension 'ds'
+  -- Pass Only Elements:
+  --   ['bookings', 'metric_time__extract_dow']
+  SELECT
+    EXTRACT(dow FROM ds) AS metric_time__extract_dow
+    , 1 AS bookings
+  FROM ***************************.fct_bookings bookings_source_src_10001
+) subq_6
+GROUP BY
+  metric_time__extract_dow
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0.sql
new file mode 100644
index 0000000000..b1321ec748
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0.sql
@@ -0,0 +1,258 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_3.metric_time__extract_year
+  , subq_3.metric_time__extract_quarter
+  , subq_3.metric_time__extract_month
+  , subq_3.metric_time__extract_week
+  , subq_3.metric_time__extract_day
+  , subq_3.metric_time__extract_dow
+  , subq_3.metric_time__extract_doy
+  , subq_3.bookings
+FROM (
+  -- Aggregate Measures
+  SELECT
+    subq_2.metric_time__extract_year
+    , subq_2.metric_time__extract_quarter
+    , subq_2.metric_time__extract_month
+    , subq_2.metric_time__extract_week
+    , subq_2.metric_time__extract_day
+    , subq_2.metric_time__extract_dow
+    , subq_2.metric_time__extract_doy
+    , SUM(subq_2.bookings) AS bookings
+  FROM (
+    -- Pass Only Elements:
+    --   ['bookings',
+    --    'metric_time__extract_day',
+    --    'metric_time__extract_dow',
+    --    'metric_time__extract_doy',
+    --    'metric_time__extract_week',
+    --    'metric_time__extract_month',
+    --    'metric_time__extract_quarter',
+    --    'metric_time__extract_year']
+    SELECT
+      subq_1.metric_time__extract_year
+      , subq_1.metric_time__extract_quarter
+      , subq_1.metric_time__extract_month
+      , subq_1.metric_time__extract_week
+      , subq_1.metric_time__extract_day
+      , subq_1.metric_time__extract_dow
+      , subq_1.metric_time__extract_doy
+      , subq_1.bookings
+    FROM (
+      -- Metric Time Dimension 'ds'
+      SELECT
+        subq_0.ds__day
+        , subq_0.ds__week
+        , subq_0.ds__month
+        , subq_0.ds__quarter
+        , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
+        , subq_0.ds_partitioned__day
+        , subq_0.ds_partitioned__week
+        , subq_0.ds_partitioned__month
+        , subq_0.ds_partitioned__quarter
+        , subq_0.ds_partitioned__year
+        , subq_0.ds_partitioned__extract_year
+        , subq_0.ds_partitioned__extract_quarter
+        , subq_0.ds_partitioned__extract_month
+        , subq_0.ds_partitioned__extract_week
+        , subq_0.ds_partitioned__extract_day
+        , subq_0.ds_partitioned__extract_dow
+        , subq_0.ds_partitioned__extract_doy
+        , subq_0.paid_at__day
+        , subq_0.paid_at__week
+        , subq_0.paid_at__month
+        , subq_0.paid_at__quarter
+        , subq_0.paid_at__year
+        , subq_0.paid_at__extract_year
+        , subq_0.paid_at__extract_quarter
+        , subq_0.paid_at__extract_month
+        , subq_0.paid_at__extract_week
+        , subq_0.paid_at__extract_day
+        , subq_0.paid_at__extract_dow
+        , subq_0.paid_at__extract_doy
+        , subq_0.booking__ds__day
+        , subq_0.booking__ds__week
+        , subq_0.booking__ds__month
+        , subq_0.booking__ds__quarter
+        , subq_0.booking__ds__year
+        , subq_0.booking__ds__extract_year
+        , subq_0.booking__ds__extract_quarter
+        , subq_0.booking__ds__extract_month
+        , subq_0.booking__ds__extract_week
+        , subq_0.booking__ds__extract_day
+        , subq_0.booking__ds__extract_dow
+        , subq_0.booking__ds__extract_doy
+        , subq_0.booking__ds_partitioned__day
+        , subq_0.booking__ds_partitioned__week
+        , subq_0.booking__ds_partitioned__month
+        , subq_0.booking__ds_partitioned__quarter
+        , subq_0.booking__ds_partitioned__year
+        , subq_0.booking__ds_partitioned__extract_year
+        , subq_0.booking__ds_partitioned__extract_quarter
+        , subq_0.booking__ds_partitioned__extract_month
+        , subq_0.booking__ds_partitioned__extract_week
+        , subq_0.booking__ds_partitioned__extract_day
+        , subq_0.booking__ds_partitioned__extract_dow
+        , subq_0.booking__ds_partitioned__extract_doy
+        , subq_0.booking__paid_at__day
+        , subq_0.booking__paid_at__week
+        , subq_0.booking__paid_at__month
+        , subq_0.booking__paid_at__quarter
+        , subq_0.booking__paid_at__year
+        , subq_0.booking__paid_at__extract_year
+        , subq_0.booking__paid_at__extract_quarter
+        , subq_0.booking__paid_at__extract_month
+        , subq_0.booking__paid_at__extract_week
+        , subq_0.booking__paid_at__extract_day
+        , subq_0.booking__paid_at__extract_dow
+        , subq_0.booking__paid_at__extract_doy
+        , subq_0.ds__day AS metric_time__day
+        , subq_0.ds__week AS metric_time__week
+        , subq_0.ds__month AS metric_time__month
+        , subq_0.ds__quarter AS metric_time__quarter
+        , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
+        , subq_0.listing
+        , subq_0.guest
+        , subq_0.host
+        , subq_0.booking__listing
+        , subq_0.booking__guest
+        , subq_0.booking__host
+        , subq_0.is_instant
+        , subq_0.booking__is_instant
+        , subq_0.bookings
+        , subq_0.instant_bookings
+        , subq_0.booking_value
+        , subq_0.max_booking_value
+        , subq_0.min_booking_value
+        , subq_0.bookers
+        , subq_0.average_booking_value
+        , subq_0.referred_bookings
+        , subq_0.median_booking_value
+        , subq_0.booking_value_p99
+        , subq_0.discrete_booking_value_p99
+        , subq_0.approximate_continuous_booking_value_p99
+        , subq_0.approximate_discrete_booking_value_p99
+      FROM (
+        -- Read Elements From Semantic Model 'bookings_source'
+        SELECT
+          1 AS bookings
+          , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+          , bookings_source_src_10001.booking_value
+          , bookings_source_src_10001.booking_value AS max_booking_value
+          , bookings_source_src_10001.booking_value AS min_booking_value
+          , bookings_source_src_10001.guest_id AS bookers
+          , bookings_source_src_10001.booking_value AS average_booking_value
+          , bookings_source_src_10001.booking_value AS booking_payments
+          , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+          , bookings_source_src_10001.booking_value AS median_booking_value
+          , bookings_source_src_10001.booking_value AS booking_value_p99
+          , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+          , bookings_source_src_10001.is_instant
+          , bookings_source_src_10001.ds AS ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , bookings_source_src_10001.is_instant AS booking__is_instant
+          , bookings_source_src_10001.ds AS booking__ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS booking__paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , bookings_source_src_10001.listing_id AS listing
+          , bookings_source_src_10001.guest_id AS guest
+          , bookings_source_src_10001.host_id AS host
+          , bookings_source_src_10001.listing_id AS booking__listing
+          , bookings_source_src_10001.guest_id AS booking__guest
+          , bookings_source_src_10001.host_id AS booking__host
+        FROM ***************************.fct_bookings bookings_source_src_10001
+      ) subq_0
+    ) subq_1
+  ) subq_2
+  GROUP BY
+    subq_2.metric_time__extract_year
+    , subq_2.metric_time__extract_quarter
+    , subq_2.metric_time__extract_month
+    , subq_2.metric_time__extract_week
+    , subq_2.metric_time__extract_day
+    , subq_2.metric_time__extract_dow
+    , subq_2.metric_time__extract_doy
+) subq_3
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
new file mode 100644
index 0000000000..402fb4f517
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Postgres/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
@@ -0,0 +1,42 @@
+-- Aggregate Measures
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_year
+  , metric_time__extract_quarter
+  , metric_time__extract_month
+  , metric_time__extract_week
+  , metric_time__extract_day
+  , metric_time__extract_dow
+  , metric_time__extract_doy
+  , SUM(bookings) AS bookings
+FROM (
+  -- Read Elements From Semantic Model 'bookings_source'
+  -- Metric Time Dimension 'ds'
+  -- Pass Only Elements:
+  --   ['bookings',
+  --    'metric_time__extract_day',
+  --    'metric_time__extract_dow',
+  --    'metric_time__extract_doy',
+  --    'metric_time__extract_week',
+  --    'metric_time__extract_month',
+  --    'metric_time__extract_quarter',
+  --    'metric_time__extract_year']
+  SELECT
+    EXTRACT(year FROM ds) AS metric_time__extract_year
+    , EXTRACT(quarter FROM ds) AS metric_time__extract_quarter
+    , EXTRACT(month FROM ds) AS metric_time__extract_month
+    , EXTRACT(week FROM ds) AS metric_time__extract_week
+    , EXTRACT(day FROM ds) AS metric_time__extract_day
+    , EXTRACT(dow FROM ds) AS metric_time__extract_dow
+    , EXTRACT(doy FROM ds) AS metric_time__extract_doy
+    , 1 AS bookings
+  FROM ***************************.fct_bookings bookings_source_src_10001
+) subq_6
+GROUP BY
+  metric_time__extract_year
+  , metric_time__extract_quarter
+  , metric_time__extract_month
+  , metric_time__extract_week
+  , metric_time__extract_day
+  , metric_time__extract_dow
+  , metric_time__extract_doy
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
index d1740a6a39..79946c1bc1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_through_scd_dimension__plan0.sql
@@ -381,25 +381,25 @@ FROM (
             --    'ds__month',
             --    'ds__quarter',
             --    'ds__year',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
+            --    'ds__extract_year',
+            --    'ds__extract_quarter',
+            --    'ds__extract_month',
+            --    'ds__extract_week',
+            --    'ds__extract_day',
+            --    'ds__extract_dow',
+            --    'ds__extract_doy',
             --    'user__ds__day',
             --    'user__ds__week',
             --    'user__ds__month',
             --    'user__ds__quarter',
             --    'user__ds__year',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
+            --    'user__ds__extract_year',
+            --    'user__ds__extract_quarter',
+            --    'user__ds__extract_month',
+            --    'user__ds__extract_week',
+            --    'user__ds__extract_day',
+            --    'user__ds__extract_dow',
+            --    'user__ds__extract_doy',
             --    'user']
             SELECT
               subq_4.ds__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
index 8abc633b9a..1cfb7780a7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multi_hop_to_scd_dimension__plan0.sql
@@ -288,49 +288,49 @@ FROM (
             --    'window_start__month',
             --    'window_start__quarter',
             --    'window_start__year',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
+            --    'window_start__extract_year',
+            --    'window_start__extract_quarter',
+            --    'window_start__extract_month',
+            --    'window_start__extract_week',
+            --    'window_start__extract_day',
+            --    'window_start__extract_dow',
+            --    'window_start__extract_doy',
             --    'window_end__day',
             --    'window_end__week',
             --    'window_end__month',
             --    'window_end__quarter',
             --    'window_end__year',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
+            --    'window_end__extract_year',
+            --    'window_end__extract_quarter',
+            --    'window_end__extract_month',
+            --    'window_end__extract_week',
+            --    'window_end__extract_day',
+            --    'window_end__extract_dow',
+            --    'window_end__extract_doy',
             --    'lux_listing__window_start__day',
             --    'lux_listing__window_start__week',
             --    'lux_listing__window_start__month',
             --    'lux_listing__window_start__quarter',
             --    'lux_listing__window_start__year',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__extract_year',
+            --    'lux_listing__window_start__extract_quarter',
+            --    'lux_listing__window_start__extract_month',
+            --    'lux_listing__window_start__extract_week',
+            --    'lux_listing__window_start__extract_day',
+            --    'lux_listing__window_start__extract_dow',
+            --    'lux_listing__window_start__extract_doy',
             --    'lux_listing__window_end__day',
             --    'lux_listing__window_end__week',
             --    'lux_listing__window_end__month',
             --    'lux_listing__window_end__quarter',
             --    'lux_listing__window_end__year',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__extract_year',
+            --    'lux_listing__window_end__extract_quarter',
+            --    'lux_listing__window_end__extract_month',
+            --    'lux_listing__window_end__extract_week',
+            --    'lux_listing__window_end__extract_day',
+            --    'lux_listing__window_end__extract_dow',
+            --    'lux_listing__window_end__extract_doy',
             --    'lux_listing']
             SELECT
               subq_4.window_start__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
index 99d4dba7cb..0d1825bde4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_multihop_node__plan0.sql
@@ -252,25 +252,25 @@ FROM (
             --    'ds_partitioned__month',
             --    'ds_partitioned__quarter',
             --    'ds_partitioned__year',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
+            --    'ds_partitioned__extract_year',
+            --    'ds_partitioned__extract_quarter',
+            --    'ds_partitioned__extract_month',
+            --    'ds_partitioned__extract_week',
+            --    'ds_partitioned__extract_day',
+            --    'ds_partitioned__extract_dow',
+            --    'ds_partitioned__extract_doy',
             --    'customer_id__ds_partitioned__day',
             --    'customer_id__ds_partitioned__week',
             --    'customer_id__ds_partitioned__month',
             --    'customer_id__ds_partitioned__quarter',
             --    'customer_id__ds_partitioned__year',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__extract_year',
+            --    'customer_id__ds_partitioned__extract_quarter',
+            --    'customer_id__ds_partitioned__extract_month',
+            --    'customer_id__ds_partitioned__extract_week',
+            --    'customer_id__ds_partitioned__extract_day',
+            --    'customer_id__ds_partitioned__extract_dow',
+            --    'customer_id__ds_partitioned__extract_doy',
             --    'customer_id']
             SELECT
               subq_4.ds_partitioned__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0.sql
new file mode 100644
index 0000000000..68e1d3302c
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0.sql
@@ -0,0 +1,585 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_13.metric_time__extract_dow
+  , bookings - bookings_2_weeks_ago AS bookings_growth_2_weeks
+FROM (
+  -- Combine Metrics
+  SELECT
+    COALESCE(subq_4.metric_time__extract_dow, subq_12.metric_time__extract_dow) AS metric_time__extract_dow
+    , subq_4.bookings AS bookings
+    , subq_12.bookings_2_weeks_ago AS bookings_2_weeks_ago
+  FROM (
+    -- Compute Metrics via Expressions
+    SELECT
+      subq_3.metric_time__extract_dow
+      , subq_3.bookings
+    FROM (
+      -- Aggregate Measures
+      SELECT
+        subq_2.metric_time__extract_dow
+        , SUM(subq_2.bookings) AS bookings
+      FROM (
+        -- Pass Only Elements:
+        --   ['bookings', 'metric_time__extract_dow']
+        SELECT
+          subq_1.metric_time__extract_dow
+          , subq_1.bookings
+        FROM (
+          -- Metric Time Dimension 'ds'
+          SELECT
+            subq_0.ds__day
+            , subq_0.ds__week
+            , subq_0.ds__month
+            , subq_0.ds__quarter
+            , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
+            , subq_0.ds_partitioned__day
+            , subq_0.ds_partitioned__week
+            , subq_0.ds_partitioned__month
+            , subq_0.ds_partitioned__quarter
+            , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
+            , subq_0.paid_at__day
+            , subq_0.paid_at__week
+            , subq_0.paid_at__month
+            , subq_0.paid_at__quarter
+            , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
+            , subq_0.booking__ds__day
+            , subq_0.booking__ds__week
+            , subq_0.booking__ds__month
+            , subq_0.booking__ds__quarter
+            , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
+            , subq_0.booking__ds_partitioned__day
+            , subq_0.booking__ds_partitioned__week
+            , subq_0.booking__ds_partitioned__month
+            , subq_0.booking__ds_partitioned__quarter
+            , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
+            , subq_0.booking__paid_at__day
+            , subq_0.booking__paid_at__week
+            , subq_0.booking__paid_at__month
+            , subq_0.booking__paid_at__quarter
+            , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
+            , subq_0.ds__day AS metric_time__day
+            , subq_0.ds__week AS metric_time__week
+            , subq_0.ds__month AS metric_time__month
+            , subq_0.ds__quarter AS metric_time__quarter
+            , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
+            , subq_0.listing
+            , subq_0.guest
+            , subq_0.host
+            , subq_0.booking__listing
+            , subq_0.booking__guest
+            , subq_0.booking__host
+            , subq_0.is_instant
+            , subq_0.booking__is_instant
+            , subq_0.bookings
+            , subq_0.instant_bookings
+            , subq_0.booking_value
+            , subq_0.max_booking_value
+            , subq_0.min_booking_value
+            , subq_0.bookers
+            , subq_0.average_booking_value
+            , subq_0.referred_bookings
+            , subq_0.median_booking_value
+            , subq_0.booking_value_p99
+            , subq_0.discrete_booking_value_p99
+            , subq_0.approximate_continuous_booking_value_p99
+            , subq_0.approximate_discrete_booking_value_p99
+          FROM (
+            -- Read Elements From Semantic Model 'bookings_source'
+            SELECT
+              1 AS bookings
+              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+              , bookings_source_src_10001.booking_value
+              , bookings_source_src_10001.booking_value AS max_booking_value
+              , bookings_source_src_10001.booking_value AS min_booking_value
+              , bookings_source_src_10001.guest_id AS bookers
+              , bookings_source_src_10001.booking_value AS average_booking_value
+              , bookings_source_src_10001.booking_value AS booking_payments
+              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+              , bookings_source_src_10001.booking_value AS median_booking_value
+              , bookings_source_src_10001.booking_value AS booking_value_p99
+              , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+              , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+              , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+              , bookings_source_src_10001.is_instant
+              , bookings_source_src_10001.ds AS ds__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , bookings_source_src_10001.paid_at AS paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , bookings_source_src_10001.is_instant AS booking__is_instant
+              , bookings_source_src_10001.ds AS booking__ds__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , bookings_source_src_10001.paid_at AS booking__paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , bookings_source_src_10001.listing_id AS listing
+              , bookings_source_src_10001.guest_id AS guest
+              , bookings_source_src_10001.host_id AS host
+              , bookings_source_src_10001.listing_id AS booking__listing
+              , bookings_source_src_10001.guest_id AS booking__guest
+              , bookings_source_src_10001.host_id AS booking__host
+            FROM ***************************.fct_bookings bookings_source_src_10001
+          ) subq_0
+        ) subq_1
+      ) subq_2
+      GROUP BY
+        subq_2.metric_time__extract_dow
+    ) subq_3
+  ) subq_4
+  INNER JOIN (
+    -- Compute Metrics via Expressions
+    SELECT
+      subq_11.metric_time__extract_dow
+      , subq_11.bookings AS bookings_2_weeks_ago
+    FROM (
+      -- Aggregate Measures
+      SELECT
+        subq_10.metric_time__extract_dow
+        , SUM(subq_10.bookings) AS bookings
+      FROM (
+        -- Pass Only Elements:
+        --   ['bookings', 'metric_time__extract_dow']
+        SELECT
+          subq_9.metric_time__extract_dow
+          , subq_9.bookings
+        FROM (
+          -- Join to Time Spine Dataset
+          SELECT
+            EXTRACT(dow FROM subq_7.metric_time__day) AS metric_time__extract_dow
+            , subq_6.ds__day AS ds__day
+            , subq_6.ds__week AS ds__week
+            , subq_6.ds__month AS ds__month
+            , subq_6.ds__quarter AS ds__quarter
+            , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
+            , subq_6.ds_partitioned__day AS ds_partitioned__day
+            , subq_6.ds_partitioned__week AS ds_partitioned__week
+            , subq_6.ds_partitioned__month AS ds_partitioned__month
+            , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
+            , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
+            , subq_6.paid_at__day AS paid_at__day
+            , subq_6.paid_at__week AS paid_at__week
+            , subq_6.paid_at__month AS paid_at__month
+            , subq_6.paid_at__quarter AS paid_at__quarter
+            , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
+            , subq_6.booking__ds__day AS booking__ds__day
+            , subq_6.booking__ds__week AS booking__ds__week
+            , subq_6.booking__ds__month AS booking__ds__month
+            , subq_6.booking__ds__quarter AS booking__ds__quarter
+            , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
+            , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
+            , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
+            , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
+            , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
+            , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
+            , subq_6.booking__paid_at__day AS booking__paid_at__day
+            , subq_6.booking__paid_at__week AS booking__paid_at__week
+            , subq_6.booking__paid_at__month AS booking__paid_at__month
+            , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
+            , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
+            , subq_6.listing AS listing
+            , subq_6.guest AS guest
+            , subq_6.host AS host
+            , subq_6.booking__listing AS booking__listing
+            , subq_6.booking__guest AS booking__guest
+            , subq_6.booking__host AS booking__host
+            , subq_6.is_instant AS is_instant
+            , subq_6.booking__is_instant AS booking__is_instant
+            , subq_6.bookings AS bookings
+            , subq_6.instant_bookings AS instant_bookings
+            , subq_6.booking_value AS booking_value
+            , subq_6.max_booking_value AS max_booking_value
+            , subq_6.min_booking_value AS min_booking_value
+            , subq_6.bookers AS bookers
+            , subq_6.average_booking_value AS average_booking_value
+            , subq_6.referred_bookings AS referred_bookings
+            , subq_6.median_booking_value AS median_booking_value
+            , subq_6.booking_value_p99 AS booking_value_p99
+            , subq_6.discrete_booking_value_p99 AS discrete_booking_value_p99
+            , subq_6.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
+            , subq_6.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
+          FROM (
+            -- Date Spine
+            SELECT
+              subq_8.ds AS metric_time__day
+            FROM ***************************.mf_time_spine subq_8
+          ) subq_7
+          INNER JOIN (
+            -- Metric Time Dimension 'ds'
+            SELECT
+              subq_5.ds__day
+              , subq_5.ds__week
+              , subq_5.ds__month
+              , subq_5.ds__quarter
+              , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
+              , subq_5.ds_partitioned__day
+              , subq_5.ds_partitioned__week
+              , subq_5.ds_partitioned__month
+              , subq_5.ds_partitioned__quarter
+              , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
+              , subq_5.paid_at__day
+              , subq_5.paid_at__week
+              , subq_5.paid_at__month
+              , subq_5.paid_at__quarter
+              , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
+              , subq_5.booking__ds__day
+              , subq_5.booking__ds__week
+              , subq_5.booking__ds__month
+              , subq_5.booking__ds__quarter
+              , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
+              , subq_5.booking__ds_partitioned__day
+              , subq_5.booking__ds_partitioned__week
+              , subq_5.booking__ds_partitioned__month
+              , subq_5.booking__ds_partitioned__quarter
+              , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
+              , subq_5.booking__paid_at__day
+              , subq_5.booking__paid_at__week
+              , subq_5.booking__paid_at__month
+              , subq_5.booking__paid_at__quarter
+              , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
+              , subq_5.ds__day AS metric_time__day
+              , subq_5.ds__week AS metric_time__week
+              , subq_5.ds__month AS metric_time__month
+              , subq_5.ds__quarter AS metric_time__quarter
+              , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
+              , subq_5.listing
+              , subq_5.guest
+              , subq_5.host
+              , subq_5.booking__listing
+              , subq_5.booking__guest
+              , subq_5.booking__host
+              , subq_5.is_instant
+              , subq_5.booking__is_instant
+              , subq_5.bookings
+              , subq_5.instant_bookings
+              , subq_5.booking_value
+              , subq_5.max_booking_value
+              , subq_5.min_booking_value
+              , subq_5.bookers
+              , subq_5.average_booking_value
+              , subq_5.referred_bookings
+              , subq_5.median_booking_value
+              , subq_5.booking_value_p99
+              , subq_5.discrete_booking_value_p99
+              , subq_5.approximate_continuous_booking_value_p99
+              , subq_5.approximate_discrete_booking_value_p99
+            FROM (
+              -- Read Elements From Semantic Model 'bookings_source'
+              SELECT
+                1 AS bookings
+                , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+                , bookings_source_src_10001.booking_value
+                , bookings_source_src_10001.booking_value AS max_booking_value
+                , bookings_source_src_10001.booking_value AS min_booking_value
+                , bookings_source_src_10001.guest_id AS bookers
+                , bookings_source_src_10001.booking_value AS average_booking_value
+                , bookings_source_src_10001.booking_value AS booking_payments
+                , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+                , bookings_source_src_10001.booking_value AS median_booking_value
+                , bookings_source_src_10001.booking_value AS booking_value_p99
+                , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+                , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+                , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+                , bookings_source_src_10001.is_instant
+                , bookings_source_src_10001.ds AS ds__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , bookings_source_src_10001.paid_at AS paid_at__day
+                , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+                , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , bookings_source_src_10001.is_instant AS booking__is_instant
+                , bookings_source_src_10001.ds AS booking__ds__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , bookings_source_src_10001.paid_at AS booking__paid_at__day
+                , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+                , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , bookings_source_src_10001.listing_id AS listing
+                , bookings_source_src_10001.guest_id AS guest
+                , bookings_source_src_10001.host_id AS host
+                , bookings_source_src_10001.listing_id AS booking__listing
+                , bookings_source_src_10001.guest_id AS booking__guest
+                , bookings_source_src_10001.host_id AS booking__host
+              FROM ***************************.fct_bookings bookings_source_src_10001
+            ) subq_5
+          ) subq_6
+          ON
+            DATEADD(day, -14, subq_7.metric_time__day) = subq_6.metric_time__day
+        ) subq_9
+      ) subq_10
+      GROUP BY
+        subq_10.metric_time__extract_dow
+    ) subq_11
+  ) subq_12
+  ON
+    (
+      subq_4.metric_time__extract_dow = subq_12.metric_time__extract_dow
+    ) OR (
+      (
+        subq_4.metric_time__extract_dow IS NULL
+      ) AND (
+        subq_12.metric_time__extract_dow IS NULL
+      )
+    )
+) subq_13
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0_optimized.sql
new file mode 100644
index 0000000000..d1a408e031
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_offset_window_with_date_part__plan0_optimized.sql
@@ -0,0 +1,63 @@
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_dow
+  , bookings - bookings_2_weeks_ago AS bookings_growth_2_weeks
+FROM (
+  -- Combine Metrics
+  SELECT
+    COALESCE(subq_18.metric_time__extract_dow, subq_26.metric_time__extract_dow) AS metric_time__extract_dow
+    , subq_18.bookings AS bookings
+    , subq_26.bookings_2_weeks_ago AS bookings_2_weeks_ago
+  FROM (
+    -- Aggregate Measures
+    -- Compute Metrics via Expressions
+    SELECT
+      metric_time__extract_dow
+      , SUM(bookings) AS bookings
+    FROM (
+      -- Read Elements From Semantic Model 'bookings_source'
+      -- Metric Time Dimension 'ds'
+      -- Pass Only Elements:
+      --   ['bookings', 'metric_time__extract_dow']
+      SELECT
+        EXTRACT(dow FROM ds) AS metric_time__extract_dow
+        , 1 AS bookings
+      FROM ***************************.fct_bookings bookings_source_src_10001
+    ) subq_16
+    GROUP BY
+      metric_time__extract_dow
+  ) subq_18
+  INNER JOIN (
+    -- Join to Time Spine Dataset
+    -- Pass Only Elements:
+    --   ['bookings', 'metric_time__extract_dow']
+    -- Aggregate Measures
+    -- Compute Metrics via Expressions
+    SELECT
+      EXTRACT(dow FROM subq_22.ds) AS metric_time__extract_dow
+      , SUM(subq_20.bookings) AS bookings_2_weeks_ago
+    FROM ***************************.mf_time_spine subq_22
+    INNER JOIN (
+      -- Read Elements From Semantic Model 'bookings_source'
+      -- Metric Time Dimension 'ds'
+      SELECT
+        ds AS metric_time__day
+        , 1 AS bookings
+      FROM ***************************.fct_bookings bookings_source_src_10001
+    ) subq_20
+    ON
+      DATEADD(day, -14, subq_22.ds) = subq_20.metric_time__day
+    GROUP BY
+      EXTRACT(dow FROM subq_22.ds)
+  ) subq_26
+  ON
+    (
+      subq_18.metric_time__extract_dow = subq_26.metric_time__extract_dow
+    ) OR (
+      (
+        subq_18.metric_time__extract_dow IS NULL
+      ) AND (
+        subq_26.metric_time__extract_dow IS NULL
+      )
+    )
+) subq_27
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0.sql
new file mode 100644
index 0000000000..3869c341c5
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0.sql
@@ -0,0 +1,227 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_3.metric_time__extract_dow
+  , subq_3.bookings
+FROM (
+  -- Aggregate Measures
+  SELECT
+    subq_2.metric_time__extract_dow
+    , SUM(subq_2.bookings) AS bookings
+  FROM (
+    -- Pass Only Elements:
+    --   ['bookings', 'metric_time__extract_dow']
+    SELECT
+      subq_1.metric_time__extract_dow
+      , subq_1.bookings
+    FROM (
+      -- Metric Time Dimension 'ds'
+      SELECT
+        subq_0.ds__day
+        , subq_0.ds__week
+        , subq_0.ds__month
+        , subq_0.ds__quarter
+        , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
+        , subq_0.ds_partitioned__day
+        , subq_0.ds_partitioned__week
+        , subq_0.ds_partitioned__month
+        , subq_0.ds_partitioned__quarter
+        , subq_0.ds_partitioned__year
+        , subq_0.ds_partitioned__extract_year
+        , subq_0.ds_partitioned__extract_quarter
+        , subq_0.ds_partitioned__extract_month
+        , subq_0.ds_partitioned__extract_week
+        , subq_0.ds_partitioned__extract_day
+        , subq_0.ds_partitioned__extract_dow
+        , subq_0.ds_partitioned__extract_doy
+        , subq_0.paid_at__day
+        , subq_0.paid_at__week
+        , subq_0.paid_at__month
+        , subq_0.paid_at__quarter
+        , subq_0.paid_at__year
+        , subq_0.paid_at__extract_year
+        , subq_0.paid_at__extract_quarter
+        , subq_0.paid_at__extract_month
+        , subq_0.paid_at__extract_week
+        , subq_0.paid_at__extract_day
+        , subq_0.paid_at__extract_dow
+        , subq_0.paid_at__extract_doy
+        , subq_0.booking__ds__day
+        , subq_0.booking__ds__week
+        , subq_0.booking__ds__month
+        , subq_0.booking__ds__quarter
+        , subq_0.booking__ds__year
+        , subq_0.booking__ds__extract_year
+        , subq_0.booking__ds__extract_quarter
+        , subq_0.booking__ds__extract_month
+        , subq_0.booking__ds__extract_week
+        , subq_0.booking__ds__extract_day
+        , subq_0.booking__ds__extract_dow
+        , subq_0.booking__ds__extract_doy
+        , subq_0.booking__ds_partitioned__day
+        , subq_0.booking__ds_partitioned__week
+        , subq_0.booking__ds_partitioned__month
+        , subq_0.booking__ds_partitioned__quarter
+        , subq_0.booking__ds_partitioned__year
+        , subq_0.booking__ds_partitioned__extract_year
+        , subq_0.booking__ds_partitioned__extract_quarter
+        , subq_0.booking__ds_partitioned__extract_month
+        , subq_0.booking__ds_partitioned__extract_week
+        , subq_0.booking__ds_partitioned__extract_day
+        , subq_0.booking__ds_partitioned__extract_dow
+        , subq_0.booking__ds_partitioned__extract_doy
+        , subq_0.booking__paid_at__day
+        , subq_0.booking__paid_at__week
+        , subq_0.booking__paid_at__month
+        , subq_0.booking__paid_at__quarter
+        , subq_0.booking__paid_at__year
+        , subq_0.booking__paid_at__extract_year
+        , subq_0.booking__paid_at__extract_quarter
+        , subq_0.booking__paid_at__extract_month
+        , subq_0.booking__paid_at__extract_week
+        , subq_0.booking__paid_at__extract_day
+        , subq_0.booking__paid_at__extract_dow
+        , subq_0.booking__paid_at__extract_doy
+        , subq_0.ds__day AS metric_time__day
+        , subq_0.ds__week AS metric_time__week
+        , subq_0.ds__month AS metric_time__month
+        , subq_0.ds__quarter AS metric_time__quarter
+        , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
+        , subq_0.listing
+        , subq_0.guest
+        , subq_0.host
+        , subq_0.booking__listing
+        , subq_0.booking__guest
+        , subq_0.booking__host
+        , subq_0.is_instant
+        , subq_0.booking__is_instant
+        , subq_0.bookings
+        , subq_0.instant_bookings
+        , subq_0.booking_value
+        , subq_0.max_booking_value
+        , subq_0.min_booking_value
+        , subq_0.bookers
+        , subq_0.average_booking_value
+        , subq_0.referred_bookings
+        , subq_0.median_booking_value
+        , subq_0.booking_value_p99
+        , subq_0.discrete_booking_value_p99
+        , subq_0.approximate_continuous_booking_value_p99
+        , subq_0.approximate_discrete_booking_value_p99
+      FROM (
+        -- Read Elements From Semantic Model 'bookings_source'
+        SELECT
+          1 AS bookings
+          , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+          , bookings_source_src_10001.booking_value
+          , bookings_source_src_10001.booking_value AS max_booking_value
+          , bookings_source_src_10001.booking_value AS min_booking_value
+          , bookings_source_src_10001.guest_id AS bookers
+          , bookings_source_src_10001.booking_value AS average_booking_value
+          , bookings_source_src_10001.booking_value AS booking_payments
+          , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+          , bookings_source_src_10001.booking_value AS median_booking_value
+          , bookings_source_src_10001.booking_value AS booking_value_p99
+          , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+          , bookings_source_src_10001.is_instant
+          , bookings_source_src_10001.ds AS ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , bookings_source_src_10001.is_instant AS booking__is_instant
+          , bookings_source_src_10001.ds AS booking__ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS booking__paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , bookings_source_src_10001.listing_id AS listing
+          , bookings_source_src_10001.guest_id AS guest
+          , bookings_source_src_10001.host_id AS host
+          , bookings_source_src_10001.listing_id AS booking__listing
+          , bookings_source_src_10001.guest_id AS booking__guest
+          , bookings_source_src_10001.host_id AS booking__host
+        FROM ***************************.fct_bookings bookings_source_src_10001
+      ) subq_0
+    ) subq_1
+  ) subq_2
+  GROUP BY
+    subq_2.metric_time__extract_dow
+) subq_3
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0_optimized.sql
new file mode 100644
index 0000000000..33b25a725c
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_date_part__plan0_optimized.sql
@@ -0,0 +1,17 @@
+-- Aggregate Measures
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_dow
+  , SUM(bookings) AS bookings
+FROM (
+  -- Read Elements From Semantic Model 'bookings_source'
+  -- Metric Time Dimension 'ds'
+  -- Pass Only Elements:
+  --   ['bookings', 'metric_time__extract_dow']
+  SELECT
+    EXTRACT(dow FROM ds) AS metric_time__extract_dow
+    , 1 AS bookings
+  FROM ***************************.fct_bookings bookings_source_src_10001
+) subq_6
+GROUP BY
+  metric_time__extract_dow
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0.sql
new file mode 100644
index 0000000000..b1321ec748
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0.sql
@@ -0,0 +1,258 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_3.metric_time__extract_year
+  , subq_3.metric_time__extract_quarter
+  , subq_3.metric_time__extract_month
+  , subq_3.metric_time__extract_week
+  , subq_3.metric_time__extract_day
+  , subq_3.metric_time__extract_dow
+  , subq_3.metric_time__extract_doy
+  , subq_3.bookings
+FROM (
+  -- Aggregate Measures
+  SELECT
+    subq_2.metric_time__extract_year
+    , subq_2.metric_time__extract_quarter
+    , subq_2.metric_time__extract_month
+    , subq_2.metric_time__extract_week
+    , subq_2.metric_time__extract_day
+    , subq_2.metric_time__extract_dow
+    , subq_2.metric_time__extract_doy
+    , SUM(subq_2.bookings) AS bookings
+  FROM (
+    -- Pass Only Elements:
+    --   ['bookings',
+    --    'metric_time__extract_day',
+    --    'metric_time__extract_dow',
+    --    'metric_time__extract_doy',
+    --    'metric_time__extract_week',
+    --    'metric_time__extract_month',
+    --    'metric_time__extract_quarter',
+    --    'metric_time__extract_year']
+    SELECT
+      subq_1.metric_time__extract_year
+      , subq_1.metric_time__extract_quarter
+      , subq_1.metric_time__extract_month
+      , subq_1.metric_time__extract_week
+      , subq_1.metric_time__extract_day
+      , subq_1.metric_time__extract_dow
+      , subq_1.metric_time__extract_doy
+      , subq_1.bookings
+    FROM (
+      -- Metric Time Dimension 'ds'
+      SELECT
+        subq_0.ds__day
+        , subq_0.ds__week
+        , subq_0.ds__month
+        , subq_0.ds__quarter
+        , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
+        , subq_0.ds_partitioned__day
+        , subq_0.ds_partitioned__week
+        , subq_0.ds_partitioned__month
+        , subq_0.ds_partitioned__quarter
+        , subq_0.ds_partitioned__year
+        , subq_0.ds_partitioned__extract_year
+        , subq_0.ds_partitioned__extract_quarter
+        , subq_0.ds_partitioned__extract_month
+        , subq_0.ds_partitioned__extract_week
+        , subq_0.ds_partitioned__extract_day
+        , subq_0.ds_partitioned__extract_dow
+        , subq_0.ds_partitioned__extract_doy
+        , subq_0.paid_at__day
+        , subq_0.paid_at__week
+        , subq_0.paid_at__month
+        , subq_0.paid_at__quarter
+        , subq_0.paid_at__year
+        , subq_0.paid_at__extract_year
+        , subq_0.paid_at__extract_quarter
+        , subq_0.paid_at__extract_month
+        , subq_0.paid_at__extract_week
+        , subq_0.paid_at__extract_day
+        , subq_0.paid_at__extract_dow
+        , subq_0.paid_at__extract_doy
+        , subq_0.booking__ds__day
+        , subq_0.booking__ds__week
+        , subq_0.booking__ds__month
+        , subq_0.booking__ds__quarter
+        , subq_0.booking__ds__year
+        , subq_0.booking__ds__extract_year
+        , subq_0.booking__ds__extract_quarter
+        , subq_0.booking__ds__extract_month
+        , subq_0.booking__ds__extract_week
+        , subq_0.booking__ds__extract_day
+        , subq_0.booking__ds__extract_dow
+        , subq_0.booking__ds__extract_doy
+        , subq_0.booking__ds_partitioned__day
+        , subq_0.booking__ds_partitioned__week
+        , subq_0.booking__ds_partitioned__month
+        , subq_0.booking__ds_partitioned__quarter
+        , subq_0.booking__ds_partitioned__year
+        , subq_0.booking__ds_partitioned__extract_year
+        , subq_0.booking__ds_partitioned__extract_quarter
+        , subq_0.booking__ds_partitioned__extract_month
+        , subq_0.booking__ds_partitioned__extract_week
+        , subq_0.booking__ds_partitioned__extract_day
+        , subq_0.booking__ds_partitioned__extract_dow
+        , subq_0.booking__ds_partitioned__extract_doy
+        , subq_0.booking__paid_at__day
+        , subq_0.booking__paid_at__week
+        , subq_0.booking__paid_at__month
+        , subq_0.booking__paid_at__quarter
+        , subq_0.booking__paid_at__year
+        , subq_0.booking__paid_at__extract_year
+        , subq_0.booking__paid_at__extract_quarter
+        , subq_0.booking__paid_at__extract_month
+        , subq_0.booking__paid_at__extract_week
+        , subq_0.booking__paid_at__extract_day
+        , subq_0.booking__paid_at__extract_dow
+        , subq_0.booking__paid_at__extract_doy
+        , subq_0.ds__day AS metric_time__day
+        , subq_0.ds__week AS metric_time__week
+        , subq_0.ds__month AS metric_time__month
+        , subq_0.ds__quarter AS metric_time__quarter
+        , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
+        , subq_0.listing
+        , subq_0.guest
+        , subq_0.host
+        , subq_0.booking__listing
+        , subq_0.booking__guest
+        , subq_0.booking__host
+        , subq_0.is_instant
+        , subq_0.booking__is_instant
+        , subq_0.bookings
+        , subq_0.instant_bookings
+        , subq_0.booking_value
+        , subq_0.max_booking_value
+        , subq_0.min_booking_value
+        , subq_0.bookers
+        , subq_0.average_booking_value
+        , subq_0.referred_bookings
+        , subq_0.median_booking_value
+        , subq_0.booking_value_p99
+        , subq_0.discrete_booking_value_p99
+        , subq_0.approximate_continuous_booking_value_p99
+        , subq_0.approximate_discrete_booking_value_p99
+      FROM (
+        -- Read Elements From Semantic Model 'bookings_source'
+        SELECT
+          1 AS bookings
+          , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+          , bookings_source_src_10001.booking_value
+          , bookings_source_src_10001.booking_value AS max_booking_value
+          , bookings_source_src_10001.booking_value AS min_booking_value
+          , bookings_source_src_10001.guest_id AS bookers
+          , bookings_source_src_10001.booking_value AS average_booking_value
+          , bookings_source_src_10001.booking_value AS booking_payments
+          , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+          , bookings_source_src_10001.booking_value AS median_booking_value
+          , bookings_source_src_10001.booking_value AS booking_value_p99
+          , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+          , bookings_source_src_10001.is_instant
+          , bookings_source_src_10001.ds AS ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , bookings_source_src_10001.is_instant AS booking__is_instant
+          , bookings_source_src_10001.ds AS booking__ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS booking__paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , bookings_source_src_10001.listing_id AS listing
+          , bookings_source_src_10001.guest_id AS guest
+          , bookings_source_src_10001.host_id AS host
+          , bookings_source_src_10001.listing_id AS booking__listing
+          , bookings_source_src_10001.guest_id AS booking__guest
+          , bookings_source_src_10001.host_id AS booking__host
+        FROM ***************************.fct_bookings bookings_source_src_10001
+      ) subq_0
+    ) subq_1
+  ) subq_2
+  GROUP BY
+    subq_2.metric_time__extract_year
+    , subq_2.metric_time__extract_quarter
+    , subq_2.metric_time__extract_month
+    , subq_2.metric_time__extract_week
+    , subq_2.metric_time__extract_day
+    , subq_2.metric_time__extract_dow
+    , subq_2.metric_time__extract_doy
+) subq_3
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
new file mode 100644
index 0000000000..402fb4f517
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Redshift/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
@@ -0,0 +1,42 @@
+-- Aggregate Measures
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_year
+  , metric_time__extract_quarter
+  , metric_time__extract_month
+  , metric_time__extract_week
+  , metric_time__extract_day
+  , metric_time__extract_dow
+  , metric_time__extract_doy
+  , SUM(bookings) AS bookings
+FROM (
+  -- Read Elements From Semantic Model 'bookings_source'
+  -- Metric Time Dimension 'ds'
+  -- Pass Only Elements:
+  --   ['bookings',
+  --    'metric_time__extract_day',
+  --    'metric_time__extract_dow',
+  --    'metric_time__extract_doy',
+  --    'metric_time__extract_week',
+  --    'metric_time__extract_month',
+  --    'metric_time__extract_quarter',
+  --    'metric_time__extract_year']
+  SELECT
+    EXTRACT(year FROM ds) AS metric_time__extract_year
+    , EXTRACT(quarter FROM ds) AS metric_time__extract_quarter
+    , EXTRACT(month FROM ds) AS metric_time__extract_month
+    , EXTRACT(week FROM ds) AS metric_time__extract_week
+    , EXTRACT(day FROM ds) AS metric_time__extract_day
+    , EXTRACT(dow FROM ds) AS metric_time__extract_dow
+    , EXTRACT(doy FROM ds) AS metric_time__extract_doy
+    , 1 AS bookings
+  FROM ***************************.fct_bookings bookings_source_src_10001
+) subq_6
+GROUP BY
+  metric_time__extract_year
+  , metric_time__extract_quarter
+  , metric_time__extract_month
+  , metric_time__extract_week
+  , metric_time__extract_day
+  , metric_time__extract_dow
+  , metric_time__extract_doy
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
index d1740a6a39..79946c1bc1 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_through_scd_dimension__plan0.sql
@@ -381,25 +381,25 @@ FROM (
             --    'ds__month',
             --    'ds__quarter',
             --    'ds__year',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
-            --    'ds__day',
+            --    'ds__extract_year',
+            --    'ds__extract_quarter',
+            --    'ds__extract_month',
+            --    'ds__extract_week',
+            --    'ds__extract_day',
+            --    'ds__extract_dow',
+            --    'ds__extract_doy',
             --    'user__ds__day',
             --    'user__ds__week',
             --    'user__ds__month',
             --    'user__ds__quarter',
             --    'user__ds__year',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
-            --    'user__ds__day',
+            --    'user__ds__extract_year',
+            --    'user__ds__extract_quarter',
+            --    'user__ds__extract_month',
+            --    'user__ds__extract_week',
+            --    'user__ds__extract_day',
+            --    'user__ds__extract_dow',
+            --    'user__ds__extract_doy',
             --    'user']
             SELECT
               subq_4.ds__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
index 8abc633b9a..1cfb7780a7 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multi_hop_to_scd_dimension__plan0.sql
@@ -288,49 +288,49 @@ FROM (
             --    'window_start__month',
             --    'window_start__quarter',
             --    'window_start__year',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
-            --    'window_start__day',
+            --    'window_start__extract_year',
+            --    'window_start__extract_quarter',
+            --    'window_start__extract_month',
+            --    'window_start__extract_week',
+            --    'window_start__extract_day',
+            --    'window_start__extract_dow',
+            --    'window_start__extract_doy',
             --    'window_end__day',
             --    'window_end__week',
             --    'window_end__month',
             --    'window_end__quarter',
             --    'window_end__year',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
-            --    'window_end__day',
+            --    'window_end__extract_year',
+            --    'window_end__extract_quarter',
+            --    'window_end__extract_month',
+            --    'window_end__extract_week',
+            --    'window_end__extract_day',
+            --    'window_end__extract_dow',
+            --    'window_end__extract_doy',
             --    'lux_listing__window_start__day',
             --    'lux_listing__window_start__week',
             --    'lux_listing__window_start__month',
             --    'lux_listing__window_start__quarter',
             --    'lux_listing__window_start__year',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
-            --    'lux_listing__window_start__day',
+            --    'lux_listing__window_start__extract_year',
+            --    'lux_listing__window_start__extract_quarter',
+            --    'lux_listing__window_start__extract_month',
+            --    'lux_listing__window_start__extract_week',
+            --    'lux_listing__window_start__extract_day',
+            --    'lux_listing__window_start__extract_dow',
+            --    'lux_listing__window_start__extract_doy',
             --    'lux_listing__window_end__day',
             --    'lux_listing__window_end__week',
             --    'lux_listing__window_end__month',
             --    'lux_listing__window_end__quarter',
             --    'lux_listing__window_end__year',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
-            --    'lux_listing__window_end__day',
+            --    'lux_listing__window_end__extract_year',
+            --    'lux_listing__window_end__extract_quarter',
+            --    'lux_listing__window_end__extract_month',
+            --    'lux_listing__window_end__extract_week',
+            --    'lux_listing__window_end__extract_day',
+            --    'lux_listing__window_end__extract_dow',
+            --    'lux_listing__window_end__extract_doy',
             --    'lux_listing']
             SELECT
               subq_4.window_start__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
index 99d4dba7cb..0d1825bde4 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_multihop_node__plan0.sql
@@ -252,25 +252,25 @@ FROM (
             --    'ds_partitioned__month',
             --    'ds_partitioned__quarter',
             --    'ds_partitioned__year',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
-            --    'ds_partitioned__day',
+            --    'ds_partitioned__extract_year',
+            --    'ds_partitioned__extract_quarter',
+            --    'ds_partitioned__extract_month',
+            --    'ds_partitioned__extract_week',
+            --    'ds_partitioned__extract_day',
+            --    'ds_partitioned__extract_dow',
+            --    'ds_partitioned__extract_doy',
             --    'customer_id__ds_partitioned__day',
             --    'customer_id__ds_partitioned__week',
             --    'customer_id__ds_partitioned__month',
             --    'customer_id__ds_partitioned__quarter',
             --    'customer_id__ds_partitioned__year',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
-            --    'customer_id__ds_partitioned__day',
+            --    'customer_id__ds_partitioned__extract_year',
+            --    'customer_id__ds_partitioned__extract_quarter',
+            --    'customer_id__ds_partitioned__extract_month',
+            --    'customer_id__ds_partitioned__extract_week',
+            --    'customer_id__ds_partitioned__extract_day',
+            --    'customer_id__ds_partitioned__extract_dow',
+            --    'customer_id__ds_partitioned__extract_doy',
             --    'customer_id']
             SELECT
               subq_4.ds_partitioned__day
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0.sql
new file mode 100644
index 0000000000..68e1d3302c
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0.sql
@@ -0,0 +1,585 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_13.metric_time__extract_dow
+  , bookings - bookings_2_weeks_ago AS bookings_growth_2_weeks
+FROM (
+  -- Combine Metrics
+  SELECT
+    COALESCE(subq_4.metric_time__extract_dow, subq_12.metric_time__extract_dow) AS metric_time__extract_dow
+    , subq_4.bookings AS bookings
+    , subq_12.bookings_2_weeks_ago AS bookings_2_weeks_ago
+  FROM (
+    -- Compute Metrics via Expressions
+    SELECT
+      subq_3.metric_time__extract_dow
+      , subq_3.bookings
+    FROM (
+      -- Aggregate Measures
+      SELECT
+        subq_2.metric_time__extract_dow
+        , SUM(subq_2.bookings) AS bookings
+      FROM (
+        -- Pass Only Elements:
+        --   ['bookings', 'metric_time__extract_dow']
+        SELECT
+          subq_1.metric_time__extract_dow
+          , subq_1.bookings
+        FROM (
+          -- Metric Time Dimension 'ds'
+          SELECT
+            subq_0.ds__day
+            , subq_0.ds__week
+            , subq_0.ds__month
+            , subq_0.ds__quarter
+            , subq_0.ds__year
+            , subq_0.ds__extract_year
+            , subq_0.ds__extract_quarter
+            , subq_0.ds__extract_month
+            , subq_0.ds__extract_week
+            , subq_0.ds__extract_day
+            , subq_0.ds__extract_dow
+            , subq_0.ds__extract_doy
+            , subq_0.ds_partitioned__day
+            , subq_0.ds_partitioned__week
+            , subq_0.ds_partitioned__month
+            , subq_0.ds_partitioned__quarter
+            , subq_0.ds_partitioned__year
+            , subq_0.ds_partitioned__extract_year
+            , subq_0.ds_partitioned__extract_quarter
+            , subq_0.ds_partitioned__extract_month
+            , subq_0.ds_partitioned__extract_week
+            , subq_0.ds_partitioned__extract_day
+            , subq_0.ds_partitioned__extract_dow
+            , subq_0.ds_partitioned__extract_doy
+            , subq_0.paid_at__day
+            , subq_0.paid_at__week
+            , subq_0.paid_at__month
+            , subq_0.paid_at__quarter
+            , subq_0.paid_at__year
+            , subq_0.paid_at__extract_year
+            , subq_0.paid_at__extract_quarter
+            , subq_0.paid_at__extract_month
+            , subq_0.paid_at__extract_week
+            , subq_0.paid_at__extract_day
+            , subq_0.paid_at__extract_dow
+            , subq_0.paid_at__extract_doy
+            , subq_0.booking__ds__day
+            , subq_0.booking__ds__week
+            , subq_0.booking__ds__month
+            , subq_0.booking__ds__quarter
+            , subq_0.booking__ds__year
+            , subq_0.booking__ds__extract_year
+            , subq_0.booking__ds__extract_quarter
+            , subq_0.booking__ds__extract_month
+            , subq_0.booking__ds__extract_week
+            , subq_0.booking__ds__extract_day
+            , subq_0.booking__ds__extract_dow
+            , subq_0.booking__ds__extract_doy
+            , subq_0.booking__ds_partitioned__day
+            , subq_0.booking__ds_partitioned__week
+            , subq_0.booking__ds_partitioned__month
+            , subq_0.booking__ds_partitioned__quarter
+            , subq_0.booking__ds_partitioned__year
+            , subq_0.booking__ds_partitioned__extract_year
+            , subq_0.booking__ds_partitioned__extract_quarter
+            , subq_0.booking__ds_partitioned__extract_month
+            , subq_0.booking__ds_partitioned__extract_week
+            , subq_0.booking__ds_partitioned__extract_day
+            , subq_0.booking__ds_partitioned__extract_dow
+            , subq_0.booking__ds_partitioned__extract_doy
+            , subq_0.booking__paid_at__day
+            , subq_0.booking__paid_at__week
+            , subq_0.booking__paid_at__month
+            , subq_0.booking__paid_at__quarter
+            , subq_0.booking__paid_at__year
+            , subq_0.booking__paid_at__extract_year
+            , subq_0.booking__paid_at__extract_quarter
+            , subq_0.booking__paid_at__extract_month
+            , subq_0.booking__paid_at__extract_week
+            , subq_0.booking__paid_at__extract_day
+            , subq_0.booking__paid_at__extract_dow
+            , subq_0.booking__paid_at__extract_doy
+            , subq_0.ds__day AS metric_time__day
+            , subq_0.ds__week AS metric_time__week
+            , subq_0.ds__month AS metric_time__month
+            , subq_0.ds__quarter AS metric_time__quarter
+            , subq_0.ds__year AS metric_time__year
+            , subq_0.ds__extract_year AS metric_time__extract_year
+            , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+            , subq_0.ds__extract_month AS metric_time__extract_month
+            , subq_0.ds__extract_week AS metric_time__extract_week
+            , subq_0.ds__extract_day AS metric_time__extract_day
+            , subq_0.ds__extract_dow AS metric_time__extract_dow
+            , subq_0.ds__extract_doy AS metric_time__extract_doy
+            , subq_0.listing
+            , subq_0.guest
+            , subq_0.host
+            , subq_0.booking__listing
+            , subq_0.booking__guest
+            , subq_0.booking__host
+            , subq_0.is_instant
+            , subq_0.booking__is_instant
+            , subq_0.bookings
+            , subq_0.instant_bookings
+            , subq_0.booking_value
+            , subq_0.max_booking_value
+            , subq_0.min_booking_value
+            , subq_0.bookers
+            , subq_0.average_booking_value
+            , subq_0.referred_bookings
+            , subq_0.median_booking_value
+            , subq_0.booking_value_p99
+            , subq_0.discrete_booking_value_p99
+            , subq_0.approximate_continuous_booking_value_p99
+            , subq_0.approximate_discrete_booking_value_p99
+          FROM (
+            -- Read Elements From Semantic Model 'bookings_source'
+            SELECT
+              1 AS bookings
+              , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+              , bookings_source_src_10001.booking_value
+              , bookings_source_src_10001.booking_value AS max_booking_value
+              , bookings_source_src_10001.booking_value AS min_booking_value
+              , bookings_source_src_10001.guest_id AS bookers
+              , bookings_source_src_10001.booking_value AS average_booking_value
+              , bookings_source_src_10001.booking_value AS booking_payments
+              , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+              , bookings_source_src_10001.booking_value AS median_booking_value
+              , bookings_source_src_10001.booking_value AS booking_value_p99
+              , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+              , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+              , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+              , bookings_source_src_10001.is_instant
+              , bookings_source_src_10001.ds AS ds__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+              , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+              , bookings_source_src_10001.paid_at AS paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+              , bookings_source_src_10001.is_instant AS booking__is_instant
+              , bookings_source_src_10001.ds AS booking__ds__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+              , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+              , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+              , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+              , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+              , bookings_source_src_10001.paid_at AS booking__paid_at__day
+              , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+              , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+              , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+              , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+              , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+              , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+              , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+              , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+              , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+              , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+              , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+              , bookings_source_src_10001.listing_id AS listing
+              , bookings_source_src_10001.guest_id AS guest
+              , bookings_source_src_10001.host_id AS host
+              , bookings_source_src_10001.listing_id AS booking__listing
+              , bookings_source_src_10001.guest_id AS booking__guest
+              , bookings_source_src_10001.host_id AS booking__host
+            FROM ***************************.fct_bookings bookings_source_src_10001
+          ) subq_0
+        ) subq_1
+      ) subq_2
+      GROUP BY
+        subq_2.metric_time__extract_dow
+    ) subq_3
+  ) subq_4
+  INNER JOIN (
+    -- Compute Metrics via Expressions
+    SELECT
+      subq_11.metric_time__extract_dow
+      , subq_11.bookings AS bookings_2_weeks_ago
+    FROM (
+      -- Aggregate Measures
+      SELECT
+        subq_10.metric_time__extract_dow
+        , SUM(subq_10.bookings) AS bookings
+      FROM (
+        -- Pass Only Elements:
+        --   ['bookings', 'metric_time__extract_dow']
+        SELECT
+          subq_9.metric_time__extract_dow
+          , subq_9.bookings
+        FROM (
+          -- Join to Time Spine Dataset
+          SELECT
+            EXTRACT(dow FROM subq_7.metric_time__day) AS metric_time__extract_dow
+            , subq_6.ds__day AS ds__day
+            , subq_6.ds__week AS ds__week
+            , subq_6.ds__month AS ds__month
+            , subq_6.ds__quarter AS ds__quarter
+            , subq_6.ds__year AS ds__year
+            , subq_6.ds__extract_year AS ds__extract_year
+            , subq_6.ds__extract_quarter AS ds__extract_quarter
+            , subq_6.ds__extract_month AS ds__extract_month
+            , subq_6.ds__extract_week AS ds__extract_week
+            , subq_6.ds__extract_day AS ds__extract_day
+            , subq_6.ds__extract_dow AS ds__extract_dow
+            , subq_6.ds__extract_doy AS ds__extract_doy
+            , subq_6.ds_partitioned__day AS ds_partitioned__day
+            , subq_6.ds_partitioned__week AS ds_partitioned__week
+            , subq_6.ds_partitioned__month AS ds_partitioned__month
+            , subq_6.ds_partitioned__quarter AS ds_partitioned__quarter
+            , subq_6.ds_partitioned__year AS ds_partitioned__year
+            , subq_6.ds_partitioned__extract_year AS ds_partitioned__extract_year
+            , subq_6.ds_partitioned__extract_quarter AS ds_partitioned__extract_quarter
+            , subq_6.ds_partitioned__extract_month AS ds_partitioned__extract_month
+            , subq_6.ds_partitioned__extract_week AS ds_partitioned__extract_week
+            , subq_6.ds_partitioned__extract_day AS ds_partitioned__extract_day
+            , subq_6.ds_partitioned__extract_dow AS ds_partitioned__extract_dow
+            , subq_6.ds_partitioned__extract_doy AS ds_partitioned__extract_doy
+            , subq_6.paid_at__day AS paid_at__day
+            , subq_6.paid_at__week AS paid_at__week
+            , subq_6.paid_at__month AS paid_at__month
+            , subq_6.paid_at__quarter AS paid_at__quarter
+            , subq_6.paid_at__year AS paid_at__year
+            , subq_6.paid_at__extract_year AS paid_at__extract_year
+            , subq_6.paid_at__extract_quarter AS paid_at__extract_quarter
+            , subq_6.paid_at__extract_month AS paid_at__extract_month
+            , subq_6.paid_at__extract_week AS paid_at__extract_week
+            , subq_6.paid_at__extract_day AS paid_at__extract_day
+            , subq_6.paid_at__extract_dow AS paid_at__extract_dow
+            , subq_6.paid_at__extract_doy AS paid_at__extract_doy
+            , subq_6.booking__ds__day AS booking__ds__day
+            , subq_6.booking__ds__week AS booking__ds__week
+            , subq_6.booking__ds__month AS booking__ds__month
+            , subq_6.booking__ds__quarter AS booking__ds__quarter
+            , subq_6.booking__ds__year AS booking__ds__year
+            , subq_6.booking__ds__extract_year AS booking__ds__extract_year
+            , subq_6.booking__ds__extract_quarter AS booking__ds__extract_quarter
+            , subq_6.booking__ds__extract_month AS booking__ds__extract_month
+            , subq_6.booking__ds__extract_week AS booking__ds__extract_week
+            , subq_6.booking__ds__extract_day AS booking__ds__extract_day
+            , subq_6.booking__ds__extract_dow AS booking__ds__extract_dow
+            , subq_6.booking__ds__extract_doy AS booking__ds__extract_doy
+            , subq_6.booking__ds_partitioned__day AS booking__ds_partitioned__day
+            , subq_6.booking__ds_partitioned__week AS booking__ds_partitioned__week
+            , subq_6.booking__ds_partitioned__month AS booking__ds_partitioned__month
+            , subq_6.booking__ds_partitioned__quarter AS booking__ds_partitioned__quarter
+            , subq_6.booking__ds_partitioned__year AS booking__ds_partitioned__year
+            , subq_6.booking__ds_partitioned__extract_year AS booking__ds_partitioned__extract_year
+            , subq_6.booking__ds_partitioned__extract_quarter AS booking__ds_partitioned__extract_quarter
+            , subq_6.booking__ds_partitioned__extract_month AS booking__ds_partitioned__extract_month
+            , subq_6.booking__ds_partitioned__extract_week AS booking__ds_partitioned__extract_week
+            , subq_6.booking__ds_partitioned__extract_day AS booking__ds_partitioned__extract_day
+            , subq_6.booking__ds_partitioned__extract_dow AS booking__ds_partitioned__extract_dow
+            , subq_6.booking__ds_partitioned__extract_doy AS booking__ds_partitioned__extract_doy
+            , subq_6.booking__paid_at__day AS booking__paid_at__day
+            , subq_6.booking__paid_at__week AS booking__paid_at__week
+            , subq_6.booking__paid_at__month AS booking__paid_at__month
+            , subq_6.booking__paid_at__quarter AS booking__paid_at__quarter
+            , subq_6.booking__paid_at__year AS booking__paid_at__year
+            , subq_6.booking__paid_at__extract_year AS booking__paid_at__extract_year
+            , subq_6.booking__paid_at__extract_quarter AS booking__paid_at__extract_quarter
+            , subq_6.booking__paid_at__extract_month AS booking__paid_at__extract_month
+            , subq_6.booking__paid_at__extract_week AS booking__paid_at__extract_week
+            , subq_6.booking__paid_at__extract_day AS booking__paid_at__extract_day
+            , subq_6.booking__paid_at__extract_dow AS booking__paid_at__extract_dow
+            , subq_6.booking__paid_at__extract_doy AS booking__paid_at__extract_doy
+            , subq_6.listing AS listing
+            , subq_6.guest AS guest
+            , subq_6.host AS host
+            , subq_6.booking__listing AS booking__listing
+            , subq_6.booking__guest AS booking__guest
+            , subq_6.booking__host AS booking__host
+            , subq_6.is_instant AS is_instant
+            , subq_6.booking__is_instant AS booking__is_instant
+            , subq_6.bookings AS bookings
+            , subq_6.instant_bookings AS instant_bookings
+            , subq_6.booking_value AS booking_value
+            , subq_6.max_booking_value AS max_booking_value
+            , subq_6.min_booking_value AS min_booking_value
+            , subq_6.bookers AS bookers
+            , subq_6.average_booking_value AS average_booking_value
+            , subq_6.referred_bookings AS referred_bookings
+            , subq_6.median_booking_value AS median_booking_value
+            , subq_6.booking_value_p99 AS booking_value_p99
+            , subq_6.discrete_booking_value_p99 AS discrete_booking_value_p99
+            , subq_6.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
+            , subq_6.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
+          FROM (
+            -- Date Spine
+            SELECT
+              subq_8.ds AS metric_time__day
+            FROM ***************************.mf_time_spine subq_8
+          ) subq_7
+          INNER JOIN (
+            -- Metric Time Dimension 'ds'
+            SELECT
+              subq_5.ds__day
+              , subq_5.ds__week
+              , subq_5.ds__month
+              , subq_5.ds__quarter
+              , subq_5.ds__year
+              , subq_5.ds__extract_year
+              , subq_5.ds__extract_quarter
+              , subq_5.ds__extract_month
+              , subq_5.ds__extract_week
+              , subq_5.ds__extract_day
+              , subq_5.ds__extract_dow
+              , subq_5.ds__extract_doy
+              , subq_5.ds_partitioned__day
+              , subq_5.ds_partitioned__week
+              , subq_5.ds_partitioned__month
+              , subq_5.ds_partitioned__quarter
+              , subq_5.ds_partitioned__year
+              , subq_5.ds_partitioned__extract_year
+              , subq_5.ds_partitioned__extract_quarter
+              , subq_5.ds_partitioned__extract_month
+              , subq_5.ds_partitioned__extract_week
+              , subq_5.ds_partitioned__extract_day
+              , subq_5.ds_partitioned__extract_dow
+              , subq_5.ds_partitioned__extract_doy
+              , subq_5.paid_at__day
+              , subq_5.paid_at__week
+              , subq_5.paid_at__month
+              , subq_5.paid_at__quarter
+              , subq_5.paid_at__year
+              , subq_5.paid_at__extract_year
+              , subq_5.paid_at__extract_quarter
+              , subq_5.paid_at__extract_month
+              , subq_5.paid_at__extract_week
+              , subq_5.paid_at__extract_day
+              , subq_5.paid_at__extract_dow
+              , subq_5.paid_at__extract_doy
+              , subq_5.booking__ds__day
+              , subq_5.booking__ds__week
+              , subq_5.booking__ds__month
+              , subq_5.booking__ds__quarter
+              , subq_5.booking__ds__year
+              , subq_5.booking__ds__extract_year
+              , subq_5.booking__ds__extract_quarter
+              , subq_5.booking__ds__extract_month
+              , subq_5.booking__ds__extract_week
+              , subq_5.booking__ds__extract_day
+              , subq_5.booking__ds__extract_dow
+              , subq_5.booking__ds__extract_doy
+              , subq_5.booking__ds_partitioned__day
+              , subq_5.booking__ds_partitioned__week
+              , subq_5.booking__ds_partitioned__month
+              , subq_5.booking__ds_partitioned__quarter
+              , subq_5.booking__ds_partitioned__year
+              , subq_5.booking__ds_partitioned__extract_year
+              , subq_5.booking__ds_partitioned__extract_quarter
+              , subq_5.booking__ds_partitioned__extract_month
+              , subq_5.booking__ds_partitioned__extract_week
+              , subq_5.booking__ds_partitioned__extract_day
+              , subq_5.booking__ds_partitioned__extract_dow
+              , subq_5.booking__ds_partitioned__extract_doy
+              , subq_5.booking__paid_at__day
+              , subq_5.booking__paid_at__week
+              , subq_5.booking__paid_at__month
+              , subq_5.booking__paid_at__quarter
+              , subq_5.booking__paid_at__year
+              , subq_5.booking__paid_at__extract_year
+              , subq_5.booking__paid_at__extract_quarter
+              , subq_5.booking__paid_at__extract_month
+              , subq_5.booking__paid_at__extract_week
+              , subq_5.booking__paid_at__extract_day
+              , subq_5.booking__paid_at__extract_dow
+              , subq_5.booking__paid_at__extract_doy
+              , subq_5.ds__day AS metric_time__day
+              , subq_5.ds__week AS metric_time__week
+              , subq_5.ds__month AS metric_time__month
+              , subq_5.ds__quarter AS metric_time__quarter
+              , subq_5.ds__year AS metric_time__year
+              , subq_5.ds__extract_year AS metric_time__extract_year
+              , subq_5.ds__extract_quarter AS metric_time__extract_quarter
+              , subq_5.ds__extract_month AS metric_time__extract_month
+              , subq_5.ds__extract_week AS metric_time__extract_week
+              , subq_5.ds__extract_day AS metric_time__extract_day
+              , subq_5.ds__extract_dow AS metric_time__extract_dow
+              , subq_5.ds__extract_doy AS metric_time__extract_doy
+              , subq_5.listing
+              , subq_5.guest
+              , subq_5.host
+              , subq_5.booking__listing
+              , subq_5.booking__guest
+              , subq_5.booking__host
+              , subq_5.is_instant
+              , subq_5.booking__is_instant
+              , subq_5.bookings
+              , subq_5.instant_bookings
+              , subq_5.booking_value
+              , subq_5.max_booking_value
+              , subq_5.min_booking_value
+              , subq_5.bookers
+              , subq_5.average_booking_value
+              , subq_5.referred_bookings
+              , subq_5.median_booking_value
+              , subq_5.booking_value_p99
+              , subq_5.discrete_booking_value_p99
+              , subq_5.approximate_continuous_booking_value_p99
+              , subq_5.approximate_discrete_booking_value_p99
+            FROM (
+              -- Read Elements From Semantic Model 'bookings_source'
+              SELECT
+                1 AS bookings
+                , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+                , bookings_source_src_10001.booking_value
+                , bookings_source_src_10001.booking_value AS max_booking_value
+                , bookings_source_src_10001.booking_value AS min_booking_value
+                , bookings_source_src_10001.guest_id AS bookers
+                , bookings_source_src_10001.booking_value AS average_booking_value
+                , bookings_source_src_10001.booking_value AS booking_payments
+                , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+                , bookings_source_src_10001.booking_value AS median_booking_value
+                , bookings_source_src_10001.booking_value AS booking_value_p99
+                , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+                , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+                , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+                , bookings_source_src_10001.is_instant
+                , bookings_source_src_10001.ds AS ds__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+                , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+                , bookings_source_src_10001.paid_at AS paid_at__day
+                , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+                , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+                , bookings_source_src_10001.is_instant AS booking__is_instant
+                , bookings_source_src_10001.ds AS booking__ds__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+                , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+                , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+                , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+                , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+                , bookings_source_src_10001.paid_at AS booking__paid_at__day
+                , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+                , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+                , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+                , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+                , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+                , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+                , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+                , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+                , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+                , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+                , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+                , bookings_source_src_10001.listing_id AS listing
+                , bookings_source_src_10001.guest_id AS guest
+                , bookings_source_src_10001.host_id AS host
+                , bookings_source_src_10001.listing_id AS booking__listing
+                , bookings_source_src_10001.guest_id AS booking__guest
+                , bookings_source_src_10001.host_id AS booking__host
+              FROM ***************************.fct_bookings bookings_source_src_10001
+            ) subq_5
+          ) subq_6
+          ON
+            DATEADD(day, -14, subq_7.metric_time__day) = subq_6.metric_time__day
+        ) subq_9
+      ) subq_10
+      GROUP BY
+        subq_10.metric_time__extract_dow
+    ) subq_11
+  ) subq_12
+  ON
+    (
+      subq_4.metric_time__extract_dow = subq_12.metric_time__extract_dow
+    ) OR (
+      (
+        subq_4.metric_time__extract_dow IS NULL
+      ) AND (
+        subq_12.metric_time__extract_dow IS NULL
+      )
+    )
+) subq_13
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0_optimized.sql
new file mode 100644
index 0000000000..d1a408e031
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_offset_window_with_date_part__plan0_optimized.sql
@@ -0,0 +1,63 @@
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_dow
+  , bookings - bookings_2_weeks_ago AS bookings_growth_2_weeks
+FROM (
+  -- Combine Metrics
+  SELECT
+    COALESCE(subq_18.metric_time__extract_dow, subq_26.metric_time__extract_dow) AS metric_time__extract_dow
+    , subq_18.bookings AS bookings
+    , subq_26.bookings_2_weeks_ago AS bookings_2_weeks_ago
+  FROM (
+    -- Aggregate Measures
+    -- Compute Metrics via Expressions
+    SELECT
+      metric_time__extract_dow
+      , SUM(bookings) AS bookings
+    FROM (
+      -- Read Elements From Semantic Model 'bookings_source'
+      -- Metric Time Dimension 'ds'
+      -- Pass Only Elements:
+      --   ['bookings', 'metric_time__extract_dow']
+      SELECT
+        EXTRACT(dow FROM ds) AS metric_time__extract_dow
+        , 1 AS bookings
+      FROM ***************************.fct_bookings bookings_source_src_10001
+    ) subq_16
+    GROUP BY
+      metric_time__extract_dow
+  ) subq_18
+  INNER JOIN (
+    -- Join to Time Spine Dataset
+    -- Pass Only Elements:
+    --   ['bookings', 'metric_time__extract_dow']
+    -- Aggregate Measures
+    -- Compute Metrics via Expressions
+    SELECT
+      EXTRACT(dow FROM subq_22.ds) AS metric_time__extract_dow
+      , SUM(subq_20.bookings) AS bookings_2_weeks_ago
+    FROM ***************************.mf_time_spine subq_22
+    INNER JOIN (
+      -- Read Elements From Semantic Model 'bookings_source'
+      -- Metric Time Dimension 'ds'
+      SELECT
+        ds AS metric_time__day
+        , 1 AS bookings
+      FROM ***************************.fct_bookings bookings_source_src_10001
+    ) subq_20
+    ON
+      DATEADD(day, -14, subq_22.ds) = subq_20.metric_time__day
+    GROUP BY
+      EXTRACT(dow FROM subq_22.ds)
+  ) subq_26
+  ON
+    (
+      subq_18.metric_time__extract_dow = subq_26.metric_time__extract_dow
+    ) OR (
+      (
+        subq_18.metric_time__extract_dow IS NULL
+      ) AND (
+        subq_26.metric_time__extract_dow IS NULL
+      )
+    )
+) subq_27
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0.sql
new file mode 100644
index 0000000000..3869c341c5
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0.sql
@@ -0,0 +1,227 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_3.metric_time__extract_dow
+  , subq_3.bookings
+FROM (
+  -- Aggregate Measures
+  SELECT
+    subq_2.metric_time__extract_dow
+    , SUM(subq_2.bookings) AS bookings
+  FROM (
+    -- Pass Only Elements:
+    --   ['bookings', 'metric_time__extract_dow']
+    SELECT
+      subq_1.metric_time__extract_dow
+      , subq_1.bookings
+    FROM (
+      -- Metric Time Dimension 'ds'
+      SELECT
+        subq_0.ds__day
+        , subq_0.ds__week
+        , subq_0.ds__month
+        , subq_0.ds__quarter
+        , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
+        , subq_0.ds_partitioned__day
+        , subq_0.ds_partitioned__week
+        , subq_0.ds_partitioned__month
+        , subq_0.ds_partitioned__quarter
+        , subq_0.ds_partitioned__year
+        , subq_0.ds_partitioned__extract_year
+        , subq_0.ds_partitioned__extract_quarter
+        , subq_0.ds_partitioned__extract_month
+        , subq_0.ds_partitioned__extract_week
+        , subq_0.ds_partitioned__extract_day
+        , subq_0.ds_partitioned__extract_dow
+        , subq_0.ds_partitioned__extract_doy
+        , subq_0.paid_at__day
+        , subq_0.paid_at__week
+        , subq_0.paid_at__month
+        , subq_0.paid_at__quarter
+        , subq_0.paid_at__year
+        , subq_0.paid_at__extract_year
+        , subq_0.paid_at__extract_quarter
+        , subq_0.paid_at__extract_month
+        , subq_0.paid_at__extract_week
+        , subq_0.paid_at__extract_day
+        , subq_0.paid_at__extract_dow
+        , subq_0.paid_at__extract_doy
+        , subq_0.booking__ds__day
+        , subq_0.booking__ds__week
+        , subq_0.booking__ds__month
+        , subq_0.booking__ds__quarter
+        , subq_0.booking__ds__year
+        , subq_0.booking__ds__extract_year
+        , subq_0.booking__ds__extract_quarter
+        , subq_0.booking__ds__extract_month
+        , subq_0.booking__ds__extract_week
+        , subq_0.booking__ds__extract_day
+        , subq_0.booking__ds__extract_dow
+        , subq_0.booking__ds__extract_doy
+        , subq_0.booking__ds_partitioned__day
+        , subq_0.booking__ds_partitioned__week
+        , subq_0.booking__ds_partitioned__month
+        , subq_0.booking__ds_partitioned__quarter
+        , subq_0.booking__ds_partitioned__year
+        , subq_0.booking__ds_partitioned__extract_year
+        , subq_0.booking__ds_partitioned__extract_quarter
+        , subq_0.booking__ds_partitioned__extract_month
+        , subq_0.booking__ds_partitioned__extract_week
+        , subq_0.booking__ds_partitioned__extract_day
+        , subq_0.booking__ds_partitioned__extract_dow
+        , subq_0.booking__ds_partitioned__extract_doy
+        , subq_0.booking__paid_at__day
+        , subq_0.booking__paid_at__week
+        , subq_0.booking__paid_at__month
+        , subq_0.booking__paid_at__quarter
+        , subq_0.booking__paid_at__year
+        , subq_0.booking__paid_at__extract_year
+        , subq_0.booking__paid_at__extract_quarter
+        , subq_0.booking__paid_at__extract_month
+        , subq_0.booking__paid_at__extract_week
+        , subq_0.booking__paid_at__extract_day
+        , subq_0.booking__paid_at__extract_dow
+        , subq_0.booking__paid_at__extract_doy
+        , subq_0.ds__day AS metric_time__day
+        , subq_0.ds__week AS metric_time__week
+        , subq_0.ds__month AS metric_time__month
+        , subq_0.ds__quarter AS metric_time__quarter
+        , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
+        , subq_0.listing
+        , subq_0.guest
+        , subq_0.host
+        , subq_0.booking__listing
+        , subq_0.booking__guest
+        , subq_0.booking__host
+        , subq_0.is_instant
+        , subq_0.booking__is_instant
+        , subq_0.bookings
+        , subq_0.instant_bookings
+        , subq_0.booking_value
+        , subq_0.max_booking_value
+        , subq_0.min_booking_value
+        , subq_0.bookers
+        , subq_0.average_booking_value
+        , subq_0.referred_bookings
+        , subq_0.median_booking_value
+        , subq_0.booking_value_p99
+        , subq_0.discrete_booking_value_p99
+        , subq_0.approximate_continuous_booking_value_p99
+        , subq_0.approximate_discrete_booking_value_p99
+      FROM (
+        -- Read Elements From Semantic Model 'bookings_source'
+        SELECT
+          1 AS bookings
+          , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+          , bookings_source_src_10001.booking_value
+          , bookings_source_src_10001.booking_value AS max_booking_value
+          , bookings_source_src_10001.booking_value AS min_booking_value
+          , bookings_source_src_10001.guest_id AS bookers
+          , bookings_source_src_10001.booking_value AS average_booking_value
+          , bookings_source_src_10001.booking_value AS booking_payments
+          , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+          , bookings_source_src_10001.booking_value AS median_booking_value
+          , bookings_source_src_10001.booking_value AS booking_value_p99
+          , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+          , bookings_source_src_10001.is_instant
+          , bookings_source_src_10001.ds AS ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , bookings_source_src_10001.is_instant AS booking__is_instant
+          , bookings_source_src_10001.ds AS booking__ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS booking__paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , bookings_source_src_10001.listing_id AS listing
+          , bookings_source_src_10001.guest_id AS guest
+          , bookings_source_src_10001.host_id AS host
+          , bookings_source_src_10001.listing_id AS booking__listing
+          , bookings_source_src_10001.guest_id AS booking__guest
+          , bookings_source_src_10001.host_id AS booking__host
+        FROM ***************************.fct_bookings bookings_source_src_10001
+      ) subq_0
+    ) subq_1
+  ) subq_2
+  GROUP BY
+    subq_2.metric_time__extract_dow
+) subq_3
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0_optimized.sql
new file mode 100644
index 0000000000..33b25a725c
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_date_part__plan0_optimized.sql
@@ -0,0 +1,17 @@
+-- Aggregate Measures
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_dow
+  , SUM(bookings) AS bookings
+FROM (
+  -- Read Elements From Semantic Model 'bookings_source'
+  -- Metric Time Dimension 'ds'
+  -- Pass Only Elements:
+  --   ['bookings', 'metric_time__extract_dow']
+  SELECT
+    EXTRACT(dow FROM ds) AS metric_time__extract_dow
+    , 1 AS bookings
+  FROM ***************************.fct_bookings bookings_source_src_10001
+) subq_6
+GROUP BY
+  metric_time__extract_dow
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0.sql
new file mode 100644
index 0000000000..b1321ec748
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0.sql
@@ -0,0 +1,258 @@
+-- Compute Metrics via Expressions
+SELECT
+  subq_3.metric_time__extract_year
+  , subq_3.metric_time__extract_quarter
+  , subq_3.metric_time__extract_month
+  , subq_3.metric_time__extract_week
+  , subq_3.metric_time__extract_day
+  , subq_3.metric_time__extract_dow
+  , subq_3.metric_time__extract_doy
+  , subq_3.bookings
+FROM (
+  -- Aggregate Measures
+  SELECT
+    subq_2.metric_time__extract_year
+    , subq_2.metric_time__extract_quarter
+    , subq_2.metric_time__extract_month
+    , subq_2.metric_time__extract_week
+    , subq_2.metric_time__extract_day
+    , subq_2.metric_time__extract_dow
+    , subq_2.metric_time__extract_doy
+    , SUM(subq_2.bookings) AS bookings
+  FROM (
+    -- Pass Only Elements:
+    --   ['bookings',
+    --    'metric_time__extract_day',
+    --    'metric_time__extract_dow',
+    --    'metric_time__extract_doy',
+    --    'metric_time__extract_week',
+    --    'metric_time__extract_month',
+    --    'metric_time__extract_quarter',
+    --    'metric_time__extract_year']
+    SELECT
+      subq_1.metric_time__extract_year
+      , subq_1.metric_time__extract_quarter
+      , subq_1.metric_time__extract_month
+      , subq_1.metric_time__extract_week
+      , subq_1.metric_time__extract_day
+      , subq_1.metric_time__extract_dow
+      , subq_1.metric_time__extract_doy
+      , subq_1.bookings
+    FROM (
+      -- Metric Time Dimension 'ds'
+      SELECT
+        subq_0.ds__day
+        , subq_0.ds__week
+        , subq_0.ds__month
+        , subq_0.ds__quarter
+        , subq_0.ds__year
+        , subq_0.ds__extract_year
+        , subq_0.ds__extract_quarter
+        , subq_0.ds__extract_month
+        , subq_0.ds__extract_week
+        , subq_0.ds__extract_day
+        , subq_0.ds__extract_dow
+        , subq_0.ds__extract_doy
+        , subq_0.ds_partitioned__day
+        , subq_0.ds_partitioned__week
+        , subq_0.ds_partitioned__month
+        , subq_0.ds_partitioned__quarter
+        , subq_0.ds_partitioned__year
+        , subq_0.ds_partitioned__extract_year
+        , subq_0.ds_partitioned__extract_quarter
+        , subq_0.ds_partitioned__extract_month
+        , subq_0.ds_partitioned__extract_week
+        , subq_0.ds_partitioned__extract_day
+        , subq_0.ds_partitioned__extract_dow
+        , subq_0.ds_partitioned__extract_doy
+        , subq_0.paid_at__day
+        , subq_0.paid_at__week
+        , subq_0.paid_at__month
+        , subq_0.paid_at__quarter
+        , subq_0.paid_at__year
+        , subq_0.paid_at__extract_year
+        , subq_0.paid_at__extract_quarter
+        , subq_0.paid_at__extract_month
+        , subq_0.paid_at__extract_week
+        , subq_0.paid_at__extract_day
+        , subq_0.paid_at__extract_dow
+        , subq_0.paid_at__extract_doy
+        , subq_0.booking__ds__day
+        , subq_0.booking__ds__week
+        , subq_0.booking__ds__month
+        , subq_0.booking__ds__quarter
+        , subq_0.booking__ds__year
+        , subq_0.booking__ds__extract_year
+        , subq_0.booking__ds__extract_quarter
+        , subq_0.booking__ds__extract_month
+        , subq_0.booking__ds__extract_week
+        , subq_0.booking__ds__extract_day
+        , subq_0.booking__ds__extract_dow
+        , subq_0.booking__ds__extract_doy
+        , subq_0.booking__ds_partitioned__day
+        , subq_0.booking__ds_partitioned__week
+        , subq_0.booking__ds_partitioned__month
+        , subq_0.booking__ds_partitioned__quarter
+        , subq_0.booking__ds_partitioned__year
+        , subq_0.booking__ds_partitioned__extract_year
+        , subq_0.booking__ds_partitioned__extract_quarter
+        , subq_0.booking__ds_partitioned__extract_month
+        , subq_0.booking__ds_partitioned__extract_week
+        , subq_0.booking__ds_partitioned__extract_day
+        , subq_0.booking__ds_partitioned__extract_dow
+        , subq_0.booking__ds_partitioned__extract_doy
+        , subq_0.booking__paid_at__day
+        , subq_0.booking__paid_at__week
+        , subq_0.booking__paid_at__month
+        , subq_0.booking__paid_at__quarter
+        , subq_0.booking__paid_at__year
+        , subq_0.booking__paid_at__extract_year
+        , subq_0.booking__paid_at__extract_quarter
+        , subq_0.booking__paid_at__extract_month
+        , subq_0.booking__paid_at__extract_week
+        , subq_0.booking__paid_at__extract_day
+        , subq_0.booking__paid_at__extract_dow
+        , subq_0.booking__paid_at__extract_doy
+        , subq_0.ds__day AS metric_time__day
+        , subq_0.ds__week AS metric_time__week
+        , subq_0.ds__month AS metric_time__month
+        , subq_0.ds__quarter AS metric_time__quarter
+        , subq_0.ds__year AS metric_time__year
+        , subq_0.ds__extract_year AS metric_time__extract_year
+        , subq_0.ds__extract_quarter AS metric_time__extract_quarter
+        , subq_0.ds__extract_month AS metric_time__extract_month
+        , subq_0.ds__extract_week AS metric_time__extract_week
+        , subq_0.ds__extract_day AS metric_time__extract_day
+        , subq_0.ds__extract_dow AS metric_time__extract_dow
+        , subq_0.ds__extract_doy AS metric_time__extract_doy
+        , subq_0.listing
+        , subq_0.guest
+        , subq_0.host
+        , subq_0.booking__listing
+        , subq_0.booking__guest
+        , subq_0.booking__host
+        , subq_0.is_instant
+        , subq_0.booking__is_instant
+        , subq_0.bookings
+        , subq_0.instant_bookings
+        , subq_0.booking_value
+        , subq_0.max_booking_value
+        , subq_0.min_booking_value
+        , subq_0.bookers
+        , subq_0.average_booking_value
+        , subq_0.referred_bookings
+        , subq_0.median_booking_value
+        , subq_0.booking_value_p99
+        , subq_0.discrete_booking_value_p99
+        , subq_0.approximate_continuous_booking_value_p99
+        , subq_0.approximate_discrete_booking_value_p99
+      FROM (
+        -- Read Elements From Semantic Model 'bookings_source'
+        SELECT
+          1 AS bookings
+          , CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
+          , bookings_source_src_10001.booking_value
+          , bookings_source_src_10001.booking_value AS max_booking_value
+          , bookings_source_src_10001.booking_value AS min_booking_value
+          , bookings_source_src_10001.guest_id AS bookers
+          , bookings_source_src_10001.booking_value AS average_booking_value
+          , bookings_source_src_10001.booking_value AS booking_payments
+          , CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END AS referred_bookings
+          , bookings_source_src_10001.booking_value AS median_booking_value
+          , bookings_source_src_10001.booking_value AS booking_value_p99
+          , bookings_source_src_10001.booking_value AS discrete_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_continuous_booking_value_p99
+          , bookings_source_src_10001.booking_value AS approximate_discrete_booking_value_p99
+          , bookings_source_src_10001.is_instant
+          , bookings_source_src_10001.ds AS ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+          , bookings_source_src_10001.is_instant AS booking__is_instant
+          , bookings_source_src_10001.ds AS booking__ds__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds) AS booking__ds__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds) AS booking__ds__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds) AS booking__ds__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds) AS booking__ds__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+          , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
+          , DATE_TRUNC('week', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__week
+          , DATE_TRUNC('month', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__year
+          , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+          , bookings_source_src_10001.paid_at AS booking__paid_at__day
+          , DATE_TRUNC('week', bookings_source_src_10001.paid_at) AS booking__paid_at__week
+          , DATE_TRUNC('month', bookings_source_src_10001.paid_at) AS booking__paid_at__month
+          , DATE_TRUNC('quarter', bookings_source_src_10001.paid_at) AS booking__paid_at__quarter
+          , DATE_TRUNC('year', bookings_source_src_10001.paid_at) AS booking__paid_at__year
+          , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
+          , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
+          , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
+          , EXTRACT(week FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+          , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
+          , EXTRACT(dow FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+          , EXTRACT(doy FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+          , bookings_source_src_10001.listing_id AS listing
+          , bookings_source_src_10001.guest_id AS guest
+          , bookings_source_src_10001.host_id AS host
+          , bookings_source_src_10001.listing_id AS booking__listing
+          , bookings_source_src_10001.guest_id AS booking__guest
+          , bookings_source_src_10001.host_id AS booking__host
+        FROM ***************************.fct_bookings bookings_source_src_10001
+      ) subq_0
+    ) subq_1
+  ) subq_2
+  GROUP BY
+    subq_2.metric_time__extract_year
+    , subq_2.metric_time__extract_quarter
+    , subq_2.metric_time__extract_month
+    , subq_2.metric_time__extract_week
+    , subq_2.metric_time__extract_day
+    , subq_2.metric_time__extract_dow
+    , subq_2.metric_time__extract_doy
+) subq_3
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0_optimized.sql b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
new file mode 100644
index 0000000000..402fb4f517
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/Snowflake/test_simple_query_with_multiple_date_parts__plan0_optimized.sql
@@ -0,0 +1,42 @@
+-- Aggregate Measures
+-- Compute Metrics via Expressions
+SELECT
+  metric_time__extract_year
+  , metric_time__extract_quarter
+  , metric_time__extract_month
+  , metric_time__extract_week
+  , metric_time__extract_day
+  , metric_time__extract_dow
+  , metric_time__extract_doy
+  , SUM(bookings) AS bookings
+FROM (
+  -- Read Elements From Semantic Model 'bookings_source'
+  -- Metric Time Dimension 'ds'
+  -- Pass Only Elements:
+  --   ['bookings',
+  --    'metric_time__extract_day',
+  --    'metric_time__extract_dow',
+  --    'metric_time__extract_doy',
+  --    'metric_time__extract_week',
+  --    'metric_time__extract_month',
+  --    'metric_time__extract_quarter',
+  --    'metric_time__extract_year']
+  SELECT
+    EXTRACT(year FROM ds) AS metric_time__extract_year
+    , EXTRACT(quarter FROM ds) AS metric_time__extract_quarter
+    , EXTRACT(month FROM ds) AS metric_time__extract_month
+    , EXTRACT(week FROM ds) AS metric_time__extract_week
+    , EXTRACT(day FROM ds) AS metric_time__extract_day
+    , EXTRACT(dow FROM ds) AS metric_time__extract_dow
+    , EXTRACT(doy FROM ds) AS metric_time__extract_doy
+    , 1 AS bookings
+  FROM ***************************.fct_bookings bookings_source_src_10001
+) subq_6
+GROUP BY
+  metric_time__extract_year
+  , metric_time__extract_quarter
+  , metric_time__extract_month
+  , metric_time__extract_week
+  , metric_time__extract_day
+  , metric_time__extract_dow
+  , metric_time__extract_doy
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
index 63e2148484..ff39aa7c9b 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_through_scd_dimension__plan0.xml
@@ -1434,35 +1434,35 @@
                                 </SqlTableFromClauseNode>
                             </SqlSelectStatementNode>
                             <SqlSelectStatementNode>
-                                <!-- description =                    -->
-                                <!--   Pass Only Elements:            -->
-                                <!--     ['home_state_latest',        -->
-                                <!--      'user__home_state_latest',  -->
-                                <!--      'ds__day',                  -->
-                                <!--      'ds__week',                 -->
-                                <!--      'ds__month',                -->
-                                <!--      'ds__quarter',              -->
-                                <!--      'ds__year',                 -->
-                                <!--      'ds__day',                  -->
-                                <!--      'ds__day',                  -->
-                                <!--      'ds__day',                  -->
-                                <!--      'ds__day',                  -->
-                                <!--      'ds__day',                  -->
-                                <!--      'ds__day',                  -->
-                                <!--      'ds__day',                  -->
-                                <!--      'user__ds__day',            -->
-                                <!--      'user__ds__week',           -->
-                                <!--      'user__ds__month',          -->
-                                <!--      'user__ds__quarter',        -->
-                                <!--      'user__ds__year',           -->
-                                <!--      'user__ds__day',            -->
-                                <!--      'user__ds__day',            -->
-                                <!--      'user__ds__day',            -->
-                                <!--      'user__ds__day',            -->
-                                <!--      'user__ds__day',            -->
-                                <!--      'user__ds__day',            -->
-                                <!--      'user__ds__day',            -->
-                                <!--      'user']                     -->
+                                <!-- description =                      -->
+                                <!--   Pass Only Elements:              -->
+                                <!--     ['home_state_latest',          -->
+                                <!--      'user__home_state_latest',    -->
+                                <!--      'ds__day',                    -->
+                                <!--      'ds__week',                   -->
+                                <!--      'ds__month',                  -->
+                                <!--      'ds__quarter',                -->
+                                <!--      'ds__year',                   -->
+                                <!--      'ds__extract_year',           -->
+                                <!--      'ds__extract_quarter',        -->
+                                <!--      'ds__extract_month',          -->
+                                <!--      'ds__extract_week',           -->
+                                <!--      'ds__extract_day',            -->
+                                <!--      'ds__extract_dow',            -->
+                                <!--      'ds__extract_doy',            -->
+                                <!--      'user__ds__day',              -->
+                                <!--      'user__ds__week',             -->
+                                <!--      'user__ds__month',            -->
+                                <!--      'user__ds__quarter',          -->
+                                <!--      'user__ds__year',             -->
+                                <!--      'user__ds__extract_year',     -->
+                                <!--      'user__ds__extract_quarter',  -->
+                                <!--      'user__ds__extract_month',    -->
+                                <!--      'user__ds__extract_week',     -->
+                                <!--      'user__ds__extract_day',      -->
+                                <!--      'user__ds__extract_dow',      -->
+                                <!--      'user__ds__extract_doy',      -->
+                                <!--      'user']                       -->
                                 <!-- node_id = ss_12 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
index a013e8d8c1..ce6f655f22 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multi_hop_to_scd_dimension__plan0.xml
@@ -1054,59 +1054,59 @@
                                 </SqlTableFromClauseNode>
                             </SqlSelectStatementNode>
                             <SqlSelectStatementNode>
-                                <!-- description =                               -->
-                                <!--   Pass Only Elements:                       -->
-                                <!--     ['is_confirmed_lux',                    -->
-                                <!--      'lux_listing__is_confirmed_lux',       -->
-                                <!--      'window_start__day',                   -->
-                                <!--      'window_start__week',                  -->
-                                <!--      'window_start__month',                 -->
-                                <!--      'window_start__quarter',               -->
-                                <!--      'window_start__year',                  -->
-                                <!--      'window_start__day',                   -->
-                                <!--      'window_start__day',                   -->
-                                <!--      'window_start__day',                   -->
-                                <!--      'window_start__day',                   -->
-                                <!--      'window_start__day',                   -->
-                                <!--      'window_start__day',                   -->
-                                <!--      'window_start__day',                   -->
-                                <!--      'window_end__day',                     -->
-                                <!--      'window_end__week',                    -->
-                                <!--      'window_end__month',                   -->
-                                <!--      'window_end__quarter',                 -->
-                                <!--      'window_end__year',                    -->
-                                <!--      'window_end__day',                     -->
-                                <!--      'window_end__day',                     -->
-                                <!--      'window_end__day',                     -->
-                                <!--      'window_end__day',                     -->
-                                <!--      'window_end__day',                     -->
-                                <!--      'window_end__day',                     -->
-                                <!--      'window_end__day',                     -->
-                                <!--      'lux_listing__window_start__day',      -->
-                                <!--      'lux_listing__window_start__week',     -->
-                                <!--      'lux_listing__window_start__month',    -->
-                                <!--      'lux_listing__window_start__quarter',  -->
-                                <!--      'lux_listing__window_start__year',     -->
-                                <!--      'lux_listing__window_start__day',      -->
-                                <!--      'lux_listing__window_start__day',      -->
-                                <!--      'lux_listing__window_start__day',      -->
-                                <!--      'lux_listing__window_start__day',      -->
-                                <!--      'lux_listing__window_start__day',      -->
-                                <!--      'lux_listing__window_start__day',      -->
-                                <!--      'lux_listing__window_start__day',      -->
-                                <!--      'lux_listing__window_end__day',        -->
-                                <!--      'lux_listing__window_end__week',       -->
-                                <!--      'lux_listing__window_end__month',      -->
-                                <!--      'lux_listing__window_end__quarter',    -->
-                                <!--      'lux_listing__window_end__year',       -->
-                                <!--      'lux_listing__window_end__day',        -->
-                                <!--      'lux_listing__window_end__day',        -->
-                                <!--      'lux_listing__window_end__day',        -->
-                                <!--      'lux_listing__window_end__day',        -->
-                                <!--      'lux_listing__window_end__day',        -->
-                                <!--      'lux_listing__window_end__day',        -->
-                                <!--      'lux_listing__window_end__day',        -->
-                                <!--      'lux_listing']                         -->
+                                <!-- description =                                       -->
+                                <!--   Pass Only Elements:                               -->
+                                <!--     ['is_confirmed_lux',                            -->
+                                <!--      'lux_listing__is_confirmed_lux',               -->
+                                <!--      'window_start__day',                           -->
+                                <!--      'window_start__week',                          -->
+                                <!--      'window_start__month',                         -->
+                                <!--      'window_start__quarter',                       -->
+                                <!--      'window_start__year',                          -->
+                                <!--      'window_start__extract_year',                  -->
+                                <!--      'window_start__extract_quarter',               -->
+                                <!--      'window_start__extract_month',                 -->
+                                <!--      'window_start__extract_week',                  -->
+                                <!--      'window_start__extract_day',                   -->
+                                <!--      'window_start__extract_dow',                   -->
+                                <!--      'window_start__extract_doy',                   -->
+                                <!--      'window_end__day',                             -->
+                                <!--      'window_end__week',                            -->
+                                <!--      'window_end__month',                           -->
+                                <!--      'window_end__quarter',                         -->
+                                <!--      'window_end__year',                            -->
+                                <!--      'window_end__extract_year',                    -->
+                                <!--      'window_end__extract_quarter',                 -->
+                                <!--      'window_end__extract_month',                   -->
+                                <!--      'window_end__extract_week',                    -->
+                                <!--      'window_end__extract_day',                     -->
+                                <!--      'window_end__extract_dow',                     -->
+                                <!--      'window_end__extract_doy',                     -->
+                                <!--      'lux_listing__window_start__day',              -->
+                                <!--      'lux_listing__window_start__week',             -->
+                                <!--      'lux_listing__window_start__month',            -->
+                                <!--      'lux_listing__window_start__quarter',          -->
+                                <!--      'lux_listing__window_start__year',             -->
+                                <!--      'lux_listing__window_start__extract_year',     -->
+                                <!--      'lux_listing__window_start__extract_quarter',  -->
+                                <!--      'lux_listing__window_start__extract_month',    -->
+                                <!--      'lux_listing__window_start__extract_week',     -->
+                                <!--      'lux_listing__window_start__extract_day',      -->
+                                <!--      'lux_listing__window_start__extract_dow',      -->
+                                <!--      'lux_listing__window_start__extract_doy',      -->
+                                <!--      'lux_listing__window_end__day',                -->
+                                <!--      'lux_listing__window_end__week',               -->
+                                <!--      'lux_listing__window_end__month',              -->
+                                <!--      'lux_listing__window_end__quarter',            -->
+                                <!--      'lux_listing__window_end__year',               -->
+                                <!--      'lux_listing__window_end__extract_year',       -->
+                                <!--      'lux_listing__window_end__extract_quarter',    -->
+                                <!--      'lux_listing__window_end__extract_month',      -->
+                                <!--      'lux_listing__window_end__extract_week',       -->
+                                <!--      'lux_listing__window_end__extract_day',        -->
+                                <!--      'lux_listing__window_end__extract_dow',        -->
+                                <!--      'lux_listing__window_end__extract_doy',        -->
+                                <!--      'lux_listing']                                 -->
                                 <!-- node_id = ss_6 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
index 4a1df37c68..188f6f7b0d 100644
--- a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_multihop_node__plan0.xml
@@ -906,37 +906,37 @@
                                 </SqlTableFromClauseNode>
                             </SqlSelectStatementNode>
                             <SqlSelectStatementNode>
-                                <!-- description =                                 -->
-                                <!--   Pass Only Elements:                         -->
-                                <!--     ['customer_name',                         -->
-                                <!--      'customer_atomic_weight',                -->
-                                <!--      'customer_id__customer_name',            -->
-                                <!--      'customer_id__customer_atomic_weight',   -->
-                                <!--      'ds_partitioned__day',                   -->
-                                <!--      'ds_partitioned__week',                  -->
-                                <!--      'ds_partitioned__month',                 -->
-                                <!--      'ds_partitioned__quarter',               -->
-                                <!--      'ds_partitioned__year',                  -->
-                                <!--      'ds_partitioned__day',                   -->
-                                <!--      'ds_partitioned__day',                   -->
-                                <!--      'ds_partitioned__day',                   -->
-                                <!--      'ds_partitioned__day',                   -->
-                                <!--      'ds_partitioned__day',                   -->
-                                <!--      'ds_partitioned__day',                   -->
-                                <!--      'ds_partitioned__day',                   -->
-                                <!--      'customer_id__ds_partitioned__day',      -->
-                                <!--      'customer_id__ds_partitioned__week',     -->
-                                <!--      'customer_id__ds_partitioned__month',    -->
-                                <!--      'customer_id__ds_partitioned__quarter',  -->
-                                <!--      'customer_id__ds_partitioned__year',     -->
-                                <!--      'customer_id__ds_partitioned__day',      -->
-                                <!--      'customer_id__ds_partitioned__day',      -->
-                                <!--      'customer_id__ds_partitioned__day',      -->
-                                <!--      'customer_id__ds_partitioned__day',      -->
-                                <!--      'customer_id__ds_partitioned__day',      -->
-                                <!--      'customer_id__ds_partitioned__day',      -->
-                                <!--      'customer_id__ds_partitioned__day',      -->
-                                <!--      'customer_id']                           -->
+                                <!-- description =                                         -->
+                                <!--   Pass Only Elements:                                 -->
+                                <!--     ['customer_name',                                 -->
+                                <!--      'customer_atomic_weight',                        -->
+                                <!--      'customer_id__customer_name',                    -->
+                                <!--      'customer_id__customer_atomic_weight',           -->
+                                <!--      'ds_partitioned__day',                           -->
+                                <!--      'ds_partitioned__week',                          -->
+                                <!--      'ds_partitioned__month',                         -->
+                                <!--      'ds_partitioned__quarter',                       -->
+                                <!--      'ds_partitioned__year',                          -->
+                                <!--      'ds_partitioned__extract_year',                  -->
+                                <!--      'ds_partitioned__extract_quarter',               -->
+                                <!--      'ds_partitioned__extract_month',                 -->
+                                <!--      'ds_partitioned__extract_week',                  -->
+                                <!--      'ds_partitioned__extract_day',                   -->
+                                <!--      'ds_partitioned__extract_dow',                   -->
+                                <!--      'ds_partitioned__extract_doy',                   -->
+                                <!--      'customer_id__ds_partitioned__day',              -->
+                                <!--      'customer_id__ds_partitioned__week',             -->
+                                <!--      'customer_id__ds_partitioned__month',            -->
+                                <!--      'customer_id__ds_partitioned__quarter',          -->
+                                <!--      'customer_id__ds_partitioned__year',             -->
+                                <!--      'customer_id__ds_partitioned__extract_year',     -->
+                                <!--      'customer_id__ds_partitioned__extract_quarter',  -->
+                                <!--      'customer_id__ds_partitioned__extract_month',    -->
+                                <!--      'customer_id__ds_partitioned__extract_week',     -->
+                                <!--      'customer_id__ds_partitioned__extract_day',      -->
+                                <!--      'customer_id__ds_partitioned__extract_dow',      -->
+                                <!--      'customer_id__ds_partitioned__extract_doy',      -->
+                                <!--      'customer_id']                                   -->
                                 <!-- node_id = ss_5 -->
                                 <!-- col0 =                                                    -->
                                 <!--   {'class': 'SqlSelectColumn',                            -->
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_offset_window_with_date_part__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_offset_window_with_date_part__plan0.xml
new file mode 100644
index 0000000000..81d5db4a69
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_offset_window_with_date_part__plan0.xml
@@ -0,0 +1,2165 @@
+<SqlQueryPlan>
+    <SqlSelectStatementNode>
+        <!-- description = Compute Metrics via Expressions -->
+        <!-- node_id = ss_18 -->
+        <!-- col0 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_808),  -->
+        <!--    'column_alias': 'metric_time__extract_dow'}            -->
+        <!-- col1 =                                                                                   -->
+        <!--   {'class': 'SqlSelectColumn',                                                           -->
+        <!--    'expr': SqlStringExpression(node_id=str_0 sql_expr=bookings - bookings_2_weeks_ago),  -->
+        <!--    'column_alias': 'bookings_growth_2_weeks'}                                            -->
+        <!-- from_source = SqlSelectStatementNode(node_id=ss_17) -->
+        <!-- where = None -->
+        <SqlSelectStatementNode>
+            <!-- description = Combine Metrics -->
+            <!-- node_id = ss_17 -->
+            <!-- col0 =                                                                            -->
+            <!--   {'class': 'SqlSelectColumn',                                                    -->
+            <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_2, sql_function=COALESCE),  -->
+            <!--    'column_alias': 'metric_time__extract_dow'}                                    -->
+            <!-- col1 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_804),  -->
+            <!--    'column_alias': 'bookings'}                            -->
+            <!-- col2 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_805),  -->
+            <!--    'column_alias': 'bookings_2_weeks_ago'}                -->
+            <!-- from_source = SqlSelectStatementNode(node_id=ss_10) -->
+            <!-- join_0 =                                                   -->
+            <!--   {'class': 'SqlJoinDescription',                          -->
+            <!--    'right_source': SqlSelectStatementNode(node_id=ss_16),  -->
+            <!--    'right_source_alias': 'subq_12',                        -->
+            <!--    'join_type': SqlJoinType.INNER,                         -->
+            <!--    'on_condition': SqlLogicalExpression(node_id=lo_1)}     -->
+            <!-- where = None -->
+            <SqlSelectStatementNode>
+                <!-- description = Compute Metrics via Expressions -->
+                <!-- node_id = ss_10 -->
+                <!-- col0 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                <!-- col1 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                <!--    'column_alias': 'bookings'}                            -->
+                <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
+                <!-- where = None -->
+                <SqlSelectStatementNode>
+                    <!-- description = Aggregate Measures -->
+                    <!-- node_id = ss_9 -->
+                    <!-- col0 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                    <!-- col1 =                                                                       -->
+                    <!--   {'class': 'SqlSelectColumn',                                               -->
+                    <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_0, sql_function=SUM),  -->
+                    <!--    'column_alias': 'bookings'}                                               -->
+                    <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
+                    <!-- group_by0 =                                               -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                    <!-- where = None -->
+                    <SqlSelectStatementNode>
+                        <!-- description =                                 -->
+                        <!--   Pass Only Elements:                         -->
+                        <!--     ['bookings', 'metric_time__extract_dow']  -->
+                        <!-- node_id = ss_8 -->
+                        <!-- col0 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                        <!-- col1 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                        <!--    'column_alias': 'bookings'}                            -->
+                        <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
+                        <!-- where = None -->
+                        <SqlSelectStatementNode>
+                            <!-- description = Metric Time Dimension 'ds' -->
+                            <!-- node_id = ss_7 -->
+                            <!-- col0 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                            <!--    'column_alias': 'ds__day'}                             -->
+                            <!-- col1 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                            <!--    'column_alias': 'ds__week'}                            -->
+                            <!-- col2 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                            <!--    'column_alias': 'ds__month'}                           -->
+                            <!-- col3 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                            <!--    'column_alias': 'ds__quarter'}                         -->
+                            <!-- col4 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
+                            <!--    'column_alias': 'ds__year'}                            -->
+                            <!-- col5 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
+                            <!-- col6 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
+                            <!-- col7 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
+                            <!-- col8 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
+                            <!-- col9 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
+                            <!-- col10 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
+                            <!-- col11 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
+                            <!-- col12 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!-- col13 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!-- col14 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!-- col15 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!-- col16 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!-- col17 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
+                            <!-- col18 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
+                            <!-- col19 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
+                            <!-- col20 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
+                            <!-- col21 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
+                            <!-- col22 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
+                            <!-- col23 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
+                            <!-- col24 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!-- col25 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!-- col26 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!-- col27 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!-- col28 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!-- col29 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
+                            <!-- col30 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
+                            <!-- col31 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
+                            <!-- col32 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
+                            <!-- col33 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
+                            <!-- col34 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
+                            <!-- col35 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
+                            <!-- col36 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!-- col37 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!-- col38 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!-- col39 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!-- col40 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!-- col41 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
+                            <!-- col42 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
+                            <!-- col43 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
+                            <!-- col44 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
+                            <!-- col45 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
+                            <!-- col46 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
+                            <!-- col47 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
+                            <!-- col48 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!-- col49 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!-- col50 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!-- col51 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!-- col52 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col53 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col54 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col55 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col56 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col57 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
+                            <!-- col60 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                            <!--    'column_alias': 'metric_time__day'}                    -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                            <!--    'column_alias': 'metric_time__week'}                   -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                            <!--    'column_alias': 'metric_time__month'}                  -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                            <!--    'column_alias': 'metric_time__quarter'}                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                            <!--    'column_alias': 'metric_time__year'}                   -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                            <!--    'column_alias': 'metric_time__extract_year'}           -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                            <!--    'column_alias': 'metric_time__extract_month'}          -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                            <!--    'column_alias': 'metric_time__extract_week'}           -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                            <!--    'column_alias': 'metric_time__extract_day'}            -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                            <!--    'column_alias': 'metric_time__extract_doy'}            -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col92 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col93 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col94 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col95 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col96 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col97 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col98 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col99 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col100 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col101 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col102 =                                                  -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                            <!--    'column_alias': 'discrete_booking_value_p99'}          -->
+                            <!-- col103 =                                                        -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
+                            <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
+                            <!-- col104 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
+                            <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
+                            <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
+                            <!-- where = None -->
+                            <SqlSelectStatementNode>
+                                <!-- description = Read Elements From Semantic Model 'bookings_source' -->
+                                <!-- node_id = ss_10001 -->
+                                <!-- col0 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                 -->
+                                <!--    'expr': SqlStringExpression(node_id=str_10000 sql_expr=1),  -->
+                                <!--    'column_alias': 'bookings'}                                 -->
+                                <!-- col1 =                                                                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                                                                      -->
+                                <!--    'expr': SqlStringExpression(node_id=str_10001 sql_expr=CASE WHEN is_instant THEN 1 ELSE 0 END),  -->
+                                <!--    'column_alias': 'instant_bookings'}                                                              -->
+                                <!-- col2 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
+                                <!--    'column_alias': 'booking_value'}                         -->
+                                <!-- col3 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
+                                <!--    'column_alias': 'max_booking_value'}                     -->
+                                <!-- col4 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
+                                <!--    'column_alias': 'min_booking_value'}                     -->
+                                <!-- col5 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
+                                <!--    'column_alias': 'bookers'}                               -->
+                                <!-- col6 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
+                                <!--    'column_alias': 'average_booking_value'}                 -->
+                                <!-- col7 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
+                                <!--    'column_alias': 'booking_payments'}                      -->
+                                <!-- col8 =                                                                                                           -->
+                                <!--   {'class': 'SqlSelectColumn',                                                                                   -->
+                                <!--    'expr': SqlStringExpression(node_id=str_10002 sql_expr=CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END),  -->
+                                <!--    'column_alias': 'referred_bookings'}                                                                          -->
+                                <!-- col9 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
+                                <!--    'column_alias': 'median_booking_value'}                  -->
+                                <!-- col10 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
+                                <!--    'column_alias': 'booking_value_p99'}                     -->
+                                <!-- col11 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                <!--    'column_alias': 'discrete_booking_value_p99'}            -->
+                                <!-- col12 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
+                                <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
+                                <!-- col13 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
+                                <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
+                                <!-- col14 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                <!--    'column_alias': 'is_instant'}                            -->
+                                <!-- col15 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                <!--    'column_alias': 'ds__day'}                               -->
+                                <!-- col16 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10008),  -->
+                                <!--    'column_alias': 'ds__week'}                        -->
+                                <!-- col17 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10009),  -->
+                                <!--    'column_alias': 'ds__month'}                       -->
+                                <!-- col18 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10010),  -->
+                                <!--    'column_alias': 'ds__quarter'}                     -->
+                                <!-- col19 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
+                                <!--    'column_alias': 'ds__year'}                        -->
+                                <!-- col20 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                <!--    'column_alias': 'ds__extract_year'}              -->
+                                <!-- col21 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                <!-- col22 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                <!--    'column_alias': 'ds__extract_month'}             -->
+                                <!-- col23 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                <!--    'column_alias': 'ds__extract_week'}              -->
+                                <!-- col24 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                <!--    'column_alias': 'ds__extract_day'}               -->
+                                <!-- col25 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                <!--    'column_alias': 'ds__extract_dow'}               -->
+                                <!-- col26 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                <!--    'column_alias': 'ds__extract_doy'}               -->
+                                <!-- col27 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                <!--    'column_alias': 'ds_partitioned__day'}                   -->
+                                <!-- col28 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
+                                <!--    'column_alias': 'ds_partitioned__week'}            -->
+                                <!-- col29 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
+                                <!--    'column_alias': 'ds_partitioned__month'}           -->
+                                <!-- col30 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
+                                <!--    'column_alias': 'ds_partitioned__quarter'}         -->
+                                <!-- col31 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
+                                <!--    'column_alias': 'ds_partitioned__year'}            -->
+                                <!-- col32 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                <!-- col33 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                <!-- col34 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                <!-- col35 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                <!-- col36 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                <!-- col37 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                <!-- col38 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
+                                <!-- col39 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                <!--    'column_alias': 'paid_at__day'}                          -->
+                                <!-- col40 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
+                                <!--    'column_alias': 'paid_at__week'}                   -->
+                                <!-- col41 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
+                                <!--    'column_alias': 'paid_at__month'}                  -->
+                                <!-- col42 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
+                                <!--    'column_alias': 'paid_at__quarter'}                -->
+                                <!-- col43 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
+                                <!--    'column_alias': 'paid_at__year'}                   -->
+                                <!-- col44 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                <!-- col45 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                <!-- col46 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                <!-- col47 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                <!-- col48 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                <!-- col49 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}          -->
+                                <!-- col50 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}          -->
+                                <!-- col51 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                   -->
+                                <!-- col52 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                <!--    'column_alias': 'booking__ds__day'}                      -->
+                                <!-- col53 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
+                                <!--    'column_alias': 'booking__ds__week'}               -->
+                                <!-- col54 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
+                                <!--    'column_alias': 'booking__ds__month'}              -->
+                                <!-- col55 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
+                                <!--    'column_alias': 'booking__ds__quarter'}            -->
+                                <!-- col56 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
+                                <!--    'column_alias': 'booking__ds__year'}               -->
+                                <!-- col57 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                <!-- col58 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                <!-- col59 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                <!-- col60 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                <!-- col61 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                <!-- col62 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                <!-- col63 =                                             -->
+                                <!--   {'class': 'SqlSelectColumn',                      -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}      -->
+                                <!-- col64 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
+                                <!-- col65 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
+                                <!-- col66 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
+                                <!-- col67 =                                                 -->
+                                <!--   {'class': 'SqlSelectColumn',                          -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
+                                <!-- col68 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
+                                <!-- col69 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col70 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col71 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col72 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col73 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col74 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col75 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
+                                <!-- col76 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
+                                <!--    'column_alias': 'booking__paid_at__day'}                 -->
+                                <!-- col77 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
+                                <!--    'column_alias': 'booking__paid_at__week'}          -->
+                                <!-- col78 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
+                                <!--    'column_alias': 'booking__paid_at__month'}         -->
+                                <!-- col79 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
+                                <!--    'column_alias': 'booking__paid_at__quarter'}       -->
+                                <!-- col80 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
+                                <!--    'column_alias': 'booking__paid_at__year'}          -->
+                                <!-- col81 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                <!-- col82 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                           -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                <!-- col83 =                                                -->
+                                <!--   {'class': 'SqlSelectColumn',                         -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                <!-- col84 =                                               -->
+                                <!--   {'class': 'SqlSelectColumn',                        -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                <!-- col85 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                <!-- col86 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                <!-- col87 =                                              -->
+                                <!--   {'class': 'SqlSelectColumn',                       -->
+                                <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
+                                <!-- col88 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                <!--    'column_alias': 'listing'}                               -->
+                                <!-- col89 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                <!--    'column_alias': 'guest'}                                 -->
+                                <!-- col90 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
+                                <!--    'column_alias': 'host'}                                  -->
+                                <!-- col91 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
+                                <!--    'column_alias': 'booking__listing'}                      -->
+                                <!-- col92 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
+                                <!--    'column_alias': 'booking__guest'}                        -->
+                                <!-- col93 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
+                                <!--    'column_alias': 'booking__host'}                         -->
+                                <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
+                                <!-- where = None -->
+                                <SqlTableFromClauseNode>
+                                    <!-- description = Read from ***************************.fct_bookings -->
+                                    <!-- node_id = tfc_10001 -->
+                                    <!-- table_id = ***************************.fct_bookings -->
+                                </SqlTableFromClauseNode>
+                            </SqlSelectStatementNode>
+                        </SqlSelectStatementNode>
+                    </SqlSelectStatementNode>
+                </SqlSelectStatementNode>
+            </SqlSelectStatementNode>
+            <SqlSelectStatementNode>
+                <!-- description = Compute Metrics via Expressions -->
+                <!-- node_id = ss_16 -->
+                <!-- col0 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_800),  -->
+                <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                <!-- col1 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_801),  -->
+                <!--    'column_alias': 'bookings_2_weeks_ago'}                -->
+                <!-- from_source = SqlSelectStatementNode(node_id=ss_15) -->
+                <!-- where = None -->
+                <SqlSelectStatementNode>
+                    <!-- description = Aggregate Measures -->
+                    <!-- node_id = ss_15 -->
+                    <!-- col0 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
+                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                    <!-- col1 =                                                                       -->
+                    <!--   {'class': 'SqlSelectColumn',                                               -->
+                    <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_1, sql_function=SUM),  -->
+                    <!--    'column_alias': 'bookings'}                                               -->
+                    <!-- from_source = SqlSelectStatementNode(node_id=ss_14) -->
+                    <!-- group_by0 =                                               -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_799),  -->
+                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                    <!-- where = None -->
+                    <SqlSelectStatementNode>
+                        <!-- description =                                 -->
+                        <!--   Pass Only Elements:                         -->
+                        <!--     ['bookings', 'metric_time__extract_dow']  -->
+                        <!-- node_id = ss_14 -->
+                        <!-- col0 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_797),  -->
+                        <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                        <!-- col1 =                                                    -->
+                        <!--   {'class': 'SqlSelectColumn',                            -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_796),  -->
+                        <!--    'column_alias': 'bookings'}                            -->
+                        <!-- from_source = SqlSelectStatementNode(node_id=ss_13) -->
+                        <!-- where = None -->
+                        <SqlSelectStatementNode>
+                            <!-- description = Join to Time Spine Dataset -->
+                            <!-- node_id = ss_13 -->
+                            <!-- col0 =                                          -->
+                            <!--   {'class': 'SqlSelectColumn',                  -->
+                            <!--    'expr': SqlExtractExpression(node_id=ex_0),  -->
+                            <!--    'column_alias': 'metric_time__extract_dow'}  -->
+                            <!-- col1 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_717),  -->
+                            <!--    'column_alias': 'ds__day'}                             -->
+                            <!-- col2 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_718),  -->
+                            <!--    'column_alias': 'ds__week'}                            -->
+                            <!-- col3 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_719),  -->
+                            <!--    'column_alias': 'ds__month'}                           -->
+                            <!-- col4 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_720),  -->
+                            <!--    'column_alias': 'ds__quarter'}                         -->
+                            <!-- col5 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_721),  -->
+                            <!--    'column_alias': 'ds__year'}                            -->
+                            <!-- col6 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_722),  -->
+                            <!--    'column_alias': 'ds__extract_year'}                    -->
+                            <!-- col7 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_723),  -->
+                            <!--    'column_alias': 'ds__extract_quarter'}                 -->
+                            <!-- col8 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_724),  -->
+                            <!--    'column_alias': 'ds__extract_month'}                   -->
+                            <!-- col9 =                                                    -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_725),  -->
+                            <!--    'column_alias': 'ds__extract_week'}                    -->
+                            <!-- col10 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_726),  -->
+                            <!--    'column_alias': 'ds__extract_day'}                     -->
+                            <!-- col11 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_727),  -->
+                            <!--    'column_alias': 'ds__extract_dow'}                     -->
+                            <!-- col12 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_728),  -->
+                            <!--    'column_alias': 'ds__extract_doy'}                     -->
+                            <!-- col13 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_729),  -->
+                            <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                            <!-- col14 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_730),  -->
+                            <!--    'column_alias': 'ds_partitioned__week'}                -->
+                            <!-- col15 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_731),  -->
+                            <!--    'column_alias': 'ds_partitioned__month'}               -->
+                            <!-- col16 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_732),  -->
+                            <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                            <!-- col17 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_733),  -->
+                            <!--    'column_alias': 'ds_partitioned__year'}                -->
+                            <!-- col18 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_734),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
+                            <!-- col19 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_735),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
+                            <!-- col20 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_736),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
+                            <!-- col21 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_737),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
+                            <!-- col22 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_738),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
+                            <!-- col23 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_739),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
+                            <!-- col24 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_740),  -->
+                            <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
+                            <!-- col25 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_741),  -->
+                            <!--    'column_alias': 'paid_at__day'}                        -->
+                            <!-- col26 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_742),  -->
+                            <!--    'column_alias': 'paid_at__week'}                       -->
+                            <!-- col27 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_743),  -->
+                            <!--    'column_alias': 'paid_at__month'}                      -->
+                            <!-- col28 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_744),  -->
+                            <!--    'column_alias': 'paid_at__quarter'}                    -->
+                            <!-- col29 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_745),  -->
+                            <!--    'column_alias': 'paid_at__year'}                       -->
+                            <!-- col30 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_746),  -->
+                            <!--    'column_alias': 'paid_at__extract_year'}               -->
+                            <!-- col31 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_747),  -->
+                            <!--    'column_alias': 'paid_at__extract_quarter'}            -->
+                            <!-- col32 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_748),  -->
+                            <!--    'column_alias': 'paid_at__extract_month'}              -->
+                            <!-- col33 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_749),  -->
+                            <!--    'column_alias': 'paid_at__extract_week'}               -->
+                            <!-- col34 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_750),  -->
+                            <!--    'column_alias': 'paid_at__extract_day'}                -->
+                            <!-- col35 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_751),  -->
+                            <!--    'column_alias': 'paid_at__extract_dow'}                -->
+                            <!-- col36 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_752),  -->
+                            <!--    'column_alias': 'paid_at__extract_doy'}                -->
+                            <!-- col37 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_753),  -->
+                            <!--    'column_alias': 'booking__ds__day'}                    -->
+                            <!-- col38 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_754),  -->
+                            <!--    'column_alias': 'booking__ds__week'}                   -->
+                            <!-- col39 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_755),  -->
+                            <!--    'column_alias': 'booking__ds__month'}                  -->
+                            <!-- col40 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_756),  -->
+                            <!--    'column_alias': 'booking__ds__quarter'}                -->
+                            <!-- col41 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_757),  -->
+                            <!--    'column_alias': 'booking__ds__year'}                   -->
+                            <!-- col42 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_758),  -->
+                            <!--    'column_alias': 'booking__ds__extract_year'}           -->
+                            <!-- col43 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_759),  -->
+                            <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
+                            <!-- col44 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_760),  -->
+                            <!--    'column_alias': 'booking__ds__extract_month'}          -->
+                            <!-- col45 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_761),  -->
+                            <!--    'column_alias': 'booking__ds__extract_week'}           -->
+                            <!-- col46 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_762),  -->
+                            <!--    'column_alias': 'booking__ds__extract_day'}            -->
+                            <!-- col47 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_763),  -->
+                            <!--    'column_alias': 'booking__ds__extract_dow'}            -->
+                            <!-- col48 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_764),  -->
+                            <!--    'column_alias': 'booking__ds__extract_doy'}            -->
+                            <!-- col49 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_765),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                            <!-- col50 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_766),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                            <!-- col51 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_767),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                            <!-- col52 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_768),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                            <!-- col53 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_769),  -->
+                            <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                            <!-- col54 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_770),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                            <!-- col55 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_771),        -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                            <!-- col56 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_772),      -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                            <!-- col57 =                                                      -->
+                            <!--   {'class': 'SqlSelectColumn',                               -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_773),     -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                            <!-- col58 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_774),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                            <!-- col59 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_775),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                            <!-- col60 =                                                     -->
+                            <!--   {'class': 'SqlSelectColumn',                              -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_776),    -->
+                            <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
+                            <!-- col61 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_777),  -->
+                            <!--    'column_alias': 'booking__paid_at__day'}               -->
+                            <!-- col62 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_778),  -->
+                            <!--    'column_alias': 'booking__paid_at__week'}              -->
+                            <!-- col63 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_779),  -->
+                            <!--    'column_alias': 'booking__paid_at__month'}             -->
+                            <!-- col64 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_780),  -->
+                            <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                            <!-- col65 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_781),  -->
+                            <!--    'column_alias': 'booking__paid_at__year'}              -->
+                            <!-- col66 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_782),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                            <!-- col67 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_783),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                            <!-- col68 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_784),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                            <!-- col69 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_785),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                            <!-- col70 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_786),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                            <!-- col71 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_787),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                            <!-- col72 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_788),  -->
+                            <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
+                            <!-- col73 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_789),  -->
+                            <!--    'column_alias': 'listing'}                             -->
+                            <!-- col74 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_790),  -->
+                            <!--    'column_alias': 'guest'}                               -->
+                            <!-- col75 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_791),  -->
+                            <!--    'column_alias': 'host'}                                -->
+                            <!-- col76 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_792),  -->
+                            <!--    'column_alias': 'booking__listing'}                    -->
+                            <!-- col77 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_793),  -->
+                            <!--    'column_alias': 'booking__guest'}                      -->
+                            <!-- col78 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_794),  -->
+                            <!--    'column_alias': 'booking__host'}                       -->
+                            <!-- col79 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_715),  -->
+                            <!--    'column_alias': 'is_instant'}                          -->
+                            <!-- col80 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_716),  -->
+                            <!--    'column_alias': 'booking__is_instant'}                 -->
+                            <!-- col81 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_702),  -->
+                            <!--    'column_alias': 'bookings'}                            -->
+                            <!-- col82 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_703),  -->
+                            <!--    'column_alias': 'instant_bookings'}                    -->
+                            <!-- col83 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_704),  -->
+                            <!--    'column_alias': 'booking_value'}                       -->
+                            <!-- col84 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_705),  -->
+                            <!--    'column_alias': 'max_booking_value'}                   -->
+                            <!-- col85 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_706),  -->
+                            <!--    'column_alias': 'min_booking_value'}                   -->
+                            <!-- col86 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_707),  -->
+                            <!--    'column_alias': 'bookers'}                             -->
+                            <!-- col87 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_708),  -->
+                            <!--    'column_alias': 'average_booking_value'}               -->
+                            <!-- col88 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_709),  -->
+                            <!--    'column_alias': 'referred_bookings'}                   -->
+                            <!-- col89 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_710),  -->
+                            <!--    'column_alias': 'median_booking_value'}                -->
+                            <!-- col90 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_711),  -->
+                            <!--    'column_alias': 'booking_value_p99'}                   -->
+                            <!-- col91 =                                                   -->
+                            <!--   {'class': 'SqlSelectColumn',                            -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_712),  -->
+                            <!--    'column_alias': 'discrete_booking_value_p99'}          -->
+                            <!-- col92 =                                                         -->
+                            <!--   {'class': 'SqlSelectColumn',                                  -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_713),        -->
+                            <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
+                            <!-- col93 =                                                       -->
+                            <!--   {'class': 'SqlSelectColumn',                                -->
+                            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_714),      -->
+                            <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
+                            <!-- from_source = SqlSelectStatementNode(node_id=ss_12) -->
+                            <!-- join_0 =                                                    -->
+                            <!--   {'class': 'SqlJoinDescription',                           -->
+                            <!--    'right_source': SqlSelectStatementNode(node_id=ss_11),   -->
+                            <!--    'right_source_alias': 'subq_6',                          -->
+                            <!--    'join_type': SqlJoinType.INNER,                          -->
+                            <!--    'on_condition': SqlComparisonExpression(node_id=cmp_0)}  -->
+                            <!-- where = None -->
+                            <SqlSelectStatementNode>
+                                <!-- description = Date Spine -->
+                                <!-- node_id = ss_12 -->
+                                <!-- col0 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_699),  -->
+                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!-- from_source = SqlTableFromClauseNode(node_id=tfc_0) -->
+                                <!-- where = None -->
+                                <SqlTableFromClauseNode>
+                                    <!-- description = Read from ***************************.mf_time_spine -->
+                                    <!-- node_id = tfc_0 -->
+                                    <!-- table_id = ***************************.mf_time_spine -->
+                                </SqlTableFromClauseNode>
+                            </SqlSelectStatementNode>
+                            <SqlSelectStatementNode>
+                                <!-- description = Metric Time Dimension 'ds' -->
+                                <!-- node_id = ss_11 -->
+                                <!-- col0 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
+                                <!--    'column_alias': 'ds__day'}                             -->
+                                <!-- col1 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+                                <!--    'column_alias': 'ds__week'}                            -->
+                                <!-- col2 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+                                <!--    'column_alias': 'ds__month'}                           -->
+                                <!-- col3 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_612),  -->
+                                <!--    'column_alias': 'ds__quarter'}                         -->
+                                <!-- col4 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_613),  -->
+                                <!--    'column_alias': 'ds__year'}                            -->
+                                <!-- col5 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_614),  -->
+                                <!--    'column_alias': 'ds__extract_year'}                    -->
+                                <!-- col6 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_615),  -->
+                                <!--    'column_alias': 'ds__extract_quarter'}                 -->
+                                <!-- col7 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_616),  -->
+                                <!--    'column_alias': 'ds__extract_month'}                   -->
+                                <!-- col8 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_617),  -->
+                                <!--    'column_alias': 'ds__extract_week'}                    -->
+                                <!-- col9 =                                                    -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_618),  -->
+                                <!--    'column_alias': 'ds__extract_day'}                     -->
+                                <!-- col10 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_619),  -->
+                                <!--    'column_alias': 'ds__extract_dow'}                     -->
+                                <!-- col11 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_620),  -->
+                                <!--    'column_alias': 'ds__extract_doy'}                     -->
+                                <!-- col12 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_621),  -->
+                                <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                                <!-- col13 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_622),  -->
+                                <!--    'column_alias': 'ds_partitioned__week'}                -->
+                                <!-- col14 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_623),  -->
+                                <!--    'column_alias': 'ds_partitioned__month'}               -->
+                                <!-- col15 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_624),  -->
+                                <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                                <!-- col16 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_625),  -->
+                                <!--    'column_alias': 'ds_partitioned__year'}                -->
+                                <!-- col17 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_626),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
+                                <!-- col18 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_627),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
+                                <!-- col19 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_628),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
+                                <!-- col20 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_629),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
+                                <!-- col21 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_630),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
+                                <!-- col22 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_631),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
+                                <!-- col23 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_632),  -->
+                                <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
+                                <!-- col24 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_633),  -->
+                                <!--    'column_alias': 'paid_at__day'}                        -->
+                                <!-- col25 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_634),  -->
+                                <!--    'column_alias': 'paid_at__week'}                       -->
+                                <!-- col26 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_635),  -->
+                                <!--    'column_alias': 'paid_at__month'}                      -->
+                                <!-- col27 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_636),  -->
+                                <!--    'column_alias': 'paid_at__quarter'}                    -->
+                                <!-- col28 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_637),  -->
+                                <!--    'column_alias': 'paid_at__year'}                       -->
+                                <!-- col29 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_638),  -->
+                                <!--    'column_alias': 'paid_at__extract_year'}               -->
+                                <!-- col30 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_639),  -->
+                                <!--    'column_alias': 'paid_at__extract_quarter'}            -->
+                                <!-- col31 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_640),  -->
+                                <!--    'column_alias': 'paid_at__extract_month'}              -->
+                                <!-- col32 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_641),  -->
+                                <!--    'column_alias': 'paid_at__extract_week'}               -->
+                                <!-- col33 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_642),  -->
+                                <!--    'column_alias': 'paid_at__extract_day'}                -->
+                                <!-- col34 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_643),  -->
+                                <!--    'column_alias': 'paid_at__extract_dow'}                -->
+                                <!-- col35 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_644),  -->
+                                <!--    'column_alias': 'paid_at__extract_doy'}                -->
+                                <!-- col36 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_645),  -->
+                                <!--    'column_alias': 'booking__ds__day'}                    -->
+                                <!-- col37 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_646),  -->
+                                <!--    'column_alias': 'booking__ds__week'}                   -->
+                                <!-- col38 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_647),  -->
+                                <!--    'column_alias': 'booking__ds__month'}                  -->
+                                <!-- col39 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_648),  -->
+                                <!--    'column_alias': 'booking__ds__quarter'}                -->
+                                <!-- col40 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_649),  -->
+                                <!--    'column_alias': 'booking__ds__year'}                   -->
+                                <!-- col41 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_650),  -->
+                                <!--    'column_alias': 'booking__ds__extract_year'}           -->
+                                <!-- col42 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_651),  -->
+                                <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
+                                <!-- col43 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_652),  -->
+                                <!--    'column_alias': 'booking__ds__extract_month'}          -->
+                                <!-- col44 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_653),  -->
+                                <!--    'column_alias': 'booking__ds__extract_week'}           -->
+                                <!-- col45 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_654),  -->
+                                <!--    'column_alias': 'booking__ds__extract_day'}            -->
+                                <!-- col46 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_655),  -->
+                                <!--    'column_alias': 'booking__ds__extract_dow'}            -->
+                                <!-- col47 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_656),  -->
+                                <!--    'column_alias': 'booking__ds__extract_doy'}            -->
+                                <!-- col48 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_657),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                                <!-- col49 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_658),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                                <!-- col50 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_659),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                                <!-- col51 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_660),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                                <!-- col52 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_661),  -->
+                                <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                                <!-- col53 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_662),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                <!-- col54 =                                                         -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_663),        -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                <!-- col55 =                                                       -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_664),      -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                <!-- col56 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                               -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_665),     -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                <!-- col57 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_666),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                <!-- col58 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_667),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                <!-- col59 =                                                     -->
+                                <!--   {'class': 'SqlSelectColumn',                              -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_668),    -->
+                                <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
+                                <!-- col60 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_669),  -->
+                                <!--    'column_alias': 'booking__paid_at__day'}               -->
+                                <!-- col61 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_670),  -->
+                                <!--    'column_alias': 'booking__paid_at__week'}              -->
+                                <!-- col62 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_671),  -->
+                                <!--    'column_alias': 'booking__paid_at__month'}             -->
+                                <!-- col63 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_672),  -->
+                                <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                                <!-- col64 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_673),  -->
+                                <!--    'column_alias': 'booking__paid_at__year'}              -->
+                                <!-- col65 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_674),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                                <!-- col66 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_675),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                                <!-- col67 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_676),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                                <!-- col68 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_677),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                                <!-- col69 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_678),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                                <!-- col70 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_679),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                                <!-- col71 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_680),  -->
+                                <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
+                                <!-- col72 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_681),  -->
+                                <!--    'column_alias': 'metric_time__day'}                    -->
+                                <!-- col73 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_682),  -->
+                                <!--    'column_alias': 'metric_time__week'}                   -->
+                                <!-- col74 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_683),  -->
+                                <!--    'column_alias': 'metric_time__month'}                  -->
+                                <!-- col75 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_684),  -->
+                                <!--    'column_alias': 'metric_time__quarter'}                -->
+                                <!-- col76 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_685),  -->
+                                <!--    'column_alias': 'metric_time__year'}                   -->
+                                <!-- col77 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_686),  -->
+                                <!--    'column_alias': 'metric_time__extract_year'}           -->
+                                <!-- col78 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_687),  -->
+                                <!--    'column_alias': 'metric_time__extract_quarter'}        -->
+                                <!-- col79 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_688),  -->
+                                <!--    'column_alias': 'metric_time__extract_month'}          -->
+                                <!-- col80 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_689),  -->
+                                <!--    'column_alias': 'metric_time__extract_week'}           -->
+                                <!-- col81 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_690),  -->
+                                <!--    'column_alias': 'metric_time__extract_day'}            -->
+                                <!-- col82 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_691),  -->
+                                <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                                <!-- col83 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_692),  -->
+                                <!--    'column_alias': 'metric_time__extract_doy'}            -->
+                                <!-- col84 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_693),  -->
+                                <!--    'column_alias': 'listing'}                             -->
+                                <!-- col85 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_694),  -->
+                                <!--    'column_alias': 'guest'}                               -->
+                                <!-- col86 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_695),  -->
+                                <!--    'column_alias': 'host'}                                -->
+                                <!-- col87 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_696),  -->
+                                <!--    'column_alias': 'booking__listing'}                    -->
+                                <!-- col88 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_697),  -->
+                                <!--    'column_alias': 'booking__guest'}                      -->
+                                <!-- col89 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_698),  -->
+                                <!--    'column_alias': 'booking__host'}                       -->
+                                <!-- col90 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+                                <!--    'column_alias': 'is_instant'}                          -->
+                                <!-- col91 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+                                <!--    'column_alias': 'booking__is_instant'}                 -->
+                                <!-- col92 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                                <!--    'column_alias': 'bookings'}                            -->
+                                <!-- col93 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                                <!--    'column_alias': 'instant_bookings'}                    -->
+                                <!-- col94 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_596),  -->
+                                <!--    'column_alias': 'booking_value'}                       -->
+                                <!-- col95 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+                                <!--    'column_alias': 'max_booking_value'}                   -->
+                                <!-- col96 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+                                <!--    'column_alias': 'min_booking_value'}                   -->
+                                <!-- col97 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+                                <!--    'column_alias': 'bookers'}                             -->
+                                <!-- col98 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+                                <!--    'column_alias': 'average_booking_value'}               -->
+                                <!-- col99 =                                                   -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+                                <!--    'column_alias': 'referred_bookings'}                   -->
+                                <!-- col100 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+                                <!--    'column_alias': 'median_booking_value'}                -->
+                                <!-- col101 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+                                <!--    'column_alias': 'booking_value_p99'}                   -->
+                                <!-- col102 =                                                  -->
+                                <!--   {'class': 'SqlSelectColumn',                            -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+                                <!--    'column_alias': 'discrete_booking_value_p99'}          -->
+                                <!-- col103 =                                                        -->
+                                <!--   {'class': 'SqlSelectColumn',                                  -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),        -->
+                                <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
+                                <!-- col104 =                                                      -->
+                                <!--   {'class': 'SqlSelectColumn',                                -->
+                                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),      -->
+                                <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
+                                <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
+                                <!-- where = None -->
+                                <SqlSelectStatementNode>
+                                    <!-- description = Read Elements From Semantic Model 'bookings_source' -->
+                                    <!-- node_id = ss_10001 -->
+                                    <!-- col0 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                 -->
+                                    <!--    'expr': SqlStringExpression(node_id=str_10000 sql_expr=1),  -->
+                                    <!--    'column_alias': 'bookings'}                                 -->
+                                    <!-- col1 =                                                                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                                                                      -->
+                                    <!--    'expr': SqlStringExpression(node_id=str_10001 sql_expr=CASE WHEN is_instant THEN 1 ELSE 0 END),  -->
+                                    <!--    'column_alias': 'instant_bookings'}                                                              -->
+                                    <!-- col2 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
+                                    <!--    'column_alias': 'booking_value'}                         -->
+                                    <!-- col3 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
+                                    <!--    'column_alias': 'max_booking_value'}                     -->
+                                    <!-- col4 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
+                                    <!--    'column_alias': 'min_booking_value'}                     -->
+                                    <!-- col5 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
+                                    <!--    'column_alias': 'bookers'}                               -->
+                                    <!-- col6 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
+                                    <!--    'column_alias': 'average_booking_value'}                 -->
+                                    <!-- col7 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
+                                    <!--    'column_alias': 'booking_payments'}                      -->
+                                    <!-- col8 =                                                                                                           -->
+                                    <!--   {'class': 'SqlSelectColumn',                                                                                   -->
+                                    <!--    'expr': SqlStringExpression(node_id=str_10002 sql_expr=CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END),  -->
+                                    <!--    'column_alias': 'referred_bookings'}                                                                          -->
+                                    <!-- col9 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
+                                    <!--    'column_alias': 'median_booking_value'}                  -->
+                                    <!-- col10 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
+                                    <!--    'column_alias': 'booking_value_p99'}                     -->
+                                    <!-- col11 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                                    <!--    'column_alias': 'discrete_booking_value_p99'}            -->
+                                    <!-- col12 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
+                                    <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
+                                    <!-- col13 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
+                                    <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
+                                    <!-- col14 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                                    <!--    'column_alias': 'is_instant'}                            -->
+                                    <!-- col15 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                                    <!--    'column_alias': 'ds__day'}                               -->
+                                    <!-- col16 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10008),  -->
+                                    <!--    'column_alias': 'ds__week'}                        -->
+                                    <!-- col17 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10009),  -->
+                                    <!--    'column_alias': 'ds__month'}                       -->
+                                    <!-- col18 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10010),  -->
+                                    <!--    'column_alias': 'ds__quarter'}                     -->
+                                    <!-- col19 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
+                                    <!--    'column_alias': 'ds__year'}                        -->
+                                    <!-- col20 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                                    <!--    'column_alias': 'ds__extract_year'}              -->
+                                    <!-- col21 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                                    <!--    'column_alias': 'ds__extract_quarter'}           -->
+                                    <!-- col22 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                                    <!--    'column_alias': 'ds__extract_month'}             -->
+                                    <!-- col23 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                                    <!--    'column_alias': 'ds__extract_week'}              -->
+                                    <!-- col24 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                                    <!--    'column_alias': 'ds__extract_day'}               -->
+                                    <!-- col25 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                                    <!--    'column_alias': 'ds__extract_dow'}               -->
+                                    <!-- col26 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                                    <!--    'column_alias': 'ds__extract_doy'}               -->
+                                    <!-- col27 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                                    <!--    'column_alias': 'ds_partitioned__day'}                   -->
+                                    <!-- col28 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
+                                    <!--    'column_alias': 'ds_partitioned__week'}            -->
+                                    <!-- col29 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
+                                    <!--    'column_alias': 'ds_partitioned__month'}           -->
+                                    <!-- col30 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
+                                    <!--    'column_alias': 'ds_partitioned__quarter'}         -->
+                                    <!-- col31 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
+                                    <!--    'column_alias': 'ds_partitioned__year'}            -->
+                                    <!-- col32 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                                    <!-- col33 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                                    <!-- col34 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                                    <!-- col35 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                                    <!-- col36 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                                    <!-- col37 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                                    <!-- col38 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                                    <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
+                                    <!-- col39 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                                    <!--    'column_alias': 'paid_at__day'}                          -->
+                                    <!-- col40 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
+                                    <!--    'column_alias': 'paid_at__week'}                   -->
+                                    <!-- col41 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
+                                    <!--    'column_alias': 'paid_at__month'}                  -->
+                                    <!-- col42 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
+                                    <!--    'column_alias': 'paid_at__quarter'}                -->
+                                    <!-- col43 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
+                                    <!--    'column_alias': 'paid_at__year'}                   -->
+                                    <!-- col44 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                                    <!--    'column_alias': 'paid_at__extract_year'}         -->
+                                    <!-- col45 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                                    <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                                    <!-- col46 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                                    <!--    'column_alias': 'paid_at__extract_month'}        -->
+                                    <!-- col47 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                                    <!--    'column_alias': 'paid_at__extract_week'}         -->
+                                    <!-- col48 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                                    <!--    'column_alias': 'paid_at__extract_day'}          -->
+                                    <!-- col49 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                                    <!--    'column_alias': 'paid_at__extract_dow'}          -->
+                                    <!-- col50 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                                    <!--    'column_alias': 'paid_at__extract_doy'}          -->
+                                    <!-- col51 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                                    <!--    'column_alias': 'booking__is_instant'}                   -->
+                                    <!-- col52 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                                    <!--    'column_alias': 'booking__ds__day'}                      -->
+                                    <!-- col53 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
+                                    <!--    'column_alias': 'booking__ds__week'}               -->
+                                    <!-- col54 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
+                                    <!--    'column_alias': 'booking__ds__month'}              -->
+                                    <!-- col55 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
+                                    <!--    'column_alias': 'booking__ds__quarter'}            -->
+                                    <!-- col56 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
+                                    <!--    'column_alias': 'booking__ds__year'}               -->
+                                    <!-- col57 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                                    <!-- col58 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                                    <!-- col59 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                                    <!-- col60 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                                    <!-- col61 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                                    <!-- col62 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                                    <!-- col63 =                                             -->
+                                    <!--   {'class': 'SqlSelectColumn',                      -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                                    <!--    'column_alias': 'booking__ds__extract_doy'}      -->
+                                    <!-- col64 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
+                                    <!-- col65 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
+                                    <!-- col66 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
+                                    <!-- col67 =                                                 -->
+                                    <!--   {'class': 'SqlSelectColumn',                          -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
+                                    <!-- col68 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
+                                    <!-- col69 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                                    <!-- col70 =                                                         -->
+                                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                                    <!-- col71 =                                                       -->
+                                    <!--   {'class': 'SqlSelectColumn',                                -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                                    <!-- col72 =                                                      -->
+                                    <!--   {'class': 'SqlSelectColumn',                               -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                                    <!-- col73 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                                    <!-- col74 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                                    <!-- col75 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
+                                    <!-- col76 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
+                                    <!--    'column_alias': 'booking__paid_at__day'}                 -->
+                                    <!-- col77 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
+                                    <!--    'column_alias': 'booking__paid_at__week'}          -->
+                                    <!-- col78 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
+                                    <!--    'column_alias': 'booking__paid_at__month'}         -->
+                                    <!-- col79 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
+                                    <!--    'column_alias': 'booking__paid_at__quarter'}       -->
+                                    <!-- col80 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
+                                    <!--    'column_alias': 'booking__paid_at__year'}          -->
+                                    <!-- col81 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                                    <!-- col82 =                                                  -->
+                                    <!--   {'class': 'SqlSelectColumn',                           -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                                    <!-- col83 =                                                -->
+                                    <!--   {'class': 'SqlSelectColumn',                         -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                                    <!-- col84 =                                               -->
+                                    <!--   {'class': 'SqlSelectColumn',                        -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                                    <!-- col85 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                                    <!-- col86 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                                    <!-- col87 =                                              -->
+                                    <!--   {'class': 'SqlSelectColumn',                       -->
+                                    <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                                    <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
+                                    <!-- col88 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                                    <!--    'column_alias': 'listing'}                               -->
+                                    <!-- col89 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                                    <!--    'column_alias': 'guest'}                                 -->
+                                    <!-- col90 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
+                                    <!--    'column_alias': 'host'}                                  -->
+                                    <!-- col91 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
+                                    <!--    'column_alias': 'booking__listing'}                      -->
+                                    <!-- col92 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
+                                    <!--    'column_alias': 'booking__guest'}                        -->
+                                    <!-- col93 =                                                     -->
+                                    <!--   {'class': 'SqlSelectColumn',                              -->
+                                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
+                                    <!--    'column_alias': 'booking__host'}                         -->
+                                    <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
+                                    <!-- where = None -->
+                                    <SqlTableFromClauseNode>
+                                        <!-- description = Read from ***************************.fct_bookings -->
+                                        <!-- node_id = tfc_10001 -->
+                                        <!-- table_id = ***************************.fct_bookings -->
+                                    </SqlTableFromClauseNode>
+                                </SqlSelectStatementNode>
+                            </SqlSelectStatementNode>
+                        </SqlSelectStatementNode>
+                    </SqlSelectStatementNode>
+                </SqlSelectStatementNode>
+            </SqlSelectStatementNode>
+        </SqlSelectStatementNode>
+    </SqlSelectStatementNode>
+</SqlQueryPlan>
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_date_part__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_date_part__plan0.xml
new file mode 100644
index 0000000000..49d52f7aae
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_date_part__plan0.xml
@@ -0,0 +1,863 @@
+<SqlQueryPlan>
+    <SqlSelectStatementNode>
+        <!-- description = Compute Metrics via Expressions -->
+        <!-- node_id = ss_10 -->
+        <!-- col0 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+        <!--    'column_alias': 'metric_time__extract_dow'}            -->
+        <!-- col1 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+        <!--    'column_alias': 'bookings'}                            -->
+        <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
+        <!-- where = None -->
+        <SqlSelectStatementNode>
+            <!-- description = Aggregate Measures -->
+            <!-- node_id = ss_9 -->
+            <!-- col0 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+            <!--    'column_alias': 'metric_time__extract_dow'}            -->
+            <!-- col1 =                                                                       -->
+            <!--   {'class': 'SqlSelectColumn',                                               -->
+            <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_0, sql_function=SUM),  -->
+            <!--    'column_alias': 'bookings'}                                               -->
+            <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
+            <!-- group_by0 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+            <!--    'column_alias': 'metric_time__extract_dow'}            -->
+            <!-- where = None -->
+            <SqlSelectStatementNode>
+                <!-- description =                                 -->
+                <!--   Pass Only Elements:                         -->
+                <!--     ['bookings', 'metric_time__extract_dow']  -->
+                <!-- node_id = ss_8 -->
+                <!-- col0 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                <!-- col1 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                <!--    'column_alias': 'bookings'}                            -->
+                <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
+                <!-- where = None -->
+                <SqlSelectStatementNode>
+                    <!-- description = Metric Time Dimension 'ds' -->
+                    <!-- node_id = ss_7 -->
+                    <!-- col0 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                    <!--    'column_alias': 'ds__day'}                             -->
+                    <!-- col1 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                    <!--    'column_alias': 'ds__week'}                            -->
+                    <!-- col2 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                    <!--    'column_alias': 'ds__month'}                           -->
+                    <!-- col3 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                    <!--    'column_alias': 'ds__quarter'}                         -->
+                    <!-- col4 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
+                    <!--    'column_alias': 'ds__year'}                            -->
+                    <!-- col5 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
+                    <!--    'column_alias': 'ds__extract_year'}                    -->
+                    <!-- col6 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
+                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
+                    <!-- col7 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
+                    <!--    'column_alias': 'ds__extract_month'}                   -->
+                    <!-- col8 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
+                    <!--    'column_alias': 'ds__extract_week'}                    -->
+                    <!-- col9 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
+                    <!--    'column_alias': 'ds__extract_day'}                     -->
+                    <!-- col10 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
+                    <!--    'column_alias': 'ds__extract_dow'}                     -->
+                    <!-- col11 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                    <!--    'column_alias': 'ds__extract_doy'}                     -->
+                    <!-- col12 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                    <!-- col13 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                    <!--    'column_alias': 'ds_partitioned__week'}                -->
+                    <!-- col14 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                    <!--    'column_alias': 'ds_partitioned__month'}               -->
+                    <!-- col15 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                    <!-- col16 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                    <!--    'column_alias': 'ds_partitioned__year'}                -->
+                    <!-- col17 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
+                    <!-- col18 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
+                    <!-- col19 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
+                    <!-- col20 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
+                    <!-- col21 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
+                    <!-- col22 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
+                    <!-- col23 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
+                    <!-- col24 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                    <!--    'column_alias': 'paid_at__day'}                        -->
+                    <!-- col25 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                    <!--    'column_alias': 'paid_at__week'}                       -->
+                    <!-- col26 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                    <!--    'column_alias': 'paid_at__month'}                      -->
+                    <!-- col27 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                    <!--    'column_alias': 'paid_at__quarter'}                    -->
+                    <!-- col28 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                    <!--    'column_alias': 'paid_at__year'}                       -->
+                    <!-- col29 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                    <!--    'column_alias': 'paid_at__extract_year'}               -->
+                    <!-- col30 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                    <!--    'column_alias': 'paid_at__extract_quarter'}            -->
+                    <!-- col31 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                    <!--    'column_alias': 'paid_at__extract_month'}              -->
+                    <!-- col32 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                    <!--    'column_alias': 'paid_at__extract_week'}               -->
+                    <!-- col33 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                    <!--    'column_alias': 'paid_at__extract_day'}                -->
+                    <!-- col34 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                    <!--    'column_alias': 'paid_at__extract_dow'}                -->
+                    <!-- col35 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                    <!--    'column_alias': 'paid_at__extract_doy'}                -->
+                    <!-- col36 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
+                    <!--    'column_alias': 'booking__ds__day'}                    -->
+                    <!-- col37 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'column_alias': 'booking__ds__week'}                   -->
+                    <!-- col38 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                    <!--    'column_alias': 'booking__ds__month'}                  -->
+                    <!-- col39 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                    <!--    'column_alias': 'booking__ds__quarter'}                -->
+                    <!-- col40 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                    <!--    'column_alias': 'booking__ds__year'}                   -->
+                    <!-- col41 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                    <!--    'column_alias': 'booking__ds__extract_year'}           -->
+                    <!-- col42 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                    <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
+                    <!-- col43 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                    <!--    'column_alias': 'booking__ds__extract_month'}          -->
+                    <!-- col44 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                    <!--    'column_alias': 'booking__ds__extract_week'}           -->
+                    <!-- col45 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                    <!--    'column_alias': 'booking__ds__extract_day'}            -->
+                    <!-- col46 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                    <!--    'column_alias': 'booking__ds__extract_dow'}            -->
+                    <!-- col47 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                    <!--    'column_alias': 'booking__ds__extract_doy'}            -->
+                    <!-- col48 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                    <!-- col49 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                    <!-- col50 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                    <!-- col51 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                    <!-- col52 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                    <!-- col53 =                                                      -->
+                    <!--   {'class': 'SqlSelectColumn',                               -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                    <!-- col54 =                                                         -->
+                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                    <!-- col55 =                                                       -->
+                    <!--   {'class': 'SqlSelectColumn',                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                    <!-- col56 =                                                      -->
+                    <!--   {'class': 'SqlSelectColumn',                               -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                    <!-- col57 =                                                     -->
+                    <!--   {'class': 'SqlSelectColumn',                              -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                    <!-- col58 =                                                     -->
+                    <!--   {'class': 'SqlSelectColumn',                              -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                    <!-- col59 =                                                     -->
+                    <!--   {'class': 'SqlSelectColumn',                              -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
+                    <!-- col60 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                    <!-- col61 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                    <!-- col62 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                    <!-- col63 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                    <!-- col64 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                    <!-- col65 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                    <!-- col66 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                    <!-- col67 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                    <!-- col68 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                    <!-- col69 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                    <!-- col70 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                    <!-- col71 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
+                    <!-- col72 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!-- col73 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!-- col74 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!-- col75 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!-- col76 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!-- col77 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                    <!--    'column_alias': 'metric_time__extract_year'}           -->
+                    <!-- col78 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
+                    <!-- col79 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                    <!--    'column_alias': 'metric_time__extract_month'}          -->
+                    <!-- col80 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                    <!--    'column_alias': 'metric_time__extract_week'}           -->
+                    <!-- col81 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                    <!--    'column_alias': 'metric_time__extract_day'}            -->
+                    <!-- col82 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                    <!-- col83 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
+                    <!-- col84 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                    <!--    'column_alias': 'listing'}                             -->
+                    <!-- col85 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                    <!--    'column_alias': 'guest'}                               -->
+                    <!-- col86 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                    <!--    'column_alias': 'host'}                                -->
+                    <!-- col87 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                    <!--    'column_alias': 'booking__listing'}                    -->
+                    <!-- col88 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                    <!--    'column_alias': 'booking__guest'}                      -->
+                    <!-- col89 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                    <!--    'column_alias': 'booking__host'}                       -->
+                    <!-- col90 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                    <!--    'column_alias': 'is_instant'}                          -->
+                    <!-- col91 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                    <!-- col92 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                    <!--    'column_alias': 'bookings'}                            -->
+                    <!-- col93 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                    <!--    'column_alias': 'instant_bookings'}                    -->
+                    <!-- col94 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                    <!--    'column_alias': 'booking_value'}                       -->
+                    <!-- col95 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                    <!--    'column_alias': 'max_booking_value'}                   -->
+                    <!-- col96 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                    <!--    'column_alias': 'min_booking_value'}                   -->
+                    <!-- col97 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                    <!--    'column_alias': 'bookers'}                             -->
+                    <!-- col98 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                    <!--    'column_alias': 'average_booking_value'}               -->
+                    <!-- col99 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                    <!--    'column_alias': 'referred_bookings'}                   -->
+                    <!-- col100 =                                                  -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                    <!--    'column_alias': 'median_booking_value'}                -->
+                    <!-- col101 =                                                  -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                    <!-- col102 =                                                  -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                    <!--    'column_alias': 'discrete_booking_value_p99'}          -->
+                    <!-- col103 =                                                        -->
+                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
+                    <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
+                    <!-- col104 =                                                      -->
+                    <!--   {'class': 'SqlSelectColumn',                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
+                    <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
+                    <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
+                    <!-- where = None -->
+                    <SqlSelectStatementNode>
+                        <!-- description = Read Elements From Semantic Model 'bookings_source' -->
+                        <!-- node_id = ss_10001 -->
+                        <!-- col0 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                 -->
+                        <!--    'expr': SqlStringExpression(node_id=str_10000 sql_expr=1),  -->
+                        <!--    'column_alias': 'bookings'}                                 -->
+                        <!-- col1 =                                                                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                                                                      -->
+                        <!--    'expr': SqlStringExpression(node_id=str_10001 sql_expr=CASE WHEN is_instant THEN 1 ELSE 0 END),  -->
+                        <!--    'column_alias': 'instant_bookings'}                                                              -->
+                        <!-- col2 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
+                        <!--    'column_alias': 'booking_value'}                         -->
+                        <!-- col3 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
+                        <!--    'column_alias': 'max_booking_value'}                     -->
+                        <!-- col4 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
+                        <!--    'column_alias': 'min_booking_value'}                     -->
+                        <!-- col5 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
+                        <!--    'column_alias': 'bookers'}                               -->
+                        <!-- col6 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
+                        <!--    'column_alias': 'average_booking_value'}                 -->
+                        <!-- col7 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
+                        <!--    'column_alias': 'booking_payments'}                      -->
+                        <!-- col8 =                                                                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                                                                   -->
+                        <!--    'expr': SqlStringExpression(node_id=str_10002 sql_expr=CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END),  -->
+                        <!--    'column_alias': 'referred_bookings'}                                                                          -->
+                        <!-- col9 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
+                        <!--    'column_alias': 'median_booking_value'}                  -->
+                        <!-- col10 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
+                        <!--    'column_alias': 'booking_value_p99'}                     -->
+                        <!-- col11 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                        <!--    'column_alias': 'discrete_booking_value_p99'}            -->
+                        <!-- col12 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
+                        <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
+                        <!-- col13 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
+                        <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
+                        <!-- col14 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                        <!--    'column_alias': 'is_instant'}                            -->
+                        <!-- col15 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                        <!--    'column_alias': 'ds__day'}                               -->
+                        <!-- col16 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10008),  -->
+                        <!--    'column_alias': 'ds__week'}                        -->
+                        <!-- col17 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10009),  -->
+                        <!--    'column_alias': 'ds__month'}                       -->
+                        <!-- col18 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10010),  -->
+                        <!--    'column_alias': 'ds__quarter'}                     -->
+                        <!-- col19 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
+                        <!--    'column_alias': 'ds__year'}                        -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col25 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
+                        <!-- col26 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
+                        <!-- col27 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                        <!--    'column_alias': 'ds_partitioned__day'}                   -->
+                        <!-- col28 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
+                        <!--    'column_alias': 'ds_partitioned__week'}            -->
+                        <!-- col29 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
+                        <!--    'column_alias': 'ds_partitioned__month'}           -->
+                        <!-- col30 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
+                        <!--    'column_alias': 'ds_partitioned__quarter'}         -->
+                        <!-- col31 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
+                        <!--    'column_alias': 'ds_partitioned__year'}            -->
+                        <!-- col32 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                        <!-- col33 =                                                -->
+                        <!--   {'class': 'SqlSelectColumn',                         -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                        <!-- col34 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                        <!-- col35 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                        <!-- col36 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                        <!-- col37 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                        <!-- col38 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
+                        <!-- col39 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                        <!--    'column_alias': 'paid_at__day'}                          -->
+                        <!-- col40 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
+                        <!--    'column_alias': 'paid_at__week'}                   -->
+                        <!-- col41 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
+                        <!--    'column_alias': 'paid_at__month'}                  -->
+                        <!-- col42 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
+                        <!--    'column_alias': 'paid_at__quarter'}                -->
+                        <!-- col43 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
+                        <!--    'column_alias': 'paid_at__year'}                   -->
+                        <!-- col44 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}         -->
+                        <!-- col45 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                        <!-- col46 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}        -->
+                        <!-- col47 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}         -->
+                        <!-- col48 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}          -->
+                        <!-- col49 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}          -->
+                        <!-- col50 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}          -->
+                        <!-- col51 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                   -->
+                        <!-- col52 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                        <!--    'column_alias': 'booking__ds__day'}                      -->
+                        <!-- col53 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
+                        <!--    'column_alias': 'booking__ds__week'}               -->
+                        <!-- col54 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
+                        <!--    'column_alias': 'booking__ds__month'}              -->
+                        <!-- col55 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
+                        <!--    'column_alias': 'booking__ds__quarter'}            -->
+                        <!-- col56 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
+                        <!--    'column_alias': 'booking__ds__year'}               -->
+                        <!-- col57 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                        <!-- col58 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                        <!-- col59 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                        <!-- col60 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                        <!-- col61 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                        <!-- col62 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                        <!-- col63 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
+                        <!-- col64 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
+                        <!-- col65 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
+                        <!-- col66 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
+                        <!-- col67 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
+                        <!-- col68 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
+                        <!-- col69 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col70 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col71 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col72 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col73 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col74 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col75 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
+                        <!-- col76 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}                 -->
+                        <!-- col77 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}          -->
+                        <!-- col78 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}         -->
+                        <!-- col79 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}       -->
+                        <!-- col80 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}          -->
+                        <!-- col81 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                        <!-- col82 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                        <!-- col83 =                                                -->
+                        <!--   {'class': 'SqlSelectColumn',                         -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                        <!-- col84 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                        <!-- col85 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                        <!-- col86 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                        <!-- col87 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
+                        <!-- col88 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                        <!--    'column_alias': 'listing'}                               -->
+                        <!-- col89 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                        <!--    'column_alias': 'guest'}                                 -->
+                        <!-- col90 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
+                        <!--    'column_alias': 'host'}                                  -->
+                        <!-- col91 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
+                        <!--    'column_alias': 'booking__listing'}                      -->
+                        <!-- col92 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
+                        <!--    'column_alias': 'booking__guest'}                        -->
+                        <!-- col93 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
+                        <!--    'column_alias': 'booking__host'}                         -->
+                        <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
+                        <!-- where = None -->
+                        <SqlTableFromClauseNode>
+                            <!-- description = Read from ***************************.fct_bookings -->
+                            <!-- node_id = tfc_10001 -->
+                            <!-- table_id = ***************************.fct_bookings -->
+                        </SqlTableFromClauseNode>
+                    </SqlSelectStatementNode>
+                </SqlSelectStatementNode>
+            </SqlSelectStatementNode>
+        </SqlSelectStatementNode>
+    </SqlSelectStatementNode>
+</SqlQueryPlan>
diff --git a/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_multiple_date_parts__plan0.xml b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_multiple_date_parts__plan0.xml
new file mode 100644
index 0000000000..f987f53071
--- /dev/null
+++ b/metricflow/test/snapshots/test_dataflow_to_sql_plan.py/SqlQueryPlan/test_simple_query_with_multiple_date_parts__plan0.xml
@@ -0,0 +1,966 @@
+<SqlQueryPlan>
+    <SqlSelectStatementNode>
+        <!-- description = Compute Metrics via Expressions -->
+        <!-- node_id = ss_10 -->
+        <!-- col0 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_604),  -->
+        <!--    'column_alias': 'metric_time__extract_year'}           -->
+        <!-- col1 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_605),  -->
+        <!--    'column_alias': 'metric_time__extract_quarter'}        -->
+        <!-- col2 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_606),  -->
+        <!--    'column_alias': 'metric_time__extract_month'}          -->
+        <!-- col3 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_607),  -->
+        <!--    'column_alias': 'metric_time__extract_week'}           -->
+        <!-- col4 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_608),  -->
+        <!--    'column_alias': 'metric_time__extract_day'}            -->
+        <!-- col5 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_609),  -->
+        <!--    'column_alias': 'metric_time__extract_dow'}            -->
+        <!-- col6 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_610),  -->
+        <!--    'column_alias': 'metric_time__extract_doy'}            -->
+        <!-- col7 =                                                    -->
+        <!--   {'class': 'SqlSelectColumn',                            -->
+        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_611),  -->
+        <!--    'column_alias': 'bookings'}                            -->
+        <!-- from_source = SqlSelectStatementNode(node_id=ss_9) -->
+        <!-- where = None -->
+        <SqlSelectStatementNode>
+            <!-- description = Aggregate Measures -->
+            <!-- node_id = ss_9 -->
+            <!-- col0 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+            <!--    'column_alias': 'metric_time__extract_year'}           -->
+            <!-- col1 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
+            <!-- col2 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+            <!--    'column_alias': 'metric_time__extract_month'}          -->
+            <!-- col3 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+            <!--    'column_alias': 'metric_time__extract_week'}           -->
+            <!-- col4 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+            <!--    'column_alias': 'metric_time__extract_day'}            -->
+            <!-- col5 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+            <!--    'column_alias': 'metric_time__extract_dow'}            -->
+            <!-- col6 =                                                    -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+            <!--    'column_alias': 'metric_time__extract_doy'}            -->
+            <!-- col7 =                                                                       -->
+            <!--   {'class': 'SqlSelectColumn',                                               -->
+            <!--    'expr': SqlAggregateFunctionExpression(node_id=fnc_0, sql_function=SUM),  -->
+            <!--    'column_alias': 'bookings'}                                               -->
+            <!-- from_source = SqlSelectStatementNode(node_id=ss_8) -->
+            <!-- group_by0 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_597),  -->
+            <!--    'column_alias': 'metric_time__extract_year'}           -->
+            <!-- group_by1 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_598),  -->
+            <!--    'column_alias': 'metric_time__extract_quarter'}        -->
+            <!-- group_by2 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_599),  -->
+            <!--    'column_alias': 'metric_time__extract_month'}          -->
+            <!-- group_by3 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_600),  -->
+            <!--    'column_alias': 'metric_time__extract_week'}           -->
+            <!-- group_by4 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_601),  -->
+            <!--    'column_alias': 'metric_time__extract_day'}            -->
+            <!-- group_by5 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_602),  -->
+            <!--    'column_alias': 'metric_time__extract_dow'}            -->
+            <!-- group_by6 =                                               -->
+            <!--   {'class': 'SqlSelectColumn',                            -->
+            <!--    'expr': SqlColumnReferenceExpression(node_id=cr_603),  -->
+            <!--    'column_alias': 'metric_time__extract_doy'}            -->
+            <!-- where = None -->
+            <SqlSelectStatementNode>
+                <!-- description =                         -->
+                <!--   Pass Only Elements:                 -->
+                <!--     ['bookings',                      -->
+                <!--      'metric_time__extract_day',      -->
+                <!--      'metric_time__extract_dow',      -->
+                <!--      'metric_time__extract_doy',      -->
+                <!--      'metric_time__extract_week',     -->
+                <!--      'metric_time__extract_month',    -->
+                <!--      'metric_time__extract_quarter',  -->
+                <!--      'metric_time__extract_year']     -->
+                <!-- node_id = ss_8 -->
+                <!-- col0 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_589),  -->
+                <!--    'column_alias': 'metric_time__extract_year'}           -->
+                <!-- col1 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_590),  -->
+                <!--    'column_alias': 'metric_time__extract_quarter'}        -->
+                <!-- col2 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_591),  -->
+                <!--    'column_alias': 'metric_time__extract_month'}          -->
+                <!-- col3 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_592),  -->
+                <!--    'column_alias': 'metric_time__extract_week'}           -->
+                <!-- col4 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_593),  -->
+                <!--    'column_alias': 'metric_time__extract_day'}            -->
+                <!-- col5 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_594),  -->
+                <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                <!-- col6 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_595),  -->
+                <!--    'column_alias': 'metric_time__extract_doy'}            -->
+                <!-- col7 =                                                    -->
+                <!--   {'class': 'SqlSelectColumn',                            -->
+                <!--    'expr': SqlColumnReferenceExpression(node_id=cr_588),  -->
+                <!--    'column_alias': 'bookings'}                            -->
+                <!-- from_source = SqlSelectStatementNode(node_id=ss_7) -->
+                <!-- where = None -->
+                <SqlSelectStatementNode>
+                    <!-- description = Metric Time Dimension 'ds' -->
+                    <!-- node_id = ss_7 -->
+                    <!-- col0 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_498),  -->
+                    <!--    'column_alias': 'ds__day'}                             -->
+                    <!-- col1 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_499),  -->
+                    <!--    'column_alias': 'ds__week'}                            -->
+                    <!-- col2 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_500),  -->
+                    <!--    'column_alias': 'ds__month'}                           -->
+                    <!-- col3 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_501),  -->
+                    <!--    'column_alias': 'ds__quarter'}                         -->
+                    <!-- col4 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_502),  -->
+                    <!--    'column_alias': 'ds__year'}                            -->
+                    <!-- col5 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_503),  -->
+                    <!--    'column_alias': 'ds__extract_year'}                    -->
+                    <!-- col6 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_504),  -->
+                    <!--    'column_alias': 'ds__extract_quarter'}                 -->
+                    <!-- col7 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_505),  -->
+                    <!--    'column_alias': 'ds__extract_month'}                   -->
+                    <!-- col8 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_506),  -->
+                    <!--    'column_alias': 'ds__extract_week'}                    -->
+                    <!-- col9 =                                                    -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_507),  -->
+                    <!--    'column_alias': 'ds__extract_day'}                     -->
+                    <!-- col10 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_508),  -->
+                    <!--    'column_alias': 'ds__extract_dow'}                     -->
+                    <!-- col11 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_509),  -->
+                    <!--    'column_alias': 'ds__extract_doy'}                     -->
+                    <!-- col12 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_510),  -->
+                    <!--    'column_alias': 'ds_partitioned__day'}                 -->
+                    <!-- col13 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_511),  -->
+                    <!--    'column_alias': 'ds_partitioned__week'}                -->
+                    <!-- col14 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_512),  -->
+                    <!--    'column_alias': 'ds_partitioned__month'}               -->
+                    <!-- col15 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_513),  -->
+                    <!--    'column_alias': 'ds_partitioned__quarter'}             -->
+                    <!-- col16 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_514),  -->
+                    <!--    'column_alias': 'ds_partitioned__year'}                -->
+                    <!-- col17 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_515),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_year'}        -->
+                    <!-- col18 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_516),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_quarter'}     -->
+                    <!-- col19 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_517),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_month'}       -->
+                    <!-- col20 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_518),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_week'}        -->
+                    <!-- col21 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_519),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_day'}         -->
+                    <!-- col22 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_520),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_dow'}         -->
+                    <!-- col23 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_521),  -->
+                    <!--    'column_alias': 'ds_partitioned__extract_doy'}         -->
+                    <!-- col24 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_522),  -->
+                    <!--    'column_alias': 'paid_at__day'}                        -->
+                    <!-- col25 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_523),  -->
+                    <!--    'column_alias': 'paid_at__week'}                       -->
+                    <!-- col26 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_524),  -->
+                    <!--    'column_alias': 'paid_at__month'}                      -->
+                    <!-- col27 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_525),  -->
+                    <!--    'column_alias': 'paid_at__quarter'}                    -->
+                    <!-- col28 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_526),  -->
+                    <!--    'column_alias': 'paid_at__year'}                       -->
+                    <!-- col29 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_527),  -->
+                    <!--    'column_alias': 'paid_at__extract_year'}               -->
+                    <!-- col30 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_528),  -->
+                    <!--    'column_alias': 'paid_at__extract_quarter'}            -->
+                    <!-- col31 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_529),  -->
+                    <!--    'column_alias': 'paid_at__extract_month'}              -->
+                    <!-- col32 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_530),  -->
+                    <!--    'column_alias': 'paid_at__extract_week'}               -->
+                    <!-- col33 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_531),  -->
+                    <!--    'column_alias': 'paid_at__extract_day'}                -->
+                    <!-- col34 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_532),  -->
+                    <!--    'column_alias': 'paid_at__extract_dow'}                -->
+                    <!-- col35 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_533),  -->
+                    <!--    'column_alias': 'paid_at__extract_doy'}                -->
+                    <!-- col36 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_534),  -->
+                    <!--    'column_alias': 'booking__ds__day'}                    -->
+                    <!-- col37 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_535),  -->
+                    <!--    'column_alias': 'booking__ds__week'}                   -->
+                    <!-- col38 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_536),  -->
+                    <!--    'column_alias': 'booking__ds__month'}                  -->
+                    <!-- col39 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_537),  -->
+                    <!--    'column_alias': 'booking__ds__quarter'}                -->
+                    <!-- col40 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_538),  -->
+                    <!--    'column_alias': 'booking__ds__year'}                   -->
+                    <!-- col41 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_539),  -->
+                    <!--    'column_alias': 'booking__ds__extract_year'}           -->
+                    <!-- col42 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_540),  -->
+                    <!--    'column_alias': 'booking__ds__extract_quarter'}        -->
+                    <!-- col43 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_541),  -->
+                    <!--    'column_alias': 'booking__ds__extract_month'}          -->
+                    <!-- col44 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_542),  -->
+                    <!--    'column_alias': 'booking__ds__extract_week'}           -->
+                    <!-- col45 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_543),  -->
+                    <!--    'column_alias': 'booking__ds__extract_day'}            -->
+                    <!-- col46 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_544),  -->
+                    <!--    'column_alias': 'booking__ds__extract_dow'}            -->
+                    <!-- col47 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_545),  -->
+                    <!--    'column_alias': 'booking__ds__extract_doy'}            -->
+                    <!-- col48 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_546),  -->
+                    <!--    'column_alias': 'booking__ds_partitioned__day'}        -->
+                    <!-- col49 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_547),  -->
+                    <!--    'column_alias': 'booking__ds_partitioned__week'}       -->
+                    <!-- col50 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_548),  -->
+                    <!--    'column_alias': 'booking__ds_partitioned__month'}      -->
+                    <!-- col51 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_549),  -->
+                    <!--    'column_alias': 'booking__ds_partitioned__quarter'}    -->
+                    <!-- col52 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_550),  -->
+                    <!--    'column_alias': 'booking__ds_partitioned__year'}       -->
+                    <!-- col53 =                                                      -->
+                    <!--   {'class': 'SqlSelectColumn',                               -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_551),     -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                    <!-- col54 =                                                         -->
+                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_552),        -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                    <!-- col55 =                                                       -->
+                    <!--   {'class': 'SqlSelectColumn',                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_553),      -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                    <!-- col56 =                                                      -->
+                    <!--   {'class': 'SqlSelectColumn',                               -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_554),     -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                    <!-- col57 =                                                     -->
+                    <!--   {'class': 'SqlSelectColumn',                              -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_555),    -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                    <!-- col58 =                                                     -->
+                    <!--   {'class': 'SqlSelectColumn',                              -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_556),    -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                    <!-- col59 =                                                     -->
+                    <!--   {'class': 'SqlSelectColumn',                              -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_557),    -->
+                    <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
+                    <!-- col60 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_558),  -->
+                    <!--    'column_alias': 'booking__paid_at__day'}               -->
+                    <!-- col61 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_559),  -->
+                    <!--    'column_alias': 'booking__paid_at__week'}              -->
+                    <!-- col62 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_560),  -->
+                    <!--    'column_alias': 'booking__paid_at__month'}             -->
+                    <!-- col63 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_561),  -->
+                    <!--    'column_alias': 'booking__paid_at__quarter'}           -->
+                    <!-- col64 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_562),  -->
+                    <!--    'column_alias': 'booking__paid_at__year'}              -->
+                    <!-- col65 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_563),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_year'}      -->
+                    <!-- col66 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_564),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_quarter'}   -->
+                    <!-- col67 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_565),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_month'}     -->
+                    <!-- col68 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_566),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_week'}      -->
+                    <!-- col69 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_567),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_day'}       -->
+                    <!-- col70 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_568),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_dow'}       -->
+                    <!-- col71 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_569),  -->
+                    <!--    'column_alias': 'booking__paid_at__extract_doy'}       -->
+                    <!-- col72 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_570),  -->
+                    <!--    'column_alias': 'metric_time__day'}                    -->
+                    <!-- col73 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_571),  -->
+                    <!--    'column_alias': 'metric_time__week'}                   -->
+                    <!-- col74 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_572),  -->
+                    <!--    'column_alias': 'metric_time__month'}                  -->
+                    <!-- col75 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_573),  -->
+                    <!--    'column_alias': 'metric_time__quarter'}                -->
+                    <!-- col76 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_574),  -->
+                    <!--    'column_alias': 'metric_time__year'}                   -->
+                    <!-- col77 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_575),  -->
+                    <!--    'column_alias': 'metric_time__extract_year'}           -->
+                    <!-- col78 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_576),  -->
+                    <!--    'column_alias': 'metric_time__extract_quarter'}        -->
+                    <!-- col79 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_577),  -->
+                    <!--    'column_alias': 'metric_time__extract_month'}          -->
+                    <!-- col80 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_578),  -->
+                    <!--    'column_alias': 'metric_time__extract_week'}           -->
+                    <!-- col81 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_579),  -->
+                    <!--    'column_alias': 'metric_time__extract_day'}            -->
+                    <!-- col82 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_580),  -->
+                    <!--    'column_alias': 'metric_time__extract_dow'}            -->
+                    <!-- col83 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_581),  -->
+                    <!--    'column_alias': 'metric_time__extract_doy'}            -->
+                    <!-- col84 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_582),  -->
+                    <!--    'column_alias': 'listing'}                             -->
+                    <!-- col85 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_583),  -->
+                    <!--    'column_alias': 'guest'}                               -->
+                    <!-- col86 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_584),  -->
+                    <!--    'column_alias': 'host'}                                -->
+                    <!-- col87 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_585),  -->
+                    <!--    'column_alias': 'booking__listing'}                    -->
+                    <!-- col88 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_586),  -->
+                    <!--    'column_alias': 'booking__guest'}                      -->
+                    <!-- col89 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_587),  -->
+                    <!--    'column_alias': 'booking__host'}                       -->
+                    <!-- col90 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_496),  -->
+                    <!--    'column_alias': 'is_instant'}                          -->
+                    <!-- col91 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_497),  -->
+                    <!--    'column_alias': 'booking__is_instant'}                 -->
+                    <!-- col92 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_483),  -->
+                    <!--    'column_alias': 'bookings'}                            -->
+                    <!-- col93 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_484),  -->
+                    <!--    'column_alias': 'instant_bookings'}                    -->
+                    <!-- col94 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_485),  -->
+                    <!--    'column_alias': 'booking_value'}                       -->
+                    <!-- col95 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_486),  -->
+                    <!--    'column_alias': 'max_booking_value'}                   -->
+                    <!-- col96 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_487),  -->
+                    <!--    'column_alias': 'min_booking_value'}                   -->
+                    <!-- col97 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_488),  -->
+                    <!--    'column_alias': 'bookers'}                             -->
+                    <!-- col98 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_489),  -->
+                    <!--    'column_alias': 'average_booking_value'}               -->
+                    <!-- col99 =                                                   -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_490),  -->
+                    <!--    'column_alias': 'referred_bookings'}                   -->
+                    <!-- col100 =                                                  -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_491),  -->
+                    <!--    'column_alias': 'median_booking_value'}                -->
+                    <!-- col101 =                                                  -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_492),  -->
+                    <!--    'column_alias': 'booking_value_p99'}                   -->
+                    <!-- col102 =                                                  -->
+                    <!--   {'class': 'SqlSelectColumn',                            -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_493),  -->
+                    <!--    'column_alias': 'discrete_booking_value_p99'}          -->
+                    <!-- col103 =                                                        -->
+                    <!--   {'class': 'SqlSelectColumn',                                  -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_494),        -->
+                    <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
+                    <!-- col104 =                                                      -->
+                    <!--   {'class': 'SqlSelectColumn',                                -->
+                    <!--    'expr': SqlColumnReferenceExpression(node_id=cr_495),      -->
+                    <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
+                    <!-- from_source = SqlSelectStatementNode(node_id=ss_10001) -->
+                    <!-- where = None -->
+                    <SqlSelectStatementNode>
+                        <!-- description = Read Elements From Semantic Model 'bookings_source' -->
+                        <!-- node_id = ss_10001 -->
+                        <!-- col0 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                 -->
+                        <!--    'expr': SqlStringExpression(node_id=str_10000 sql_expr=1),  -->
+                        <!--    'column_alias': 'bookings'}                                 -->
+                        <!-- col1 =                                                                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                                                                      -->
+                        <!--    'expr': SqlStringExpression(node_id=str_10001 sql_expr=CASE WHEN is_instant THEN 1 ELSE 0 END),  -->
+                        <!--    'column_alias': 'instant_bookings'}                                                              -->
+                        <!-- col2 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10009),  -->
+                        <!--    'column_alias': 'booking_value'}                         -->
+                        <!-- col3 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10010),  -->
+                        <!--    'column_alias': 'max_booking_value'}                     -->
+                        <!-- col4 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10011),  -->
+                        <!--    'column_alias': 'min_booking_value'}                     -->
+                        <!-- col5 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10012),  -->
+                        <!--    'column_alias': 'bookers'}                               -->
+                        <!-- col6 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10013),  -->
+                        <!--    'column_alias': 'average_booking_value'}                 -->
+                        <!-- col7 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10014),  -->
+                        <!--    'column_alias': 'booking_payments'}                      -->
+                        <!-- col8 =                                                                                                           -->
+                        <!--   {'class': 'SqlSelectColumn',                                                                                   -->
+                        <!--    'expr': SqlStringExpression(node_id=str_10002 sql_expr=CASE WHEN referrer_id IS NOT NULL THEN 1 ELSE 0 END),  -->
+                        <!--    'column_alias': 'referred_bookings'}                                                                          -->
+                        <!-- col9 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10015),  -->
+                        <!--    'column_alias': 'median_booking_value'}                  -->
+                        <!-- col10 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10016),  -->
+                        <!--    'column_alias': 'booking_value_p99'}                     -->
+                        <!-- col11 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10017),  -->
+                        <!--    'column_alias': 'discrete_booking_value_p99'}            -->
+                        <!-- col12 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10018),      -->
+                        <!--    'column_alias': 'approximate_continuous_booking_value_p99'}  -->
+                        <!-- col13 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10019),    -->
+                        <!--    'column_alias': 'approximate_discrete_booking_value_p99'}  -->
+                        <!-- col14 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10020),  -->
+                        <!--    'column_alias': 'is_instant'}                            -->
+                        <!-- col15 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10021),  -->
+                        <!--    'column_alias': 'ds__day'}                               -->
+                        <!-- col16 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10008),  -->
+                        <!--    'column_alias': 'ds__week'}                        -->
+                        <!-- col17 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10009),  -->
+                        <!--    'column_alias': 'ds__month'}                       -->
+                        <!-- col18 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10010),  -->
+                        <!--    'column_alias': 'ds__quarter'}                     -->
+                        <!-- col19 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10011),  -->
+                        <!--    'column_alias': 'ds__year'}                        -->
+                        <!-- col20 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10014),  -->
+                        <!--    'column_alias': 'ds__extract_year'}              -->
+                        <!-- col21 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10015),  -->
+                        <!--    'column_alias': 'ds__extract_quarter'}           -->
+                        <!-- col22 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10016),  -->
+                        <!--    'column_alias': 'ds__extract_month'}             -->
+                        <!-- col23 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10017),  -->
+                        <!--    'column_alias': 'ds__extract_week'}              -->
+                        <!-- col24 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10018),  -->
+                        <!--    'column_alias': 'ds__extract_day'}               -->
+                        <!-- col25 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10019),  -->
+                        <!--    'column_alias': 'ds__extract_dow'}               -->
+                        <!-- col26 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10020),  -->
+                        <!--    'column_alias': 'ds__extract_doy'}               -->
+                        <!-- col27 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10022),  -->
+                        <!--    'column_alias': 'ds_partitioned__day'}                   -->
+                        <!-- col28 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10012),  -->
+                        <!--    'column_alias': 'ds_partitioned__week'}            -->
+                        <!-- col29 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10013),  -->
+                        <!--    'column_alias': 'ds_partitioned__month'}           -->
+                        <!-- col30 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10014),  -->
+                        <!--    'column_alias': 'ds_partitioned__quarter'}         -->
+                        <!-- col31 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10015),  -->
+                        <!--    'column_alias': 'ds_partitioned__year'}            -->
+                        <!-- col32 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10021),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_year'}  -->
+                        <!-- col33 =                                                -->
+                        <!--   {'class': 'SqlSelectColumn',                         -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10022),     -->
+                        <!--    'column_alias': 'ds_partitioned__extract_quarter'}  -->
+                        <!-- col34 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10023),   -->
+                        <!--    'column_alias': 'ds_partitioned__extract_month'}  -->
+                        <!-- col35 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10024),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_week'}  -->
+                        <!-- col36 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10025),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_day'}   -->
+                        <!-- col37 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10026),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_dow'}   -->
+                        <!-- col38 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10027),  -->
+                        <!--    'column_alias': 'ds_partitioned__extract_doy'}   -->
+                        <!-- col39 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10023),  -->
+                        <!--    'column_alias': 'paid_at__day'}                          -->
+                        <!-- col40 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10016),  -->
+                        <!--    'column_alias': 'paid_at__week'}                   -->
+                        <!-- col41 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10017),  -->
+                        <!--    'column_alias': 'paid_at__month'}                  -->
+                        <!-- col42 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10018),  -->
+                        <!--    'column_alias': 'paid_at__quarter'}                -->
+                        <!-- col43 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10019),  -->
+                        <!--    'column_alias': 'paid_at__year'}                   -->
+                        <!-- col44 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10028),  -->
+                        <!--    'column_alias': 'paid_at__extract_year'}         -->
+                        <!-- col45 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10029),  -->
+                        <!--    'column_alias': 'paid_at__extract_quarter'}      -->
+                        <!-- col46 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10030),  -->
+                        <!--    'column_alias': 'paid_at__extract_month'}        -->
+                        <!-- col47 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10031),  -->
+                        <!--    'column_alias': 'paid_at__extract_week'}         -->
+                        <!-- col48 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10032),  -->
+                        <!--    'column_alias': 'paid_at__extract_day'}          -->
+                        <!-- col49 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10033),  -->
+                        <!--    'column_alias': 'paid_at__extract_dow'}          -->
+                        <!-- col50 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10034),  -->
+                        <!--    'column_alias': 'paid_at__extract_doy'}          -->
+                        <!-- col51 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10024),  -->
+                        <!--    'column_alias': 'booking__is_instant'}                   -->
+                        <!-- col52 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10025),  -->
+                        <!--    'column_alias': 'booking__ds__day'}                      -->
+                        <!-- col53 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10020),  -->
+                        <!--    'column_alias': 'booking__ds__week'}               -->
+                        <!-- col54 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10021),  -->
+                        <!--    'column_alias': 'booking__ds__month'}              -->
+                        <!-- col55 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10022),  -->
+                        <!--    'column_alias': 'booking__ds__quarter'}            -->
+                        <!-- col56 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10023),  -->
+                        <!--    'column_alias': 'booking__ds__year'}               -->
+                        <!-- col57 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10035),  -->
+                        <!--    'column_alias': 'booking__ds__extract_year'}     -->
+                        <!-- col58 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10036),  -->
+                        <!--    'column_alias': 'booking__ds__extract_quarter'}  -->
+                        <!-- col59 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10037),  -->
+                        <!--    'column_alias': 'booking__ds__extract_month'}    -->
+                        <!-- col60 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10038),  -->
+                        <!--    'column_alias': 'booking__ds__extract_week'}     -->
+                        <!-- col61 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10039),  -->
+                        <!--    'column_alias': 'booking__ds__extract_day'}      -->
+                        <!-- col62 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10040),  -->
+                        <!--    'column_alias': 'booking__ds__extract_dow'}      -->
+                        <!-- col63 =                                             -->
+                        <!--   {'class': 'SqlSelectColumn',                      -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10041),  -->
+                        <!--    'column_alias': 'booking__ds__extract_doy'}      -->
+                        <!-- col64 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10026),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__day'}          -->
+                        <!-- col65 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10024),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__week'}   -->
+                        <!-- col66 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10025),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__month'}  -->
+                        <!-- col67 =                                                 -->
+                        <!--   {'class': 'SqlSelectColumn',                          -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10026),    -->
+                        <!--    'column_alias': 'booking__ds_partitioned__quarter'}  -->
+                        <!-- col68 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10027),  -->
+                        <!--    'column_alias': 'booking__ds_partitioned__year'}   -->
+                        <!-- col69 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10042),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_year'}  -->
+                        <!-- col70 =                                                         -->
+                        <!--   {'class': 'SqlSelectColumn',                                  -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10043),              -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_quarter'}  -->
+                        <!-- col71 =                                                       -->
+                        <!--   {'class': 'SqlSelectColumn',                                -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10044),            -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_month'}  -->
+                        <!-- col72 =                                                      -->
+                        <!--   {'class': 'SqlSelectColumn',                               -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10045),           -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_week'}  -->
+                        <!-- col73 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10046),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_day'}  -->
+                        <!-- col74 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10047),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_dow'}  -->
+                        <!-- col75 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10048),          -->
+                        <!--    'column_alias': 'booking__ds_partitioned__extract_doy'}  -->
+                        <!-- col76 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10027),  -->
+                        <!--    'column_alias': 'booking__paid_at__day'}                 -->
+                        <!-- col77 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10028),  -->
+                        <!--    'column_alias': 'booking__paid_at__week'}          -->
+                        <!-- col78 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10029),  -->
+                        <!--    'column_alias': 'booking__paid_at__month'}         -->
+                        <!-- col79 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10030),  -->
+                        <!--    'column_alias': 'booking__paid_at__quarter'}       -->
+                        <!-- col80 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlDateTruncExpression(node_id=dt_10031),  -->
+                        <!--    'column_alias': 'booking__paid_at__year'}          -->
+                        <!-- col81 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10049),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_year'}  -->
+                        <!-- col82 =                                                  -->
+                        <!--   {'class': 'SqlSelectColumn',                           -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10050),       -->
+                        <!--    'column_alias': 'booking__paid_at__extract_quarter'}  -->
+                        <!-- col83 =                                                -->
+                        <!--   {'class': 'SqlSelectColumn',                         -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10051),     -->
+                        <!--    'column_alias': 'booking__paid_at__extract_month'}  -->
+                        <!-- col84 =                                               -->
+                        <!--   {'class': 'SqlSelectColumn',                        -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10052),    -->
+                        <!--    'column_alias': 'booking__paid_at__extract_week'}  -->
+                        <!-- col85 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10053),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_day'}  -->
+                        <!-- col86 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10054),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_dow'}  -->
+                        <!-- col87 =                                              -->
+                        <!--   {'class': 'SqlSelectColumn',                       -->
+                        <!--    'expr': SqlExtractExpression(node_id=ex_10055),   -->
+                        <!--    'column_alias': 'booking__paid_at__extract_doy'}  -->
+                        <!-- col88 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10028),  -->
+                        <!--    'column_alias': 'listing'}                               -->
+                        <!-- col89 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10029),  -->
+                        <!--    'column_alias': 'guest'}                                 -->
+                        <!-- col90 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10030),  -->
+                        <!--    'column_alias': 'host'}                                  -->
+                        <!-- col91 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10031),  -->
+                        <!--    'column_alias': 'booking__listing'}                      -->
+                        <!-- col92 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10032),  -->
+                        <!--    'column_alias': 'booking__guest'}                        -->
+                        <!-- col93 =                                                     -->
+                        <!--   {'class': 'SqlSelectColumn',                              -->
+                        <!--    'expr': SqlColumnReferenceExpression(node_id=cr_10033),  -->
+                        <!--    'column_alias': 'booking__host'}                         -->
+                        <!-- from_source = SqlTableFromClauseNode(node_id=tfc_10001) -->
+                        <!-- where = None -->
+                        <SqlTableFromClauseNode>
+                            <!-- description = Read from ***************************.fct_bookings -->
+                            <!-- node_id = tfc_10001 -->
+                            <!-- table_id = ***************************.fct_bookings -->
+                        </SqlTableFromClauseNode>
+                    </SqlSelectStatementNode>
+                </SqlSelectStatementNode>
+            </SqlSelectStatementNode>
+        </SqlSelectStatementNode>
+    </SqlSelectStatementNode>
+</SqlQueryPlan>
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
index 66b9a92b39..ab0edb4ad2 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0.sql
@@ -119,10 +119,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -131,10 +131,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -143,10 +143,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -156,10 +156,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -168,10 +168,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -180,10 +180,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
index cfaecd587b..2b917da7a9 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_non_primary_time__plan0_optimized.sql
@@ -9,10 +9,10 @@ SELECT
   , EXTRACT(year FROM ds) AS ds__extract_year
   , EXTRACT(quarter FROM ds) AS ds__extract_quarter
   , EXTRACT(month FROM ds) AS ds__extract_month
-  , EXTRACT(ISOWEEK FROM ds) AS ds__extract_week
+  , EXTRACT(isoweek FROM ds) AS ds__extract_week
   , EXTRACT(day FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
+  , EXTRACT(dayofweek FROM ds) AS ds__extract_dow
+  , EXTRACT(dayofyear FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS ds_partitioned__month
@@ -21,10 +21,10 @@ SELECT
   , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
   , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
   , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(ISOWEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(isoweek FROM ds_partitioned) AS ds_partitioned__extract_week
   , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_doy
+  , EXTRACT(dayofweek FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(dayofyear FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS paid_at__week
   , DATE_TRUNC(paid_at, month) AS paid_at__month
@@ -33,10 +33,10 @@ SELECT
   , EXTRACT(year FROM paid_at) AS paid_at__extract_year
   , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
   , EXTRACT(month FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(ISOWEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(isoweek FROM paid_at) AS paid_at__extract_week
   , EXTRACT(day FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_doy
+  , EXTRACT(dayofweek FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(dayofyear FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC(ds, isoweek) AS booking__ds__week
   , DATE_TRUNC(ds, month) AS booking__ds__month
@@ -45,10 +45,10 @@ SELECT
   , EXTRACT(year FROM ds) AS booking__ds__extract_year
   , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
   , EXTRACT(month FROM ds) AS booking__ds__extract_month
-  , EXTRACT(ISOWEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(isoweek FROM ds) AS booking__ds__extract_week
   , EXTRACT(day FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_doy
+  , EXTRACT(dayofweek FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(dayofyear FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS booking__ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS booking__ds_partitioned__month
@@ -57,10 +57,10 @@ SELECT
   , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
   , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
   , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(ISOWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(isoweek FROM ds_partitioned) AS booking__ds_partitioned__extract_week
   , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
+  , EXTRACT(dayofweek FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(dayofyear FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS booking__paid_at__week
   , DATE_TRUNC(paid_at, month) AS booking__paid_at__month
@@ -69,10 +69,10 @@ SELECT
   , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
   , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
   , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(ISOWEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(isoweek FROM paid_at) AS booking__paid_at__extract_week
   , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_doy
+  , EXTRACT(dayofweek FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(dayofyear FROM paid_at) AS booking__paid_at__extract_doy
   , paid_at AS metric_time__day
   , DATE_TRUNC(paid_at, isoweek) AS metric_time__week
   , DATE_TRUNC(paid_at, month) AS metric_time__month
@@ -81,10 +81,10 @@ SELECT
   , EXTRACT(year FROM paid_at) AS metric_time__extract_year
   , EXTRACT(quarter FROM paid_at) AS metric_time__extract_quarter
   , EXTRACT(month FROM paid_at) AS metric_time__extract_month
-  , EXTRACT(ISOWEEK FROM paid_at) AS metric_time__extract_week
+  , EXTRACT(isoweek FROM paid_at) AS metric_time__extract_week
   , EXTRACT(day FROM paid_at) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS metric_time__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS metric_time__extract_doy
+  , EXTRACT(dayofweek FROM paid_at) AS metric_time__extract_dow
+  , EXTRACT(dayofyear FROM paid_at) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
index 9895b04f88..58b676e2ff 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0.sql
@@ -131,10 +131,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -143,10 +143,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -155,10 +155,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
     , bookings_source_src_10001.is_instant AS booking__is_instant
     , bookings_source_src_10001.ds AS booking__ds__day
     , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -168,10 +168,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
     , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
     , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -180,10 +180,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
     , bookings_source_src_10001.paid_at AS booking__paid_at__day
     , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
     , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -192,10 +192,10 @@ FROM (
     , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
     , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
     , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-    , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+    , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
     , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-    , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-    , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+    , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+    , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
     , bookings_source_src_10001.listing_id AS listing
     , bookings_source_src_10001.guest_id AS guest
     , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
index 9e14d2f83b..6290ee58d6 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_metric_time_dimension_transform_node_using_primary_time__plan0_optimized.sql
@@ -9,10 +9,10 @@ SELECT
   , EXTRACT(year FROM ds) AS ds__extract_year
   , EXTRACT(quarter FROM ds) AS ds__extract_quarter
   , EXTRACT(month FROM ds) AS ds__extract_month
-  , EXTRACT(ISOWEEK FROM ds) AS ds__extract_week
+  , EXTRACT(isoweek FROM ds) AS ds__extract_week
   , EXTRACT(day FROM ds) AS ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS ds__extract_doy
+  , EXTRACT(dayofweek FROM ds) AS ds__extract_dow
+  , EXTRACT(dayofyear FROM ds) AS ds__extract_doy
   , ds_partitioned AS ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS ds_partitioned__month
@@ -21,10 +21,10 @@ SELECT
   , EXTRACT(year FROM ds_partitioned) AS ds_partitioned__extract_year
   , EXTRACT(quarter FROM ds_partitioned) AS ds_partitioned__extract_quarter
   , EXTRACT(month FROM ds_partitioned) AS ds_partitioned__extract_month
-  , EXTRACT(ISOWEEK FROM ds_partitioned) AS ds_partitioned__extract_week
+  , EXTRACT(isoweek FROM ds_partitioned) AS ds_partitioned__extract_week
   , EXTRACT(day FROM ds_partitioned) AS ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS ds_partitioned__extract_doy
+  , EXTRACT(dayofweek FROM ds_partitioned) AS ds_partitioned__extract_dow
+  , EXTRACT(dayofyear FROM ds_partitioned) AS ds_partitioned__extract_doy
   , paid_at AS paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS paid_at__week
   , DATE_TRUNC(paid_at, month) AS paid_at__month
@@ -33,10 +33,10 @@ SELECT
   , EXTRACT(year FROM paid_at) AS paid_at__extract_year
   , EXTRACT(quarter FROM paid_at) AS paid_at__extract_quarter
   , EXTRACT(month FROM paid_at) AS paid_at__extract_month
-  , EXTRACT(ISOWEEK FROM paid_at) AS paid_at__extract_week
+  , EXTRACT(isoweek FROM paid_at) AS paid_at__extract_week
   , EXTRACT(day FROM paid_at) AS paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS paid_at__extract_doy
+  , EXTRACT(dayofweek FROM paid_at) AS paid_at__extract_dow
+  , EXTRACT(dayofyear FROM paid_at) AS paid_at__extract_doy
   , ds AS booking__ds__day
   , DATE_TRUNC(ds, isoweek) AS booking__ds__week
   , DATE_TRUNC(ds, month) AS booking__ds__month
@@ -45,10 +45,10 @@ SELECT
   , EXTRACT(year FROM ds) AS booking__ds__extract_year
   , EXTRACT(quarter FROM ds) AS booking__ds__extract_quarter
   , EXTRACT(month FROM ds) AS booking__ds__extract_month
-  , EXTRACT(ISOWEEK FROM ds) AS booking__ds__extract_week
+  , EXTRACT(isoweek FROM ds) AS booking__ds__extract_week
   , EXTRACT(day FROM ds) AS booking__ds__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS booking__ds__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS booking__ds__extract_doy
+  , EXTRACT(dayofweek FROM ds) AS booking__ds__extract_dow
+  , EXTRACT(dayofyear FROM ds) AS booking__ds__extract_doy
   , ds_partitioned AS booking__ds_partitioned__day
   , DATE_TRUNC(ds_partitioned, isoweek) AS booking__ds_partitioned__week
   , DATE_TRUNC(ds_partitioned, month) AS booking__ds_partitioned__month
@@ -57,10 +57,10 @@ SELECT
   , EXTRACT(year FROM ds_partitioned) AS booking__ds_partitioned__extract_year
   , EXTRACT(quarter FROM ds_partitioned) AS booking__ds_partitioned__extract_quarter
   , EXTRACT(month FROM ds_partitioned) AS booking__ds_partitioned__extract_month
-  , EXTRACT(ISOWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_week
+  , EXTRACT(isoweek FROM ds_partitioned) AS booking__ds_partitioned__extract_week
   , EXTRACT(day FROM ds_partitioned) AS booking__ds_partitioned__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
+  , EXTRACT(dayofweek FROM ds_partitioned) AS booking__ds_partitioned__extract_dow
+  , EXTRACT(dayofyear FROM ds_partitioned) AS booking__ds_partitioned__extract_doy
   , paid_at AS booking__paid_at__day
   , DATE_TRUNC(paid_at, isoweek) AS booking__paid_at__week
   , DATE_TRUNC(paid_at, month) AS booking__paid_at__month
@@ -69,10 +69,10 @@ SELECT
   , EXTRACT(year FROM paid_at) AS booking__paid_at__extract_year
   , EXTRACT(quarter FROM paid_at) AS booking__paid_at__extract_quarter
   , EXTRACT(month FROM paid_at) AS booking__paid_at__extract_month
-  , EXTRACT(ISOWEEK FROM paid_at) AS booking__paid_at__extract_week
+  , EXTRACT(isoweek FROM paid_at) AS booking__paid_at__extract_week
   , EXTRACT(day FROM paid_at) AS booking__paid_at__extract_day
-  , EXTRACT(DAYOFWEEK FROM paid_at) AS booking__paid_at__extract_dow
-  , EXTRACT(DAYOFYEAR FROM paid_at) AS booking__paid_at__extract_doy
+  , EXTRACT(dayofweek FROM paid_at) AS booking__paid_at__extract_dow
+  , EXTRACT(dayofyear FROM paid_at) AS booking__paid_at__extract_doy
   , ds AS metric_time__day
   , DATE_TRUNC(ds, isoweek) AS metric_time__week
   , DATE_TRUNC(ds, month) AS metric_time__month
@@ -81,10 +81,10 @@ SELECT
   , EXTRACT(year FROM ds) AS metric_time__extract_year
   , EXTRACT(quarter FROM ds) AS metric_time__extract_quarter
   , EXTRACT(month FROM ds) AS metric_time__extract_month
-  , EXTRACT(ISOWEEK FROM ds) AS metric_time__extract_week
+  , EXTRACT(isoweek FROM ds) AS metric_time__extract_week
   , EXTRACT(day FROM ds) AS metric_time__extract_day
-  , EXTRACT(DAYOFWEEK FROM ds) AS metric_time__extract_dow
-  , EXTRACT(DAYOFYEAR FROM ds) AS metric_time__extract_doy
+  , EXTRACT(dayofweek FROM ds) AS metric_time__extract_dow
+  , EXTRACT(dayofyear FROM ds) AS metric_time__extract_doy
   , listing_id AS listing
   , guest_id AS guest
   , host_id AS host
diff --git a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
index 599746d204..24e3bb6ff9 100644
--- a/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
+++ b/metricflow/test/snapshots/test_metric_time_dimension_to_sql.py/SqlQueryPlan/BigQuery/test_simple_query_with_metric_time_dimension__plan0.sql
@@ -153,10 +153,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -165,10 +165,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -177,10 +177,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -190,10 +190,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -202,10 +202,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -214,10 +214,10 @@ FROM (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
@@ -370,10 +370,10 @@ FULL OUTER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS ds_partitioned__month
@@ -382,10 +382,10 @@ FULL OUTER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS paid_at__month
@@ -394,10 +394,10 @@ FULL OUTER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS paid_at__extract_doy
             , bookings_source_src_10001.is_instant AS booking__is_instant
             , bookings_source_src_10001.ds AS booking__ds__day
             , DATE_TRUNC(bookings_source_src_10001.ds, isoweek) AS booking__ds__week
@@ -407,10 +407,10 @@ FULL OUTER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds) AS booking__ds__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds) AS booking__ds__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds) AS booking__ds__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds) AS booking__ds__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds) AS booking__ds__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds) AS booking__ds__extract_doy
             , bookings_source_src_10001.ds_partitioned AS booking__ds_partitioned__day
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, isoweek) AS booking__ds_partitioned__week
             , DATE_TRUNC(bookings_source_src_10001.ds_partitioned, month) AS booking__ds_partitioned__month
@@ -419,10 +419,10 @@ FULL OUTER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.ds_partitioned) AS booking__ds_partitioned__extract_doy
             , bookings_source_src_10001.paid_at AS booking__paid_at__day
             , DATE_TRUNC(bookings_source_src_10001.paid_at, isoweek) AS booking__paid_at__week
             , DATE_TRUNC(bookings_source_src_10001.paid_at, month) AS booking__paid_at__month
@@ -431,10 +431,10 @@ FULL OUTER JOIN (
             , EXTRACT(year FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_year
             , EXTRACT(quarter FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_quarter
             , EXTRACT(month FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_month
-            , EXTRACT(ISOWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
+            , EXTRACT(isoweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_week
             , EXTRACT(day FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_day
-            , EXTRACT(DAYOFWEEK FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
-            , EXTRACT(DAYOFYEAR FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
+            , EXTRACT(dayofweek FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_dow
+            , EXTRACT(dayofyear FROM bookings_source_src_10001.paid_at) AS booking__paid_at__extract_doy
             , bookings_source_src_10001.listing_id AS listing
             , bookings_source_src_10001.guest_id AS guest
             , bookings_source_src_10001.host_id AS host
diff --git a/metricflow/test/snapshots/test_node_data_set.py/list/test_joined_node_data_set__result0.txt b/metricflow/test/snapshots/test_node_data_set.py/list/test_joined_node_data_set__result0.txt
index 11a7d2fd95..3abcc19d22 100644
--- a/metricflow/test/snapshots/test_node_data_set.py/list/test_joined_node_data_set__result0.txt
+++ b/metricflow/test/snapshots/test_node_data_set.py/list/test_joined_node_data_set__result0.txt
@@ -1,24 +1,24 @@
 ['company__ds__day',
- 'company__ds__day',
- 'company__ds__day',
- 'company__ds__day',
- 'company__ds__day',
- 'company__ds__day',
- 'company__ds__day',
- 'company__ds__day',
+ 'company__ds__extract_day',
+ 'company__ds__extract_dow',
+ 'company__ds__extract_doy',
+ 'company__ds__extract_month',
+ 'company__ds__extract_quarter',
+ 'company__ds__extract_week',
+ 'company__ds__extract_year',
  'company__ds__month',
  'company__ds__quarter',
  'company__ds__week',
  'company__ds__year',
  'company__user',
  'ds__day',
- 'ds__day',
- 'ds__day',
- 'ds__day',
- 'ds__day',
- 'ds__day',
- 'ds__day',
- 'ds__day',
+ 'ds__extract_day',
+ 'ds__extract_dow',
+ 'ds__extract_doy',
+ 'ds__extract_month',
+ 'ds__extract_quarter',
+ 'ds__extract_week',
+ 'ds__extract_year',
  'ds__month',
  'ds__quarter',
  'ds__week',
@@ -26,13 +26,13 @@
  'txn_revenue',
  'user',
  'user__ds__day',
- 'user__ds__day',
- 'user__ds__day',
- 'user__ds__day',
- 'user__ds__day',
- 'user__ds__day',
- 'user__ds__day',
- 'user__ds__day',
+ 'user__ds__extract_day',
+ 'user__ds__extract_dow',
+ 'user__ds__extract_doy',
+ 'user__ds__extract_month',
+ 'user__ds__extract_quarter',
+ 'user__ds__extract_week',
+ 'user__ds__extract_year',
  'user__ds__month',
  'user__ds__quarter',
  'user__ds__week',

From ce6028c3145875fd767e400333a8282c4290f4c6 Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Wed, 13 Sep 2023 09:29:44 -0700
Subject: [PATCH 15/15] Cleanup

---
 metricflow/query/query_parser.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/metricflow/query/query_parser.py b/metricflow/query/query_parser.py
index 3cf160a559..ec8389b719 100644
--- a/metricflow/query/query_parser.py
+++ b/metricflow/query/query_parser.py
@@ -435,15 +435,6 @@ def _parse_and_validate_query(
 
         self._time_granularity_solver.validate_time_granularity(metric_references, time_dimension_specs)
         self._validate_date_part(metric_references, time_dimension_specs)
-        for time_dimension_spec in time_dimension_specs:
-            if (
-                time_dimension_spec.date_part
-                and time_dimension_spec.date_part.to_int() < time_dimension_spec.time_granularity.to_int()
-            ):
-                raise RequestTimeGranularityException(
-                    f"Date part {time_dimension_spec.date_part.name} is not compatible with time granularity "
-                    f"{time_dimension_spec.time_granularity.name}."
-                )
 
         order_by_specs = self._parse_order_by(order or [], partial_time_dimension_spec_replacements)
 
@@ -558,7 +549,11 @@ def _validate_date_part(
         for time_dimension_spec in time_dimension_specs:
             if time_dimension_spec.date_part:
                 date_part_requested = True
-                break
+                if time_dimension_spec.date_part.to_int() < time_dimension_spec.time_granularity.to_int():
+                    raise RequestTimeGranularityException(
+                        f"Date part {time_dimension_spec.date_part.name} is not compatible with time granularity "
+                        f"{time_dimension_spec.time_granularity.name}."
+                    )
         if date_part_requested:
             for metric_reference in metric_references:
                 metric = self._metric_lookup.get_metric(metric_reference)